diff --git a/examples/PlayMP3FromSPIFFS/PlayMP3FromSPIFFS.ino b/examples/PlayMP3FromSPIFFS/PlayMP3FromSPIFFS.ino index dbba37d..62876d1 100644 --- a/examples/PlayMP3FromSPIFFS/PlayMP3FromSPIFFS.ino +++ b/examples/PlayMP3FromSPIFFS/PlayMP3FromSPIFFS.ino @@ -18,20 +18,19 @@ AudioFileSourceID3 *id3; // Called when a metadata event occurs (i.e. an ID3 tag, an ICY block, etc. -void MDCallback(void *cbData, const char *type, bool isUnicode, Stream *stream) +void MDCallback(void *cbData, const char *type, bool isUnicode, const char *string) { (void)cbData; Serial.printf("ID3 callback for: %s = '", type); if (isUnicode) { - // Skip byte order marker - stream->read(); - stream->read(); + string += 2; } - while (stream->available()) { - char a = stream->read(); + + while (*string) { + char a = *(string++); if (isUnicode) { - stream->read(); + string++; } Serial.printf("%c", a); } diff --git a/examples/WebRadio/WebRadio.ino b/examples/WebRadio/WebRadio.ino index 40540d4..ce0dc7e 100644 --- a/examples/WebRadio/WebRadio.ino +++ b/examples/WebRadio/WebRadio.ino @@ -209,13 +209,13 @@ void HandleStop(WiFiClient *client) RedirectToIndex(client); } -void MDCallback(void *cbData, const char *type, bool isUnicode, Stream *stream) +void MDCallback(void *cbData, const char *type, bool isUnicode, const char *string) { const char *ptr = reinterpret_cast(cbData); (void) isUnicode; // Punt this ball for now (void) ptr; - if (strstr(type, PSTR("Title"))) { - strncpy(title, stream->readString().c_str(), sizeof(title)); + if (strstr_P(type, PSTR("Title"))) { + strncpy_P(title, string, sizeof(title)); title[sizeof(title)-1] = 0; } else { // Who knows what to do? Not me! diff --git a/src/AudioFileSourceICYStream.cpp b/src/AudioFileSourceICYStream.cpp index 0dc86fa..0b2a9b4 100644 --- a/src/AudioFileSourceICYStream.cpp +++ b/src/AudioFileSourceICYStream.cpp @@ -19,8 +19,6 @@ */ #include "AudioFileSourceICYStream.h" -#include "AudioFileSourcePROGMEM.h" -#include "AudioFileStream.h" AudioFileSourceICYStream::AudioFileSourceICYStream() { @@ -209,18 +207,13 @@ retry: if (d==';') { mdr.unread(d); break; } else { mdr.unread(d); } } -// if ((c=='\n') || (c=='\r') || (c==' ') || (c=='\t') || (c==0)) continue; // Throw away any whitespace *(p++) = c; } if (c != '\'') { // MD data was too long, read and throw away rest while ((c != '\'') && !mdr.eof()) mdr.read(&c, 1); } - { - AudioFileSourcePROGMEM afsp(value, strlen(value)); - AudioFileStream afs(&afsp, strlen(value)); - cb.md(type, false, &afs); - } + cb.md(type, false, value); do { ret = mdr.read(&c, 1); } while ((c !=';') && (c!=0) && !mdr.eof()); diff --git a/src/AudioFileSourceID3.cpp b/src/AudioFileSourceID3.cpp index 3990d6b..e818a83 100644 --- a/src/AudioFileSourceID3.cpp +++ b/src/AudioFileSourceID3.cpp @@ -19,7 +19,6 @@ */ #include "AudioFileSourceID3.h" -#include "AudioFileStream.h" // Handle unsync operation in ID3 with custom class class AudioFileSourceUnsync : public AudioFileSource @@ -178,18 +177,23 @@ uint32_t AudioFileSourceID3::read(void *data, uint32_t len) for (int j=0; j