Merge pull request #331 from pschatzmann/feature-files

Feature files

Author: pschatzmann

examples/examples-audiokit/player-sd-audiokit/player-sd-audiokit.ino

@@ -9,12 +9,12 @@
 
 #include "AudioTools.h"
 #include "AudioLibs/AudioKit.h"
-#include "AudioLibs/AudioSourceSd.h"
+#include "AudioLibs/AudioSourceSD.h" // or AudioSourceIdxSD.h
 #include "AudioCodecs/CodecMP3Helix.h"
 
 const char *startFilePath="/";
 const char* ext="mp3";
-AudioSourceSd source(startFilePath, ext, PIN_AUDIO_KIT_SD_CARD_CS);
+AudioSourceSD source(startFilePath, ext, PIN_AUDIO_KIT_SD_CARD_CS);
 AudioKitStream kit;
 MP3DecoderHelix decoder;  // or change to MP3DecoderMAD
 AudioPlayer player(source, kit, decoder);

examples/examples-audiokit/player-sd_a2dp-audiokit/player-sd_a2dp-audiokit.ino

@@ -14,14 +14,14 @@
 #include "AudioTools.h"
 #include "AudioLibs/AudioA2DP.h"
 #include "AudioLibs/AudioKit.h"
-#include "AudioLibs/AudioSourceSdFat.h"
+#include "AudioLibs/AudioSourceSDFAT.h"
 #include "AudioCodecs/CodecMP3Helix.h"
 
 const char *startFilePath="/";
 const char* ext="mp3";
 AudioKitStream kit;
 SdSpiConfig sdcfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(10) , &AUDIOKIT_SD_SPI);
-AudioSourceSdFat source(startFilePath, ext, sdcfg);
+AudioSourceSDFAT source(startFilePath, ext, sdcfg);
 MP3DecoderHelix decoder;
 AudioPlayer player(source, kit, decoder);
 BluetoothA2DPSink a2dp_sink;

examples/examples-audiokit/player-sdfat-audiokit/README.md

@@ -18,5 +18,5 @@ You need to install the following libraries:
 
 - https://github.com/pschatzmann/arduino-audio-tools
 - https://github.com/pschatzmann/arduino-libhelix
-- https://github.com/greiman/SdFat
 - https://github.com/pschatzmann/arduino-audiokit
+- https://github.com/greiman/SdFat

examples/examples-audiokit/player-sdfat-audiokit/player-sdfat-audiokit.ino

@@ -9,13 +9,13 @@
 
 #include "AudioTools.h"
 #include "AudioLibs/AudioKit.h"
-#include "AudioLibs/AudioSourceSdFat.h"
+#include "AudioLibs/AudioSourceSDFAT.h" // or AudioSourceIdxSDFAT.h
 #include "AudioCodecs/CodecMP3Helix.h"
 
 const char *startFilePath="/";
 const char* ext="mp3";
 SdSpiConfig sdcfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(10) , &AUDIOKIT_SD_SPI);
-AudioSourceSdFat source(startFilePath, ext, sdcfg);
+AudioSourceSDFAT source(startFilePath, ext, sdcfg);
 AudioKitStream kit;
 MP3DecoderHelix decoder;  // or change to MP3DecoderMAD
 AudioPlayer player(source, kit, decoder);

examples/examples-audiokit/player-sdmmc-audiokit/player-sdmmc-audiokit.ino

@@ -8,12 +8,12 @@
 
 #include "AudioTools.h"
 #include "AudioLibs/AudioKit.h"
-#include "AudioLibs/AudioSourceSdMmc.h"
+#include "AudioLibs/AudioSourceSDMMC.h" // or AudioSourceIdxSDMMC.h
 #include "AudioCodecs/CodecMP3Helix.h"
 
 const char *startFilePath="/";
 const char* ext="mp3";
-AudioSourceSdMmc source(startFilePath, ext);
+AudioSourceSDMMC source(startFilePath, ext);
 AudioKitStream kit;
 MP3DecoderHelix decoder;  // or change to MP3DecoderMAD
 AudioPlayer player(source, kit, decoder);

