From d8ef40879ca8f9d05384135ad2383f3677cb38cf Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 1 Aug 2014 01:39:46 -0400
Subject: AUDIO: Better handle endOfStream() vs endOfData() in
 SubLoopingAudioStream

---
 audio/audiostream.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'audio/audiostream.cpp')

diff --git a/audio/audiostream.cpp b/audio/audiostream.cpp
index fbf672ca22..c413edb73d 100644
--- a/audio/audiostream.cpp
+++ b/audio/audiostream.cpp
@@ -193,7 +193,7 @@ int SubLoopingAudioStream::readBuffer(int16 *buffer, const int numSamples) {
 	int framesRead = _parent->readBuffer(buffer, framesLeft);
 	_pos = _pos.addFrames(framesRead);
 
-	if (framesRead < framesLeft && _parent->endOfData()) {
+	if (framesRead < framesLeft && _parent->endOfStream()) {
 		// TODO: Proper error indication.
 		_done = true;
 		return framesRead;
@@ -220,6 +220,18 @@ int SubLoopingAudioStream::readBuffer(int16 *buffer, const int numSamples) {
 	}
 }
 
+bool SubLoopingAudioStream::endOfData() const {
+	// We're out of data if this stream is finished or the parent
+	// has run out of data for now.
+	return _done || _parent->endOfData();
+}
+
+bool SubLoopingAudioStream::endOfStream() const {
+	// The end of the stream has been reached only when we've gone
+	// through all the iterations.
+	return _done;
+}
+
 #pragma mark -
 #pragma mark --- SubSeekableAudioStream ---
 #pragma mark -
-- 
cgit v1.2.3