zhangyuqing
/
ESP8266Audio
mirror of https://github.com/earlephilhower/ESP8266Audio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "remove redundant boolean filled" 

This reverts commit be2ad3de2f.
This commit is contained in:
Hendrik Langer 2018-08-31 02:21:40 +02:00
parent ed1bb429f1
commit 2dc526342c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/AudioFileSourceBuffer.cpp
View File

@ -33,6 +33,7 @@ AudioFileSourceBuffer::AudioFileSourceBuffer(AudioFileSource *source, uint32_t b
readPtr = 0;
src = source;
length = 0;
filled = false;
}
AudioFileSourceBuffer::AudioFileSourceBuffer(AudioFileSource *source, void *inBuff, uint32_t buffSizeBytes)
@ -44,6 +45,7 @@ AudioFileSourceBuffer::AudioFileSourceBuffer(AudioFileSource *source, void *inBu
readPtr = 0;
src = source;
length = 0;
filled = false;
}
AudioFileSourceBuffer::~AudioFileSourceBuffer()
@ -93,11 +95,12 @@ uint32_t AudioFileSourceBuffer::read(void *data, uint32_t len)
if (!buffer) return src->read(data, len);
uint32_t bytes = 0;
if (length == 0) {
if (!filled) {
// Fill up completely before returning any data at all
cb.st(STATUS_FILLING, PSTR("Refilling buffer"));
length = src->read(buffer, buffSize);
writePtr = length % buffSize;
filled = true;
}
// Pull from buffer until we've got none left or we've satisfied the request
@ -130,6 +133,7 @@ uint32_t AudioFileSourceBuffer::read(void *data, uint32_t len)
readPtr = 0;
writePtr = 0;
length = 0;
filled = false;
cb.st(STATUS_UNDERFLOW, PSTR("Buffer underflow"));
}

1
src/AudioFileSourceBuffer.h
View File

@ -55,6 +55,7 @@ class AudioFileSourceBuffer : public AudioFileSource
uint32_t writePtr;
uint32_t readPtr;
uint32_t length;
bool filled;
};