tbd

Author: pschatzmann

examples/examples-stk/streams-stk_allinstruments-audiokit/CMakeLists.txt

@@ -0,0 +1,38 @@
+cmake_minimum_required(VERSION 3.20)
+
+# set the project name
+project(arduino_sketch)
+set (SKETCH "streams-stk_allinstruments-audiokit.ino")
+set (CMAKE_CXX_STANDARD 11)
+set (DCMAKE_CXX_FLAGS "-Werror")
+
+include(FetchContent)
+option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
+
+FetchContent_Declare(arduino-stk GIT_REPOSITORY "https://github.com/pschatzmann/arduino-stk.git" )
+FetchContent_GetProperties(arduino-stk)
+if(NOT arduino-stk_POPULATED)
+    FetchContent_Populate(arduino-stk)
+    add_subdirectory(${arduino-stk_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/arduino-stk)
+endif()
+
+# Build with arduino-audio-tools
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_BINARY_DIR}/arduino-audio-tools )
+endif()
+
+# build sketch as executable
+set_source_files_properties(${SKETCH} PROPERTIES LANGUAGE CXX)
+add_executable (arduino_sketch ${SKETCH})
+
+# set preprocessor defines
+target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
+target_compile_definitions(arduino_sketch PUBLIC -DARDUINO -DIS_DESKTOP -DEXIT_ON_STOP)
+target_compile_definitions(arduino-stk PUBLIC -DIS_DESKTOP)
+
+# OS/X might need this setting for core audio
+target_compile_options(portaudio PRIVATE -Wno-deprecated)
+
+# specify libraries
+target_link_libraries(arduino_sketch arduino-stk portaudio arduino_emulator arduino-audio-tools )
+

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

