@@ -79,10 +79,10 @@ class ICYMDReader {
79
79
char xxx[16 ];
80
80
if (saved>=0 ) avail--; // Throw away any unread bytes
81
81
while (avail > 16 ) {
82
- stream->readBytes ( xxx, 16 );
82
+ stream->read ( reinterpret_cast < uint8_t *>( xxx) , 16 );
83
83
avail -= 16 ;
84
84
}
85
- stream->readBytes ( xxx, avail);
85
+ stream->read ( reinterpret_cast < uint8_t *>( xxx) , avail);
86
86
}
87
87
int read (uint8_t *dest, int len) {
88
88
if (!len) return 0 ;
@@ -100,7 +100,7 @@ class ICYMDReader {
100
100
if ((avail>0 ) && (len>0 )) {
101
101
ptr = 0 ;
102
102
int toRead = (sizeof (buff)>avail)? avail : sizeof (buff);
103
- int read = stream->readBytes (buff, toRead);
103
+ int read = stream->read (buff, toRead);
104
104
if (read != toRead) return 0 ; // Error, short read!
105
105
}
106
106
}
@@ -164,7 +164,7 @@ uint32_t AudioFileSourceICYStream::readInternal(void *data, uint32_t len, bool n
164
164
// If the read would hit an ICY block, split it up...
165
165
if (((int )(icyByteCount + len) > (int )icyMetaInt) && (icyMetaInt > 0 )) {
166
166
int beforeIcy = icyMetaInt - icyByteCount;
167
- int ret = stream->readBytes (reinterpret_cast <uint8_t *>(data), beforeIcy);
167
+ int ret = stream->read (reinterpret_cast <uint8_t *>(data), beforeIcy);
168
168
read += ret;
169
169
pos += ret;
170
170
len -= ret;
@@ -173,7 +173,7 @@ uint32_t AudioFileSourceICYStream::readInternal(void *data, uint32_t len, bool n
173
173
if (ret != beforeIcy) return read ; // Partial read
174
174
175
175
uint8_t mdSize;
176
- int mdret = stream->readBytes (&mdSize, 1 );
176
+ int mdret = stream->read (&mdSize, 1 );
177
177
if ((mdret == 1 ) && (mdSize > 0 )) {
178
178
ICYMDReader mdr (stream, mdSize * 16 );
179
179
// Break out (potentially multiple) NAME='xxxx'
@@ -224,7 +224,7 @@ uint32_t AudioFileSourceICYStream::readInternal(void *data, uint32_t len, bool n
224
224
icyByteCount = 0 ;
225
225
}
226
226
227
- int ret = stream->readBytes (reinterpret_cast <uint8_t *>(data), len);
227
+ int ret = stream->read (reinterpret_cast <uint8_t *>(data), len);
228
228
read += ret;
229
229
pos += ret;
230
230
icyByteCount += ret;
0 commit comments