Portaudio support

Author: pschatzmann

examples-desktop/generator/CMakeLists.txt

@@ -30,15 +30,15 @@ if(NOT arduino_audio_tools_POPULATED)
     add_subdirectory(${arduino_audio_tools_SOURCE_DIR})
 endif()
 
-# Hmm...This should not be needed!
-include_directories(
-    "${arduino_emulator_SOURCE_DIR}/ArduinoCore-API/api"
-    "${arduino_emulator_SOURCE_DIR}/MathFunctions/ArduinoCore-Linux/cores/arduino"
-    "${arduino_audio_tools_SOURCE_DIR}/src"
-)
 
 # build sketch to executable
 add_executable (desktop generator.cpp)
 
+# Hmm...This should not be needed!
+target_include_directories(desktop 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(desktop portaudio_static arduino_emulator arduino-audio-tools ) 

examples-desktop/generator/generator.cpp

@@ -1,33 +1,3 @@
+// Simple wrapper to make Arduino sketch compilable by cpp in cmake
 #include "Arduino.h"
-#include "AudioTools.h"
-
-using namespace audio_tools;  
-
-uint16_t sample_rate=44100;
-uint8_t channels = 2;                                     // The stream will have 2 channels 
-SineWaveGenerator<int16_t> sineWave(32000);               // subclass of SoundGenerator with max amplitude of 32000
-GeneratedSoundStream<int16_t> in(sineWave, channels);     // Stream generated from sine wave
-DefaultStream out;                                        // On desktop we use 
-StreamCopy copier(out, in); // copy in to out
-
-// Arduino Setup
-void setup(void) {
-  Serial.begin(115200);
-
-  // open output
-  auto config = out.defaultConfig();
-  config.sample_rate = sample_rate;
-  config.channels = channels;
-  config.bits_per_sample = sizeof(int16_t)*8;
-  out.begin();
-
-  // Setup sine wave
-  sineWave.begin(sample_rate, B4);
-
-}
-
-// Arduino loop  
-void loop() {
-  if (out)
-    copier.copy();
-}
+#include "generator.ino"

examples-desktop/generator/generator.ino

@@ -0,0 +1,32 @@
+#include "AudioTools.h"
+
+using namespace audio_tools;  
+
+uint16_t sample_rate=44100;
+uint8_t channels = 2;                                     // The stream will have 2 channels 
+SineWaveGenerator<int16_t> sineWave(32000);               // subclass of SoundGenerator with max amplitude of 32000
+GeneratedSoundStream<int16_t> in(sineWave, channels);     // Stream generated from sine wave
+DefaultStream out;                                        // On desktop we use 
+StreamCopy copier(out, in); // copy in to out
+
+// Arduino Setup
+void setup(void) {
+  Serial.begin(115200);
+
+  // open output
+  auto config = out.defaultConfig();
+  config.sample_rate = sample_rate;
+  config.channels = channels;
+  config.bits_per_sample = sizeof(int16_t)*8;
+  out.begin();
+
+  // Setup sine wave
+  sineWave.begin(sample_rate, B4);
+
+}
+
+// Arduino loop  
+void loop() {
+  if (out)
+    copier.copy();
+}

src/AudioTools/PortAudioStream.h

@@ -5,7 +5,7 @@
  */
 
 #if defined(__linux__) || defined(_WIN32) || defined(__APPLE__)
-#include "AudioTools/stream.h"
+#include "AudioTools.h"
 #include "portaudio.h"
 
 /**