@@ -0,0 +1,152 @@
+/**
+ * @file streams-stk_allinstruments-audioout.ino
+ * @brief Test sketch which pays all notes of all instruments
+ * @author Phil Schatzmann
+ * @copyright Copyright (c) 2021
+ */
+#include "AudioTools.h"
+#include "AudioLibs/AudioSTK.h"
+
+#ifdef IS_DESKTOP
+#include "AudioLibs/PortAudioStream.h"
+typedef PortAudioStream MyStdOut;
+#else
+#include "AudioLibs/AudioKit.h"
+typedef AudioKitStream MyStdOut;
+
+#endif
+Instrmnt *p_Instrmnt=nullptr; // will be allocated dynamically
+STKStream<Instrmnt> in;
+MyStdOut out; // or replace with I2SStream or any other output class
+StreamCopy copier(out, in);
+MusicalNotes notes;
+
+/// We do not have enough memory to allocate all instruments, so we provide an array with allocator methods
+struct InstrumentInfo {
+    const char* name;
+    std::function<Instrmnt * ()> instrument;
+};
+
+InstrumentInfo instrumentArray[] = {
+    {"BeeThree", []() { return new BeeThree(); }},
+    {"BlowHole", []() { return new BlowHole(20); }},
+    {"Bowed", []() { return new Bowed(); }},
+    {"Clarinet", []() { return new Clarinet(); }},
+//    {"Drummer", []() { return new Drummer(); }},  // comment out for STM32 or ESP8266
+    {"Flute", []() { return new Flute(20); }},
+    {"Rhodey", []() { return new Rhodey(); }},
+    {"TubeBell", []() { return new TubeBell(); }},
+    {"Mandolin", []() { return new Mandolin(20); }},
+    {"ModalBar", []() { return new ModalBar(); }},
+    {"Moog", []() { return new Moog(); }},
+    {"Plucked", []() { return new Plucked(); }},
+    {"Saxofony", []() { return new Saxofony(20); }},
+    {"Shakers", []() { return new Shakers(); }},
+    {"Sitar", []() { return new Sitar(); }},
+    {"StifKarp", []() { return new StifKarp(); }},
+    {"TubeBell", []() { return new TubeBell(); }},
+    {"Wurley", []() { return new Wurley(); }},
+    {"BlowBotl", []() { return new BlowBotl(); }},
+    {"Brass", []() { return new Brass(); }},
+    {"FMVoices", []() { return new FMVoices(); }},
+    {"PercFlut", []() { return new PercFlut(); }},
+    {"HevyMetl", []() { return new HevyMetl(); }},
+    {"Recorder", []() { return new Recorder(); }},
+    {"Resonate", []() { return new Resonate(); }},
+    {"Simple", []() { return new Simple(); }},
+    {"Whistle", []() { return new Whistle(); }},
+    {nullptr, nullptr}
+};
+bool active = true;
+uint64_t timeout = 0;
+int instrumentIdx = 0;
+int noteMin = 0;
+int noteMax = 127;
+int noteStep = 12; // 1 octave
+int noteIndex = noteMin;
+int onLengthMs = 400;
+int offLengthMs = 50;
+float amplitude = 1.0;
+
+void selectInstrument() {
+  if (p_Instrmnt==nullptr){
+    Serial.println(instrumentArray[instrumentIdx].name);
+    p_Instrmnt = instrumentArray[instrumentIdx].instrument();
+    in.setInput(p_Instrmnt);
+    in.begin();
+  }
+}
+
+void noteOn() {
+  // play note for 800 ms
+  if (p_Instrmnt!=nullptr){
+    float freq = notes.stkNoteToFrequency(noteIndex);
+    p_Instrmnt->noteOn(freq, amplitude);
+  }
+  timeout = millis()+onLengthMs;
+  active = false;
+}
+
+void noteOff() {
+  // note off - silence for 100 ms
+  if (p_Instrmnt!=nullptr){
+    p_Instrmnt->noteOff(amplitude);
+  }
+  timeout = millis()+offLengthMs;
+
+  // select next note
+  noteIndex += noteStep;
+  // switch instrument after we played all notes
+  if (noteIndex>=noteMax){
+    noteIndex = noteMin;
+    instrumentIdx++;
+    if (instrumentArray[instrumentIdx].name==nullptr){
+      instrumentIdx = 0;
+    }
+    // delete old instrument
+    if (p_Instrmnt!=nullptr){
+      delete p_Instrmnt;
+      p_Instrmnt = nullptr; 
+      selectInstrument();
+    }
+  }
+  active = true;
+}
+
+void play() {
+
+  if (millis()>timeout){
+    if (active){
+      Serial.print("- playing ");
+      Serial.println(noteIndex);
+      noteOn();
+    } else {
+      noteOff();
+    }
+  }
+}
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Warning);
+  StkLogLevel = StkWarning;
+
+  // 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);
+
+  // select first instument
+  selectInstrument();
+
+}
+
+void loop() {
+  play();
+  copier.copy();
+}

examples/examples-vs1053/streams-generator-vs1053/streams-generator-vs1053.ino

@@ -40,7 +40,10 @@ void setup(){
   //cfg.dcs_pin = VS1053_DCS;
   //cfg.dreq_pin = VS1053_DREQ;
   //cfg.reset_pin = VS1053_RESET;
-  out.begin(cfg);
+  if (!out.begin(cfg)){
+      Serial.println("SPI Error");
+      stop();
+  }
 
 }
 

examples/examples-vs1053/streams-midi_memory-vs1053/streams-midi_memory-vs1053.ino

@@ -24,6 +24,10 @@ void setup(){
 
     auto config = out.defaultConfig(TX_MODE);
     config.is_encoded_data = true; // vs1053 is accepting encoded midi data
+  //config.cs_pin = VS1053_CS; 
+  //config.dcs_pin = VS1053_DCS;
+  //config.dreq_pin = VS1053_DREQ;
+  //config.reset_pin = VS1053_RESET;
     out.begin(config);
 }
 

src/AudioHttp/AbstractURLStream.h

@@ -19,6 +19,10 @@ class AbstractURLStream : public AudioStream  {
         virtual bool setMetadataCallback(void (*fn)(MetaDataType info, const char* str, int len)) {
             return false;
         }
+        /// Writes are not supported
+        int availableForWrite() {
+            return 0;
+        }
 
 };
 

