compile warnings

Author: pschatzmann

examples/examples-stk/streams-stk_files-audiokit/CMakeLists.txt renamed to examples/examples-stk/streams-stk-desktop/CMakeLists.txt

@@ -8,30 +8,30 @@ set (DCMAKE_CXX_FLAGS "-Werror")
 include(FetchContent)
 option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
 
-# 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()
-
 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})
+    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(streams-stk_files-audiokit.ino PROPERTIES LANGUAGE CXX)
-add_executable (stk_example streams-stk_files-audiokit.ino)
+set_source_files_properties(streams-stk-desktop.ino PROPERTIES LANGUAGE CXX)
+add_executable (stk_example streams-stk-desktop.ino)
 
 # set preprocessor defines
 target_compile_definitions(arduino_emulator PUBLIC -DDEFINE_MAIN)
 target_compile_definitions(stk_example 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_definitions(arduino-stk PUBLIC -DPA_USE_COREAUDIO=1)
 
 # specify libraries
-target_link_libraries(stk_example arduino-stk_static arduino_emulator arduino-audio-tools arduino-stk)
+target_link_libraries(stk_example arduino-stk portaudio_static arduino_emulator arduino-audio-tools )
 

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

@@ -0,0 +1,73 @@
+/**
+ * @file streams-stk-desktop.ino
+ * @brief Build and run on desktop using PortAudio
+ * @author Phil Schatzmann
+ * @copyright Copyright (c) 2021
+ */
+
+#include "Arduino.h"
+#include "AudioTools.h"
+#include "AudioLibs/AudioSTK.h"
+#include "AudioLibs/PortAudioStream.h"
+
+STKStream<Instrmnt> in;
+PortAudioStream 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(static_cast<long>(sizeof(notes_array)/sizeof(uint16_t)))];
+
+      Serial.print("playing ");
+      Serial.println(freq);
+
+      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);
+
+  // 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);
+  out.begin(ocfg);
+
+}
+
+void loop() {
+  play();
+  copier.copy();
+}

src/AudioCodecs/AudioEncoded.h

@@ -30,7 +30,7 @@ class AudioDecoder : public AudioWriter, public AudioBaseInfoSource {
     setOutputStream(*p_print);
     setNotifyAudioChange(out_stream);
   }
-  virtual void setOutputStream(Print &out_stream) = 0;
+  virtual void setOutputStream(Print &out_stream) override = 0;
   // Th decoding result is PCM data
   virtual bool isResultPCM() { return true;} 
 };
@@ -259,7 +259,7 @@ class EncodedAudioStream : public AudioPrint {
     return cfg;
   }
 
-  virtual void setAudioInfo(AudioBaseInfo info) {
+  virtual void setAudioInfo(AudioBaseInfo info) override {
     LOGD(LOG_METHOD);
     AudioPrint::setAudioInfo(info);
     decoder_ptr->setAudioInfo(info);

src/AudioLibs/AudioSTK.h

@@ -1,9 +1,10 @@
 #pragma once
 
 #include "AudioConfig.h"
-
 #include "Arduino.h"
-#include "freertos/FreeRTOS.h"
+#ifdef ESP32
+#  include "freertos/FreeRTOS.h"
+#endif
 #include "StkAll.h"
 
 namespace audio_tools {

src/AudioLibs/PortAudioStream.h

@@ -63,6 +63,9 @@ class PortAudioStream : public AudioStreamX {
                     result.is_input = true;
                     result.is_output = true;
                     break;
+                default:
+                    LOGE("Unsupported Mode")
+                    break;
             }
 
             return result;

src/AudioTools/AudioOutput.h

@@ -38,7 +38,7 @@ class AudioPrint : public Print, public AudioBaseInfoDependent, public AudioBase
         }
 
         // overwrite to do something useful
-        virtual void setAudioInfo(AudioBaseInfo info) {
+        virtual void setAudioInfo(AudioBaseInfo info) override {
             LOGD(LOG_METHOD);
             cfg = info;
             info.logInfo();
@@ -47,7 +47,7 @@ class AudioPrint : public Print, public AudioBaseInfoDependent, public AudioBase
             }
         }
 
-        virtual void  setNotifyAudioChange(AudioBaseInfoDependent &bi) {
+        virtual void  setNotifyAudioChange(AudioBaseInfoDependent &bi) override {
             p_notify = &bi;
         }
 
@@ -686,7 +686,7 @@ class MemoryPrint : public AudioPrint {
             }
         }
 
-        int availableForWrite() {
+        int availableForWrite() override {
             return size-pos;
         }
 

src/AudioTools/AudioSource.h

@@ -94,7 +94,7 @@ class AudioSourceCallback : public AudioSource {
         return indexStreamCallback == nullptr ? nullptr : indexStreamCallback(index);
     }
     /// Returns audio stream by path
-    virtual Stream* selectStream(const char* path) {
+    virtual Stream* selectStream(const char* path) override {
         this->path = path;
         return indexStreamCallback == nullptr ? nullptr : indexStreamCallback(-1);
     };

src/AudioTools/AudioStreams.h

@@ -533,7 +533,7 @@ class GeneratedSoundStream : public AudioStreamX {
   bool begin() override {
     LOGD(LOG_METHOD);
     if (generator_ptr==nullptr){
-      LOGE(source_not_defined_error);
+      LOGE("%s",source_not_defined_error);
       return false;
     }
     generator_ptr->begin();
@@ -547,7 +547,7 @@ class GeneratedSoundStream : public AudioStreamX {
   bool begin(AudioBaseInfo cfg) {
     LOGD(LOG_METHOD);
     if (generator_ptr==nullptr){
-      LOGE(source_not_defined_error);
+      LOGE("%s",source_not_defined_error);
       return false;
     }
     generator_ptr->begin(cfg);
@@ -1322,7 +1322,7 @@ class MeasuringStream : public AudioStreamX {
         if (p_logout!=nullptr){
           p_logout->println(msg);
         } else {
-          LOGI(msg);
+          LOGI("%s",msg);
         }
     }
 

src/AudioTools/AudioStreamsConverter.h

@@ -84,7 +84,7 @@ class ChannelFormatConverterStreamT : public AudioStreamX {
         buffer.resize(result_samples);
         result = converter.convert((uint8_t*)buffer.data(),(uint8_t*) in_data, size);
         if (result!=result_samples*sizeof(T)){
-          LOGE("size %d -> result: %d - expeced: %d", (int) size, (int) result, (int) result_samples*sizeof(T));
+          LOGE("size %d -> result: %d - expeced: %d", (int) size, (int) result, static_cast<int>(result_samples*sizeof(T)));
         }
         return result;
     }
@@ -280,7 +280,7 @@ class NumberFormatConverterStreamT : public AudioStreamX {
           p_print = &print;
         }
 
-        bool begin(){
+        bool begin() override {
           return true;
         }