AudioSourceVector corrections

Author: pschatzmann

examples/tests/player/test-vector-source/test-vector-source.ino

@@ -1,82 +1,88 @@
 #include "AudioTools.h"
 #include "AudioTools/Disk/AudioSource.h"
 #include "SdFat.h"
+#include "SPI.h"
+
+#define PIN_AUDIO_KIT_SD_CARD_CS 13
+#define PIN_AUDIO_KIT_SD_CARD_MISO 2
+#define PIN_AUDIO_KIT_SD_CARD_MOSI 15
+#define PIN_AUDIO_KIT_SD_CARD_CLK 14
 
 // SDFAT objects
 SdFat sd;
 File32 file;
+const char* path = "/Bob Dylan/Bringing It All Back Home";
 
 // Audio objects
 AudioSourceVector<File32> audioSource;
-NamePrinter namePrinter(audioSource);
+NamePrinter namePrinter(audioSource, path);
+File32 audioFile;
 
 // Callback to convert file path to stream for AudioSourceVector
 File32* fileToStream(const char* path, File32& oldFile) {
-  oldFile.close();  
-  file.open(path);
-  
-  if (!file) {
+  oldFile.close();
+  audioFile.open(path);
+
+  if (!audioFile) {
     Serial.print("Failed to open: ");
     Serial.println(path);
     return nullptr;
   }
-  return &file;
+  return &audioFile;
 }
 
 void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial, AudioLogger::Info);
-  
+
   Serial.println("AudioSourceVector with SDFAT Test");
-  
+
   // Initialize SD card
-  if (!sd.begin(SS)) {
+  SPI.begin(PIN_AUDIO_KIT_SD_CARD_CLK, PIN_AUDIO_KIT_SD_CARD_MISO, PIN_AUDIO_KIT_SD_CARD_MOSI, PIN_AUDIO_KIT_SD_CARD_CS);
+  if (!sd.begin(PIN_AUDIO_KIT_SD_CARD_CS, SPI_HALF_SPEED)) {
     Serial.println("SD card initialization failed!");
     return;
   }
   Serial.println("SD card initialized successfully");
-  
+
+  Serial.println("\n--- Collecting audio files from SD card ---");
+
   // Set up the callback for AudioSourceVector
   audioSource.setNameToStreamCallback(fileToStream);
-  
-  Serial.println("\n--- Collecting audio files from SD card ---");
-  
+
   // Use SDFAT's ls method to list files and automatically add them via NamePrinter
   // This will print each file name, and NamePrinter will capture each line
   // and call audioSource.addName() for each file
-  
-  Serial.println("Files found on SD card:");
-  sd.ls(&namePrinter, LS_R); // Recursive listing, output goes to NamePrinter
-  
-  // Flush any remaining content in the NamePrinter buffer
-  namePrinter.flush();
-  
+  auto dir = sd.open(path, FILE_READ);
+  dir.ls(&namePrinter, 0);
+  dir.close();
+
   Serial.print("\nTotal files collected: ");
   Serial.println(audioSource.size());
-  
+
   // Display collected files
   Serial.println("\n--- Collected Files ---");
   for (int i = 0; i < audioSource.size(); i++) {
     Serial.print(i);
     Serial.print(": ");
     Serial.println(audioSource.name(i));
   }
-  
+
   // Test navigation
   if (audioSource.size() > 0) {
     Serial.println("\n--- Testing AudioSource Navigation ---");
-    
+
     // Start playback simulation
     audioSource.begin();
-    
+
     // Select first file
     File32* stream = audioSource.selectStream(0);
     if (stream) {
       Serial.print("Selected file 0: ");
       Serial.println(audioSource.toStr());
       stream->close();
     }
-    
+
     // Try next file
     if (audioSource.size() > 1) {
       stream = audioSource.nextStream(1);
@@ -86,13 +92,13 @@ void setup() {
         stream->close();
       }
     }
-    
+
     // Test selectStream by path
     if (audioSource.size() > 0) {
       const char* firstFile = audioSource.name(0);
       Serial.print("Selecting by path: ");
       Serial.println(firstFile);
-      
+
       stream = audioSource.selectStream(firstFile);
       if (stream) {
         Serial.println("Successfully selected by path!");
@@ -102,7 +108,7 @@ void setup() {
       }
     }
   }
-  
+
   Serial.println("\nTest completed!");
 }
 

src/AudioTools/CoreAudio/AudioBasic/Str.h

@@ -163,10 +163,17 @@ class Str : public StrView {
     this->len = result_idx;
   }
 
+  /// clears and resizes to 0
   void clear() override {
+    clear(true);
+  }
+
+  void clear(bool resize) {
     len = 0;
-    maxlen = 0;
-    vector.resize(0);
+    if (resize){
+      maxlen = 0;
+      vector.resize(0);
+    }
     chars = nullptr;
   }
 

src/AudioTools/Disk/AudioSource.h

@@ -177,15 +177,26 @@ class PathNamesRegistry {
 
 class NamePrinter : public Print {
  public:
-  NamePrinter(PathNamesRegistry& dataSource) : dataSource(dataSource) {}
-
+  NamePrinter(PathNamesRegistry& dataSource, const char* prefix = nullptr)
+      : dataSource(dataSource), prefix(prefix) {}
+  void setPrefix(const char* prefix) { this->prefix = prefix; }
   size_t write(uint8_t ch) override {
     if (ch == '\n' || ch == '\r') {
       // End of line - process the accumulated line
       if (line_buffer.length() > 0) {
-        LOGI("adding %s", line_buffer.c_str());
-        dataSource.addName(line_buffer.c_str());
-        line_buffer.clear();
+        line_buffer.trim();
+        LOGI("adding '%s'", line_buffer.c_str());
+        if (prefix != nullptr) {
+          // Prepend prefix if set
+          Str name{prefix};
+          name.add("/");
+          name.add(line_buffer.c_str());
+          dataSource.addName(name.c_str());
+        } else {
+          // Add line as is
+          dataSource.addName(line_buffer.c_str());
+        }
+        line_buffer.clear(false);
       }
       return 1;
     } else {
@@ -213,6 +224,7 @@ class NamePrinter : public Print {
  private:
   PathNamesRegistry& dataSource;
   Str line_buffer{200};  // Buffer to accumulate characters for each line
+  const char* prefix = nullptr;
 };
 
 /**
@@ -227,7 +239,8 @@ class NamePrinter : public Print {
 template <typename FileType>
 class AudioSourceVector : public AudioSource, public PathNamesRegistry {
  public:
-  typedef FileType* (*FileToStreamCallback)(const char* path, FileType& oldFile);
+  typedef FileType* (*FileToStreamCallback)(const char* path,
+                                            FileType& oldFile);
 
   AudioSourceVector() = default;