src/AudioI2S/I2SConfig.h

@@ -92,7 +92,7 @@ class I2SConfig : public AudioBaseInfo {
 #endif
 
     void logInfo() {
-      LOGI("rx/tx mode: %s", rx_tx_mode == TX_MODE ? "TX":"RX");
+      LOGI("rx/tx mode: %s", RxTxModeNames[rx_tx_mode]);
       LOGI("port_no: %d", port_no);
       LOGI("is_master: %s", is_master ? "Master":"Slave");
       LOGI("sample rate: %d", sample_rate);

src/AudioI2S/I2SESP32.h

@@ -286,10 +286,10 @@ class I2SBase {
             return (i2s_comm_format_t) I2S_COMM_FORMAT_STAND_I2S;
           case I2S_LEFT_JUSTIFIED_FORMAT:
           case I2S_MSB_FORMAT:
-            return (i2s_comm_format_t) I2S_COMM_FORMAT_I2S_MSB;
+            return (i2s_comm_format_t) (I2S_COMM_FORMAT_I2S|I2S_COMM_FORMAT_I2S_MSB);
           case I2S_RIGHT_JUSTIFIED_FORMAT:
           case I2S_LSB_FORMAT:
-            return (i2s_comm_format_t) I2S_COMM_FORMAT_I2S_LSB;
+            return (i2s_comm_format_t) (I2S_COMM_FORMAT_I2S|I2S_COMM_FORMAT_I2S_LSB);
           // this is strange but the docu specifies that 
           // case I2S_PCM_LONG:
           //   return (i2s_comm_format_t) I2S_COMM_FORMAT_STAND_PCM_LONG;

src/AudioLibs/AudioSTK.h

@@ -78,7 +78,9 @@ class STKGenerator : public SoundGenerator<T> {
 template <class StkCls>
 class STKStream : public GeneratedSoundStream<int16_t> {
     public:
-        STKStream() = default;
+        STKStream() {
+            GeneratedSoundStream<int16_t>::setInput(generator);          
+        };
 
         STKStream(StkCls &instrument){
             generator.setInput(instrument);

src/AudioLibs/VS1053Stream.h

@@ -327,15 +327,15 @@ class VS1053Stream : public AudioStreamX {
     bool beginTx() {
         LOGI(LOG_METHOD);
         p_out->begin(cfg);      
-        p_vs1053->begin();
+        bool result = p_vs1053->begin();
         p_vs1053->startSong();
         p_vs1053->switchToMp3Mode(); // optional, some boards require this    
         if (p_vs1053->getChipVersion() == 4) { // Only perform an update if we really are using a VS1053, not. eg. VS1003
             p_vs1053->loadDefaultVs1053Patches(); 
         }
         delay(500);
         setVolume(VS1053_DEFAULT_VOLUME);   
-        return true;
+        return result;
     }
 
 #if VS1053_EXT
@@ -346,17 +346,16 @@ class VS1053Stream : public AudioStreamX {
         rec.setSampleRate(cfg.sample_rate);
         rec.setChannels(cfg.channels);
         rec.setInput(cfg.input_device);
-        p_vs1053->beginInput(rec);
-        return true;
+        return p_vs1053->beginInput(rec);
     }
 
     bool beginMidi(){
         LOGI(LOG_METHOD);
         p_out->begin(cfg);      
-        p_vs1053->beginMidi();
+        bool result = p_vs1053->beginMidi();
         delay(500);
         setVolume(VS1053_DEFAULT_VOLUME);   
-        return true;
+        return result;
     }
 
 #endif

src/AudioTools/AudioCopy.h

@@ -94,10 +94,10 @@ class StreamCopyT {
 
             // // If we try to write to a server we might not have any output destination yet
             int to_write = to->availableForWrite();
-            // if (to_write<=0){
-            //     delay(500);
-            //     return 0;
-            // }
+            if (to_write==0){
+                 delay(500);
+                 return 0;
+            }
 
 
             size_t result = 0;