From 82d464367b1060003886b1a331a03f5ca099499f Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Thu, 10 Jul 2014 00:39:29 -0400
Subject: AUDIO: Better handle endOfStream() vs endOfData() in
 LoopingAudioStream

---
 audio/audiostream.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'audio/audiostream.h')

diff --git a/audio/audiostream.h b/audio/audiostream.h
index d5d7d0b6c7..ad842d7ca8 100644
--- a/audio/audiostream.h
+++ b/audio/audiostream.h
@@ -118,6 +118,7 @@ public:
 
 	int readBuffer(int16 *buffer, const int numSamples);
 	bool endOfData() const;
+	bool endOfStream() const;
 
 	bool isStereo() const { return _parent->isStereo(); }
 	int getRate() const { return _parent->getRate(); }
-- 
cgit v1.2.3


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.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'audio/audiostream.h')

diff --git a/audio/audiostream.h b/audio/audiostream.h
index ad842d7ca8..e3b8773823 100644
--- a/audio/audiostream.h
+++ b/audio/audiostream.h
@@ -248,7 +248,8 @@ public:
 	                      DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
 
 	int readBuffer(int16 *buffer, const int numSamples);
-	bool endOfData() const { return _done; }
+	bool endOfData() const;
+	bool endOfStream() const;
 
 	bool isStereo() const { return _parent->isStereo(); }
 	int getRate() const { return _parent->getRate(); }
-- 
cgit v1.2.3


From dc155b23f02f6a462bf59a3f51dcdfea3e95c5b8 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Fri, 1 Aug 2014 01:47:30 -0400
Subject: AUDIO: Better handle endOfStream() vs endOfData() in
 SubSeekableAudioStream

---
 audio/audiostream.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'audio/audiostream.h')

diff --git a/audio/audiostream.h b/audio/audiostream.h
index e3b8773823..5202a4711c 100644
--- a/audio/audiostream.h
+++ b/audio/audiostream.h
@@ -289,7 +289,8 @@ public:
 
 	int getRate() const { return _parent->getRate(); }
 
-	bool endOfData() const { return (_pos >= _length) || _parent->endOfStream(); }
+	bool endOfData() const { return (_pos >= _length) || _parent->endOfData(); }
+	bool endOfStream() const { return (_pos >= _length) || _parent->endOfStream(); }
 
 	bool seek(const Timestamp &where);
 
-- 
cgit v1.2.3