Allow playing wav files via HTTPStream (#224)
* ReadWAVInfo(): print error message if seek() fails * AudioFileSourceHTTPStream::seek() print error message - not implemented * AudioFileSourceBuffer::seek if SEEK_CUR and seek_len < writePtr keep the buffer (fix for HTTPStream) * Update AudioFileSourceBuffer.cpp
This commit is contained in:
1 parent
16bd2a7b06
commit
074dfd47b0
3 files changed
+16
-7
No files matched your search
@@ -56,11 +56,16 @@ AudioFileSourceBuffer::~AudioFileSourceBuffer()
|
|||||||
|
|
||||||
bool AudioFileSourceBuffer::seek(int32_t pos, int dir)
|
bool AudioFileSourceBuffer::seek(int32_t pos, int dir)
|
||||||
{
|
{
|
||||||
// Invalidate
|
if(dir == SEEK_CUR && (readPtr+pos) < length) {
|
||||||
readPtr = 0;
|
readPtr += pos;
|
||||||
writePtr = 0;
|
return true;
|
||||||
length = 0;
|
} else {
|
||||||
return src->seek(pos, dir);
|
// Invalidate
|
||||||
|
readPtr = 0;
|
||||||
|
writePtr = 0;
|
||||||
|
length = 0;
|
||||||
|
return src->seek(pos, dir);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AudioFileSourceBuffer::close()
|
bool AudioFileSourceBuffer::close()
|
||||||
|
|||||||
@@ -123,6 +123,7 @@ retry:
|
|||||||
|
|
||||||
bool AudioFileSourceHTTPStream::seek(int32_t pos, int dir)
|
bool AudioFileSourceHTTPStream::seek(int32_t pos, int dir)
|
||||||
{
|
{
|
||||||
|
audioLogger->printf_P(PSTR("ERROR! AudioFileSourceHTTPStream::seek not implemented!"));
|
||||||
(void) pos;
|
(void) pos;
|
||||||
(void) dir;
|
(void) dir;
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -242,10 +242,13 @@ bool AudioGeneratorWAV::ReadWAVInfo()
|
|||||||
Serial.printf_P(PSTR("AudioGeneratorWAV::ReadWAVInfo: failed to read WAV data\n"));
|
Serial.printf_P(PSTR("AudioGeneratorWAV::ReadWAVInfo: failed to read WAV data\n"));
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
file->seek(u32, SEEK_CUR);
|
if(!file->seek(u32, SEEK_CUR)) {
|
||||||
|
Serial.printf_P(PSTR("AudioGeneratorWAV::ReadWAVInfo: failed to read WAV data, seek failed\n"));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
} while (1);
|
} while (1);
|
||||||
if (!file->isOpen()) {
|
if (!file->isOpen()) {
|
||||||
Serial.printf_P(PSTR("AudioGeneratorWAV::ReadWAVInfo: cannot read WAV, file is not open \n"));
|
Serial.printf_P(PSTR("AudioGeneratorWAV::ReadWAVInfo: cannot read WAV, file is not open\n"));
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user