remove redundant boolean filled

h3ndrik · Aug 27, 2018 · be2ad3d · be2ad3d
1 parent 135e912
commit be2ad3d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/AudioFileSourceBuffer.cpp b/src/AudioFileSourceBuffer.cpp
@@ -33,7 +33,6 @@ AudioFileSourceBuffer::AudioFileSourceBuffer(AudioFileSource *source, uint32_t b
   readPtr = 0;
   src = source;
   length = 0;
-  filled = false;
 }
 
 AudioFileSourceBuffer::AudioFileSourceBuffer(AudioFileSource *source, void *inBuff, uint32_t buffSizeBytes)
@@ -45,7 +44,6 @@ AudioFileSourceBuffer::AudioFileSourceBuffer(AudioFileSource *source, void *inBu
   readPtr = 0;
   src = source;
   length = 0;
-  filled = false;
 }
 
 AudioFileSourceBuffer::~AudioFileSourceBuffer()
@@ -95,12 +93,11 @@ uint32_t AudioFileSourceBuffer::read(void *data, uint32_t len)
   if (!buffer) return src->read(data, len);
 
   uint32_t bytes = 0;
-  if (!filled) {
+  if (length == 0) {
     // 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
@@ -133,7 +130,6 @@ uint32_t AudioFileSourceBuffer::read(void *data, uint32_t len)
     readPtr = 0;
     writePtr = 0;
     length = 0;
-    filled = false;
     cb.st(STATUS_UNDERFLOW, PSTR("Buffer underflow"));
   }
 

diff --git a/src/AudioFileSourceBuffer.h b/src/AudioFileSourceBuffer.h
@@ -54,7 +54,6 @@ class AudioFileSourceBuffer : public AudioFileSource
     uint32_t writePtr;
     uint32_t readPtr;
     uint32_t length;
-    bool filled;
 };