stk file errors

Author: pschatzmann

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

@@ -0,0 +1,78 @@
+/**
+ * @file streams-stk_files-audiokit.ino
+ * @brief Example which Loads raw samples from the SDMMC file system
+ * 1. Make sure that files are stored on SD in the /rawwaves directory
+ * 2. In ArdConfig.h make sure that we used #define STK_USE_FILES
+ * 3. On AudiKit all switches must be switched on
+ * @author Phil Schatzmann
+ * @copyright Copyright (c) 2021
+ */
+
+#include "SD_MMC.h"
+#include "AudioTools.h"
+#include "AudioLibs/AudioSTK.h"
+#include "AudioLibs/AudioKit.h"
+
+STKStream<Instrmnt> in;
+AudioKitStream out;
+StreamCopy copier;
+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
+    N_C3, N_D3, N_E3, N_F3, N_G3, N_A3, N_B3,
+    N_C4, N_D4, N_E4, N_F4, N_G4, N_A4, N_B4,
+    N_C5, N_D5, N_E5, N_F5, N_G5, N_A5, N_B5
+};
+
+void play() {
+  static bool active=true;
+  static float freq;
+  static uint64_t timeout;
+
+  if (millis()>timeout){
+    if (active){
+      // play note for 800 ms
+      freq = notes_array[random(sizeof(notes_array)/sizeof(uint16_t))];
+      p_instrument->noteOn(freq, note_amplitude);
+      timeout = millis()+800;
+      active = false;
+    } else {
+      // silence for 100 ms
+      p_instrument->noteOff(note_amplitude);
+      timeout = millis()+100;
+      active = true;
+    }
+  }
+}
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial,AudioLogger::Warning);
+
+  if(!SD_MMC.begin("/sdcard", true)){    // 1-bit mode
+    LOGE("Could not open SD_MMC");
+    return;
+  }
+
+  // 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);
+
+  // setup output
+  auto ocfg = out.defaultConfig(TX_MODE);
+  ocfg.copyFrom(icfg);
+  ocfg.sd_active = false;
+  out.begin(ocfg);
+
+}
+
+void loop() {
+  play();
+  copier.copy();
+}

src/AudioLibs/AudioSTK.h

@@ -39,7 +39,7 @@ class STKGenerator : public SoundGenerator<T> {
         /// provides the default configuration
         AudioBaseInfo defaultConfig() {
             AudioBaseInfo info;
-            info.channels = 1;
+            info.channels = 2;
             info.bits_per_sample = sizeof(T) * 8;
             info.sample_rate = stk::Stk::sampleRate();
             return info;
@@ -76,13 +76,29 @@ class STKGenerator : public SoundGenerator<T> {
 template <class StkCls>
 class STKStream : public GeneratedSoundStream<int16_t> {
     public:
+        STKStream() {
+            GeneratedSoundStream<int16_t>::setInput(generator);
+        };
+
         STKStream(StkCls &instrument){
             generator.setInput(instrument);
             GeneratedSoundStream<int16_t>::setInput(generator);
         }
         void setInput(StkCls &instrument){
             generator.setInput(instrument);
         }
+        void setInput(StkCls *instrument){
+            generator.setInput(*instrument);
+        }
+
+        AudioBaseInfo defaultConfig() {
+            AudioBaseInfo info;
+            info.channels = 2;
+            info.bits_per_sample = 16;
+            info.sample_rate = stk::Stk::sampleRate();
+            return info;
+        }
+
     protected:
         STKGenerator<StkCls,int16_t> generator;
 

src/AudioTools/AudioStreams.h

@@ -542,6 +542,10 @@ class GeneratedSoundStream : public AudioStreamX {
   /// start the processing
   bool begin(AudioBaseInfo cfg) {
     LOGD(LOG_METHOD);
+    if (generator_ptr==nullptr){
+      LOGE("Source not defined");
+      return false;
+    }
     generator_ptr->begin(cfg);
     if (audioBaseInfoDependent != nullptr)
       audioBaseInfoDependent->setAudioInfo(generator_ptr->audioInfo());