PortAudio Logging

Author: pschatzmann

examples-desktop/generator/CMakeLists.txt

@@ -32,20 +32,12 @@ if(NOT arduino_audio_tools_POPULATED)
     add_subdirectory(${arduino_audio_tools_SOURCE_DIR})
 endif()
 
-
-# build sketch to executable
+# build sketch as executable
 add_executable (generator generator.cpp)
 
+# use main() from arduino_emulator
+target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
+
 # specify libraries
 target_link_libraries(generator portaudio_static arduino_emulator arduino-audio-tools)
 
-# Hmm...This should not be needed!
-target_include_directories(generator PRIVATE
-   "${arduino_emulator_SOURCE_DIR}/ArduinoCore-API/api"
-   "${arduino_emulator_SOURCE_DIR}/ArduinoCore-Linux/cores/arduino"
-   "${arduino_audio_tools_SOURCE_DIR}/src"
-)
-
-
-# define dependencies
-add_dependencies(generator portaudio_static arduino_emulator arduino-audio-tools ) 

examples-desktop/generator/generator.cpp

@@ -1,11 +1,6 @@
-// Simple wrapper to make Arduino sketch compilable by cpp in cmake
+// Simple wrapper for Arduino sketch to compilable with cpp in cmake
 #include "Arduino.h"
+
+// Provide sketch
 #include "generator.ino"
 
-// Privide main()
-int main(){
-  setup();
-  while(true){
-    loop();
-  }
-}

examples-desktop/generator/generator.ino

@@ -12,6 +12,7 @@ StreamCopy copier(out, in); // copy in to out
 // Arduino Setup
 void setup(void) {
   Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Debug);
 
   // open output
   PortAudioConfig config = out.defaultConfig();

src/AudioTools/PortAudioStream.h

@@ -28,13 +28,16 @@ class PortAudioConfig : public AudioBaseInfo {
 class PortAudioStream : public BufferedStream {
     public:
         PortAudioStream():BufferedStream(DEFAULT_BUFFER_SIZE) {
+            LOGD(__FUNCTION__);
         }
 
         ~PortAudioStream(){
+            LOGD(__FUNCTION__);
             Pa_Terminate();
         }
 
         PortAudioConfig defaultConfig() {
+            LOGD(__FUNCTION__);
             PortAudioConfig default_info;
             return default_info;
         }
@@ -44,6 +47,7 @@ class PortAudioStream : public BufferedStream {
         }
 
         void begin(PortAudioConfig info) {
+            LOGD(__FUNCTION__);
             this->info = info;
             err = Pa_Initialize();
             if( err != paNoError ) {
@@ -71,6 +75,7 @@ class PortAudioStream : public BufferedStream {
         }
 
         void end() {
+            LOGD(__FUNCTION__);
             err = Pa_StopStream( stream );
             if( err != paNoError ) {
                 LOGE(  "PortAudio error: %s\n", Pa_GetErrorText( err ) );
@@ -92,6 +97,7 @@ class PortAudioStream : public BufferedStream {
         PortAudioConfig info;
 
         virtual size_t writeExt(const uint8_t* data, size_t len) {  
+            LOGD("writeExt: %zu", len);
             size_t result = 0;
             if (stream!=nullptr){
                 int bytes = info.bits_per_sample / 8;
@@ -102,11 +108,14 @@ class PortAudioStream : public BufferedStream {
                 } else {
                     LOGE(  "PortAudio error: %s\n", Pa_GetErrorText( err ) );
                 }
-            };
+            } else {
+                LOGW("stream is null")
+            }
             return len;
         }
 
         virtual size_t readExt( uint8_t *data, size_t len) { 
+            LOGD("writeExt: %zu", len);
             size_t result = 0;
             if (stream!=nullptr){
                 int bytes = info.bits_per_sample / 8;
@@ -117,6 +126,8 @@ class PortAudioStream : public BufferedStream {
                 } else {
                     LOGE(  "PortAudio error: %s\n", Pa_GetErrorText( err ) );
                 }
+            } else {
+                LOGW("stream is null")
             }
             return len;            
         }
@@ -135,8 +146,6 @@ class PortAudioStream : public BufferedStream {
             // make sure that we return a valid value 
             return paInt16;
         }
-
-
 };
 
 } // namespace