CopyAll correction

Author: pschatzmann

examples/examples-webserver/player-sd-webserverex_mp3/player-sd-webserverex_mp3.ino

@@ -12,18 +12,28 @@
 #include "AudioLibs/AudioServerEx.h"
 #include "AudioCodecs/CodecCopy.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
+
 const char *ssid = "SSID";
 const char *password = "PWD";
 const char *startFilePath="/";
 const char* ext="mp3";
-AudioSourceSD source(startFilePath, ext);
+
+AudioSourceSD source(startFilePath, ext, PIN_AUDIO_KIT_SD_CARD_CS);
 AudioServerEx out;
 AudioPlayer player(source, out, *new CopyDecoder());
 
 void setup() {
   Serial.begin(115200);
   AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
+  // setup SPI for SD card
+  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);
+
+
   // setup output - We need to login and serve the data as audio/mp3
   auto cfg = out.defaultConfig();
   cfg.password = password;

src/AudioHttp/URLStream.h

@@ -105,12 +105,12 @@ class URLStreamDefault : public AbstractURLStream {
         }
 
         virtual int available() override {
-            if (!active) return 0;
+            if (!active || !request) return 0;
             return request.available();
         }
 
         virtual size_t readBytes(uint8_t *buffer, size_t length) override {
-            if (!active) return -1;
+            if (!active || !request) return 0;
 
             size_t read = request.read((uint8_t*)buffer, length);
             total_read+=read;

src/AudioTools/AudioCopy.h

@@ -109,7 +109,10 @@ class StreamCopyT {
                 }
 
                 // get the data now
-                bytes_read = from->readBytes((uint8_t*)buffer, bytes_to_read);
+                bytes_read = 0;
+                if (bytes_to_read>0){
+                    bytes_read = from->readBytes((uint8_t*)buffer, bytes_to_read);
+                }
 
                 // determine mime
                 notifyMime(buffer, bytes_to_read);
@@ -120,9 +123,11 @@ class StreamCopyT {
 
                 // callback with unconverted data
                 if (onWrite!=nullptr) onWrite(onWriteObj, buffer, result);
+
                 #ifndef COPY_LOG_OFF
                 LOGI("StreamCopy::copy %u -> %u -> %u bytes - in %u hops", (unsigned int)bytes_to_read,(unsigned int) bytes_read, (unsigned int)result, (unsigned int)delayCount);
                 #endif
+
                 CHECK_MEMORY();
             } else {
                 // give the processor some time 
@@ -252,23 +257,26 @@ class StreamCopyT {
 
         // blocking write - until everything is processed
         size_t write(size_t len, size_t &delayCount ){
-            if (buffer==nullptr) return 0;
+            if (buffer==nullptr || len==0) return 0;
             size_t total = 0;
+            long open = len;
             int retry = 0;
-            while(total<len){
-                size_t written = to->write((const uint8_t*)buffer+total, len-total);
+            while(open>0){
+                size_t written = to->write((const uint8_t*)buffer+total, open);
                 total += written;
+                open -= written;
                 delayCount++;
 
                 if (retry++ > retryLimit){
-                    LOGE("write to target has failed!");
+                    LOGE("write to target has failed! (%ld bytes)", open);
                     break;
                 }
 
                 if (retry>1) {
                     delay(5);
-                    LOGI("try write - %d ",retry);
+                    LOGI("try write - %d (open %ld bytes) ",retry, open);
                 }
+
                 CHECK_MEMORY();
             }
             return total;