stk desktop example

Author: pschatzmann

examples/examples-desktop/generator/CMakeLists.txt

@@ -22,7 +22,7 @@ target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
 target_compile_definitions(generator PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP)
 
 # OS/X might need this setting for core audio
-#target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)
+target_compile_options(portaudio PRIVATE -Wno-deprecated)
 
 # specify libraries
 target_link_libraries(generator portaudio_static arduino_emulator arduino-audio-tools)

examples/examples-desktop/mp3/CMakeLists.txt

@@ -30,7 +30,7 @@ target_compile_definitions(arduino_helix PUBLIC -DARDUINO)
 target_compile_definitions(mp3_dt PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP)
 
 # OS/X might need this setting for core audio
-#target_compile_definitions(portaudio PUBLIC -DPA_USE_COREAUDIO=1)
+target_compile_options(portaudio PRIVATE -Wno-deprecated)
 
 # specify libraries
 target_link_libraries(mp3_dt portaudio arduino_emulator arduino-audio-tools arduino_helix)

examples/examples-stk/streams-stk-desktop/CMakeLists.txt

@@ -30,8 +30,8 @@ target_compile_definitions(stk_example PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_S
 target_compile_definitions(arduino-stk PUBLIC -DIS_DESKTOP)
 
 # OS/X might need this setting for core audio
-#target_compile_definitions(arduino-stk PUBLIC -DPA_USE_COREAUDIO=1)
+target_compile_options(portaudio PRIVATE -Wno-deprecated)
 
 # specify libraries
-target_link_libraries(stk_example arduino-stk portaudio_static arduino_emulator arduino-audio-tools )
+target_link_libraries(stk_example arduino-stk portaudio arduino_emulator arduino-audio-tools )
 

examples/examples-stk/streams-stk-desktop/streams-stk-desktop.ino

@@ -10,11 +10,11 @@
 #include "AudioLibs/AudioSTK.h"
 #include "AudioLibs/PortAudioStream.h"
 
-STKStream<Instrmnt> in;
+Flute insturment(50);
+STKStream<Instrmnt> in(insturment);
 PortAudioStream out;
-StreamCopy copier;
+StreamCopy copier(out, in);
 MusicalNotes notes;
-Instrmnt* p_instrument=nullptr; // instrument depends on file system
 
 float note_amplitude = 0.5;
 static uint16_t notes_array[] = { // frequencies aleatoric C-scale
@@ -36,12 +36,12 @@ void play() {
       Serial.print("playing ");
       Serial.println(freq);
 
-      p_instrument->noteOn(freq, note_amplitude);
+      insturment.noteOn(freq, note_amplitude);
       timeout = millis()+800;
       active = false;
     } else {
       // silence for 100 ms
-      p_instrument->noteOff(note_amplitude);
+      insturment.noteOff(note_amplitude);
       timeout = millis()+100;
       active = true;
     }
@@ -52,10 +52,6 @@ void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial,AudioLogger::Warning);
 
-  // We can allocate the incstument only after SD_M
-  p_instrument = new BeeThree();
-  in.setInput(p_instrument);;
-
   // setup input
   auto icfg = in.defaultConfig();
   in.begin(icfg);

examples/examples-stk/streams-stk_files-audiokit/streams-stk_files-audiokit.ino

@@ -8,20 +8,15 @@
  * @copyright Copyright (c) 2021
  */
 
-#ifdef IS_DESKTOP
-# define AudioKitStream PortAudioStream
-#else
-# include "SD_MMC.h"
-#endif
+#include "SD_MMC.h"
 #include "AudioTools.h"
 #include "AudioLibs/AudioSTK.h"
 #include "AudioLibs/AudioKit.h"
 
 
-
 STKStream<Instrmnt> in;
 AudioKitStream out;
-StreamCopy copier;
+StreamCopy copier(out, in);
 MusicalNotes notes;
 Instrmnt* p_instrument=nullptr; // instrument depends on file system