diff --git a/keywords.txt b/keywords.txt index edcda12..60df15d 100644 --- a/keywords.txt +++ b/keywords.txt @@ -3,6 +3,7 @@ AudioFileSourceSPIFFS KEYWORD1 AudioFileSourceFastROMFS KEYWORD1 AudioFileSourcePROGMEM KEYWORD1 AudioFileSourceHTTPStream KEYWORD1 +AudioFileSourceICYStream KEYWORD1 AudioFileSourceID3 KEYWORD1 AudioFileSourceSD KEYWORD1 AudioFileSourceBuffer KEYWORD1 diff --git a/src/AudioFileSourceICYStream.cpp b/src/AudioFileSourceICYStream.cpp index 374200b..e242e13 100644 --- a/src/AudioFileSourceICYStream.cpp +++ b/src/AudioFileSourceICYStream.cpp @@ -25,11 +25,13 @@ AudioFileSourceICYStream::AudioFileSourceICYStream() pos = 0; reconnectTries = 0; saveURL = NULL; + cb = NULL; } AudioFileSourceICYStream::AudioFileSourceICYStream(const char *url) { saveURL = NULL; + cb = NULL; reconnectTries = 0; open(url); } @@ -50,13 +52,11 @@ bool AudioFileSourceICYStream::open(const char *url) if (http.hasHeader(hdr[0])) { String ret = http.header(hdr[0]); icyMetaInt = ret.toInt(); - Serial.printf("ICY metaint = %d\n", icyMetaInt); } else { icyMetaInt = 0; } icyByteCount = 0; size = http.getSize(); - Serial.printf("Stream size: %d\n", size); free(saveURL); saveURL = strdup(url); return true; @@ -67,6 +67,52 @@ AudioFileSourceICYStream::~AudioFileSourceICYStream() http.end(); } +class ICYMDReader { + public: + ICYMDReader(WiFiClient *str, uint16_t bytes) { + stream = str; + avail = bytes; + ptr = sizeof(buff)+1; // Cause read next time + } + ~ICYMDReader() { + // Get rid of any remaining bytes in the MD block + char xxx[16]; + while (avail > 16) { + stream->readBytes(xxx, 16); + avail -= 16; + } + stream->readBytes(xxx, avail); + } + int read(uint8_t *dest, int len) { + int ret = 0; + while ((len>0) && (avail>0)) { + // Always copy from bounce buffer first + while ((ptr < sizeof(buff)) && (len>0) && (avail>0)) { + *(dest++) = buff[ptr++]; + avail--; + ret++; + len--; + } + // refill the bounce buffer + if ((avail>0) && (len>0)) { + ptr = 0; + int toRead = (sizeof(buff)>avail)? avail : sizeof(buff); + int read = stream->readBytes(buff, toRead); + if (read != toRead) return 0; // Error, short read! + } + } + return ret; + } + bool eof() { return (avail==0); } + + private: + WiFiClient *stream; + uint16_t avail; + uint8_t ptr; + uint8_t buff[16]; +}; + + uint32_t AudioFileSourceICYStream::readInternal(void *data, uint32_t len, bool nonBlock) { retry: @@ -126,16 +172,46 @@ retry: uint8_t mdSize; int mdret = stream->readBytes(&mdSize, 1); if ((mdret == 1) && (mdSize > 0)) { - char mdBuff[17]; - mdBuff[16] = 0; - Serial.print("ICY MD: "); - for (int i=0; ireadBytes(reinterpret_cast(mdBuff), 16); - if (mdret == 16) { - Serial.printf("%s", mdBuff); + ICYMDReader md(stream, mdSize * 16); + // Break out (potentially multiple) NAME='xxxx' + char type[32]; + char value[64]; + while (!md.eof()) { + memset(type, 0, sizeof(type)); + memset(value, 0, sizeof(value)); + uint8_t c; + char *p = type; + for (size_t i=0; i