AudioSourceVector corrections for sdfat

Author: pschatzmann

examples/tests/player/test-vector-source/README.md

@@ -0,0 +1,112 @@
+#include "AudioTools.h"
+#include "AudioTools/Disk/AudioSource.h"
+#include "SdFat.h"
+
+// SDFAT objects
+SdFat sd;
+File32 file;
+
+// Audio objects
+AudioSourceVector<File32> audioSource;
+NamePrinter namePrinter(audioSource);
+
+// Callback to convert file path to stream for AudioSourceVector
+File32* fileToStream(const char* path, File32& oldFile) {
+  oldFile.close();  
+  file.open(path);
+  
+  if (!file) {
+    Serial.print("Failed to open: ");
+    Serial.println(path);
+    return nullptr;
+  }
+  return &file;
+}
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+  
+  Serial.println("AudioSourceVector with SDFAT Test");
+  
+  // Initialize SD card
+  if (!sd.begin(SS)) {
+    Serial.println("SD card initialization failed!");
+    return;
+  }
+  Serial.println("SD card initialized successfully");
+  
+  // 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();
+  
+  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);
+      if (stream) {
+        Serial.print("Next file: ");
+        Serial.println(audioSource.toStr());
+        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!");
+        stream->close();
+      } else {
+        Serial.println("Failed to select by path");
+      }
+    }
+  }
+  
+  Serial.println("\nTest completed!");
+}
+
+void loop() {
+  // Nothing to do in loop for this test
+  delay(1000);
+}

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

@@ -227,7 +227,7 @@ 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;
 
@@ -336,7 +336,7 @@ class AudioSourceVector : public AudioSource, public PathNamesRegistry {
     int pathIndex = findOrAddPath(pathStr.c_str());
 
     // Create file entry with path index
-    FileEntry entry(pathIndex, nameStr.c_str());
+    FileEntry entry{pathIndex, nameStr.c_str()};
     files.push_back(entry);
 
     LOGI("Added file: %s (total: %d, path_index: %d)", nameWithPath,
@@ -371,11 +371,12 @@ class AudioSourceVector : public AudioSource, public PathNamesRegistry {
   }
 
   /// Get the current file reference for use in callback
-  FileType getCurrentFile() {
+  FileType& getCurrentFile() {
     if (current_stream) {
       return *current_stream;
     }
-    return FileType();
+    static FileType empty;
+    return empty;
   }
 
   /// provides the actual stream (e.g. file) name or url
@@ -391,7 +392,7 @@ class AudioSourceVector : public AudioSource, public PathNamesRegistry {
   const char* name(int index) { return getFullPath(index).c_str(); }
 
  protected:
-  Vector<FileEntry> files;
+  Vector<FileEntry> files;    // List of all files
   Vector<Str> path_registry;  // Shared registry of unique paths
   int current_index = 0;
   FileType* current_stream = nullptr;
@@ -417,7 +418,7 @@ class AudioSourceVector : public AudioSource, public PathNamesRegistry {
   }
 
   /// Get file entry at index
-  const FileEntry& getFileEntry(int index) const { return files[index]; }
+  FileEntry& getFileEntry(int index) const { return files[index]; }
 
   /// Get full path of file at index
   Str getFullPath(int index) {
@@ -462,7 +463,7 @@ class AudioSourceVector : public AudioSource, public PathNamesRegistry {
 template <typename FileType>
 class AudioSourceArray : public AudioSource {
  public:
-  typedef FileType* (*FileToStreamCallback)(const char* path, FileType file);
+  typedef FileType* (*FileToStreamCallback)(const char* path, FileType& file);
 
   AudioSourceArray() = default;
 
@@ -579,11 +580,12 @@ class AudioSourceArray : public AudioSource {
     nameToStreamCallback = callback;
   }
 
-  FileType getCurrentFile() {
+  FileType& getCurrentFile() {
     if (current_stream) {
       return *current_stream;
     }
-    return FileType();
+    static FileType empty;
+    return empty;
   }
 
   /// Get file path at index