examples/examples-player/player-sdfat-a2dp/player-sdfat-a2dp.ino

@@ -9,12 +9,12 @@
 
 #include "AudioTools.h"
 #include "AudioLibs/AudioA2DP.h"
-#include "AudioLibs/AudioSourceSdFat.h"
+#include "AudioLibs/AudioSourceSDFAT.h"
 #include "AudioCodecs/CodecMP3Helix.h"
 
 const char *startFilePath="/";
 const char* ext="mp3";
-AudioSourceSdFat source(startFilePath, ext);
+AudioSourceSDFAT source(startFilePath, ext);
 A2DPStream out = A2DPStream::instance();  // A2DP input - A2DPStream is a singleton!
 MP3DecoderHelix decoder;
 AudioPlayer player(source, out, decoder);

examples/examples-player/player-sdfat-analog/player-sdfat-analog.ino

@@ -8,13 +8,13 @@
 
 
 #include "AudioTools.h"
-#include "AudioLibs/AudioSourceSdFat.h"
+#include "AudioLibs/AudioSourceSDFAT.h"
 #include "AudioCodecs/CodecMP3Helix.h"
 
 
 const char *startFilePath="/";
 const char* ext="mp3";
-AudioSourceSdFat source(startFilePath, ext);
+AudioSourceSDFAT source(startFilePath, ext);
 AnalogAudioStream out;
 MP3DecoderHelix decoder;
 AudioPlayer player(source, out, decoder);

examples/examples-player/player-sdfat-i2s/player-sdfat-i2s.ino

@@ -8,13 +8,13 @@
 
 
 #include "AudioTools.h"
-#include "AudioLibs/AudioSourceSdFat.h"
+#include "AudioLibs/AudioSourceSDFAT.h"
 #include "AudioCodecs/CodecMP3Helix.h"
 
 
 const char *startFilePath="/";
 const char* ext="mp3";
-AudioSourceSdFat source(startFilePath, ext);
+AudioSourceSDFAT source(startFilePath, ext);
 I2SStream i2s;
 MP3DecoderHelix decoder;
 AudioPlayer player(source, i2s, decoder);

examples/examples-vs1053/player-sd-vs1053/player-sd-vs1053.ino

@@ -10,15 +10,15 @@
 
 #include "AudioTools.h"
 #include "AudioLibs/VS1053Stream.h"
-#include "AudioLibs/AudioSourceSdFat.h"
+#include "AudioLibs/AudioSourceSDFAT.h"
 #include "AudioCodecs/CodecCopy.h"
 
 #define SD_CARD_CS  22
 
 const char *startFilePath="/";
 const char* ext="mp3";
-SdSpiConfig sdcfg(SD_CARD_CS, SHARED_SPI, SD_SCK_MHZ(2) , &SPI);
-AudioSourceSdFat source(startFilePath, ext, sdcfg);
+SdSpiConfig sdcfg(SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(10) , &SPI);
+AudioSourceSDFAT source(startFilePath, ext, sdcfg);
 VS1053Stream vs1053; // final output
 AudioPlayer player(source, vs1053, *new CopyDecoder());
 

examples/tests/sd/test-index-sd/test-index-sd.ino

@@ -0,0 +1,24 @@
+
+#include "AudioTools.h"
+#include "AudioLibs/AudioKit.h"
+#include "FS.h"
+#include "SD.h"
+#include "SPI.h"
+#include "AudioLibs/AudioSourceIdxSD.h"
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Debug);
+
+  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);  
+  while (!SD.begin(PIN_AUDIO_KIT_SD_CARD_CS)) {
+       Serial.println("SD.begin failed");
+       delay(1000);
+  }
+  AudioSourceSD<fs::SDFS,fs::File> idx{SD};
+  idx.ls(Serial, "/", "mp3","*");
+
+}
+
+void loop() {
+}