Merge branch 'main' of https://github.com/pschatzmann/arduino-audio-tools

Author: pschatzmann

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

@@ -14,7 +14,7 @@
 #include "AudioTools.h"
 #include "AudioTools/AudioLibs/VS1053Stream.h"
 
-AudioInfo info(44100, 2, 16);
+AudioInfo info(16000, 2, 16);
 SineWaveGenerator<int16_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound(sineWave);             // Stream generated from sine wave
 VS1053Stream out;    // VS1053 output

src/AudioTools/AudioLibs/VS1053Stream.h

@@ -68,9 +68,9 @@ class VS1053Config : public AudioInfo {
  * audio module. If you want to write encoded data set is_encoded_data = true in
  * the configuration. Many VS1053 modules also have a built in microphone that
  * can be used for recording: set the mode to RX_MODE to use this.
- * 
+ *
  * Depends on https://github.com/pschatzmann/arduino-vs1053
- * 
+ *
  * @ingroup io
  * @author Phil Schatzmann
  * @copyright GPLv3
@@ -197,6 +197,9 @@ class VS1053Stream : public AudioStream, public VolumeSupport {
         result = false;
         break;
     }
+
+    // log error on failure
+    if (!result) LOGE("begin failed");
     return result;
   }
 

src/AudioTools/CoreAudio/BaseConverter.h

@@ -993,17 +993,18 @@ class ChannelAvgT : public BaseConverter {
  * @ingroup convert
  * @tparam T
  */
-template <typename T = int16_t>
+template <typename T = int16_t, typename SumT = float>
 class ChannelMixer : public BaseConverter {
  public:
   ChannelMixer(int channels = 2) { this->channels = channels; }
-  size_t convert(uint8_t *target, uint8_t *src, size_t size) {
-    T *srcT = (T *)src;
-    T *targetT = (T *)target;
+  size_t convert(uint8_t *data, size_t size) {
+    if (channels <= 1) return size;  // No mixing needed for single channel
+    T *srcT = (T *)data;
+    T *targetT = (T *)data;
     int samples = size / sizeof(T);
     assert(samples % channels == 0);
     for (int j = 0; j < samples; j += channels) {
-      float sum = 0;
+      SumT sum = 0;
       for (int ch = 0; ch < channels; ch++) {
         sum += srcT[j + ch];
       }

src/AudioTools/Disk/AudioSourceSD.h

@@ -72,6 +72,7 @@ class AudioSourceSD : public AudioSource {
   }
 
   void end() {
+    file.close();
     SD.end();
     is_sd_setup = false;
   }
@@ -82,17 +83,19 @@ class AudioSourceSD : public AudioSource {
   }
 
   virtual Stream *selectStream(int index) override {
-    LOGI("selectStream: %d", index);
-    idx_pos = index;
-    file_name = idx[index];
-    if (file_name==nullptr) return nullptr;
-    LOGI("Using file %s", file_name);
-    file = SD.open(file_name);
-    return file ? &file : nullptr;
+    LOGI("selectStream SD: %d", index);
+    if (index > -1) {  // avoid invalid position
+      idx_pos = index;
+    }
+    return selectStream(idx[idx_pos]);
   }
 
   virtual Stream *selectStream(const char *path) override {
     file.close();
+    if (path == nullptr) {
+      LOGE("Filename is null")
+      return nullptr;
+    }
     file = SD.open(path);
     file_name = file.name();
     LOGI("-> selectStream: %s", path);

src/AudioTools/Disk/AudioSourceSDFAT.h

@@ -87,6 +87,8 @@ class AudioSourceSDFAT : public AudioSource {
   }
 
   void end() {
+    file.close();
+
     if (is_sd_setup) {
       TRACEI();
 #ifdef ESP32

src/AudioTools/Disk/AudioSourceSDMMC.h

@@ -38,6 +38,10 @@ class AudioSourceSDMMC : public AudioSource {
     setup_index = setupIndex;
   }
 
+  virtual ~AudioSourceSDMMC() {
+    end();
+  }
+
   virtual bool begin() override {
     TRACED();
     if (!is_sd_setup) {
@@ -53,6 +57,7 @@ class AudioSourceSDMMC : public AudioSource {
   }
 
   void end() {
+    file.close();
     SD_MMC.end();
     is_sd_setup = false;
   }
@@ -65,6 +70,7 @@ class AudioSourceSDMMC : public AudioSource {
 
   virtual Stream *selectStream(int index) override {
     LOGI("selectStream: %d", index);
+    file.close();
     idx_pos = index;
     file_name = idx[index];
     if (file_name==nullptr) return nullptr;

src/AudioTools/Disk/AudioSourceSPIFFS.h

@@ -20,6 +20,10 @@ class AudioSourceSPIFFS : public AudioSource {
     start_path = startFilePath;
     exension = ext;
   }
+  
+  virtual ~AudioSourceSPIFFS() {
+    end();
+  }
 
   virtual bool begin() override {
     TRACED();
@@ -40,6 +44,7 @@ class AudioSourceSPIFFS : public AudioSource {
   }
 
   void end() {
+    file.close();
     SPIFFS.end();
     is_sd_setup = false;
   }
@@ -51,6 +56,7 @@ class AudioSourceSPIFFS : public AudioSource {
 
   virtual Stream *selectStream(int index) override {
     LOGI("selectStream: %d", index);
+    file.close();
     idx_pos = index;
     file_name = idx[index];
     if (file_name==nullptr) return nullptr;

src/AudioTools/Disk/AudioSourceSTD.h

@@ -25,13 +25,18 @@ class AudioSourceSTD : public AudioSource {
     timeout_auto_next_value = 600000;
   }
 
+  virtual ~AudioSourceSTD() {
+    end();
+  }
+
   virtual bool begin() override {
     TRACED();
     idx_pos = 0;
     return true;
   }
 
   virtual void end() {
+    file.close();
   }
 
   virtual Stream *nextStream(int offset = 1) override {

src/AudioTools/Disk/AudioSourceURL.h

@@ -26,6 +26,11 @@ class AudioSourceURL : public AudioSource {
     this->pos = startPos - 1;
     this->timeout_auto_next_value = 20000;
   }
+  
+  virtual ~AudioSourceURL() {
+    end();
+  }
+
 
   /// Setup Wifi URL
   virtual bool begin() override {
@@ -34,6 +39,11 @@ class AudioSourceURL : public AudioSource {
     return true;
   }
 
+  void end() {
+    if (started) actual_stream->end();
+    started = false;
+  }
+
   /// Opens the selected url from the array
   Stream* selectStream(int idx) override {
     pos = idx;

src/AudioTools/Disk/AudioSourceVFS.h

@@ -36,13 +36,19 @@ class AudioSourceVFS : public AudioSource {
     exension = ext;
   }
 
+  virtual ~AudioSourceVFS() {
+    end();
+  }
+
+
   virtual bool begin() override {
     TRACED();
     idx_pos = 0;
     return (p_vfs) ? p_vfs->begin() : false;
   }
 
   virtual void end() {
+    file.close();
     if (p_vfs) p_vfs->end();
   }
 
@@ -64,6 +70,10 @@ class AudioSourceVFS : public AudioSource {
 
   virtual Stream *selectStream(const char *path) override {
     file.close();
+    if (path == nullptr) {
+      LOGE("Filename is null")
+      return nullptr;
+    }
     assert(p_vfs != nullptr);
     file = p_vfs->open(path);
     file_name = file.name();