From d8903123b0bd4265de03f40eaaf6bb1d2b160c3f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 19 Dec 2003 01:30:19 +0000
Subject: distinguish between end of stream and end of data

svn-id: r11756
---
 sound/mixer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sound/mixer.cpp')

diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 5278071c1e..786c376099 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -485,9 +485,11 @@ void Channel::destroy() {
  */
 void Channel::mix(int16 *data, uint len) {
 	assert(_input);
-	if (_input->eos()) {
-		// TODO: call drain method
+
+	if (_input->endOfStream()) {
 		destroy();
+	} else if (_input->endOfData()) {
+		// TODO: call drain method
 	} else {
 		assert(_converter);
 
-- 
cgit v1.2.3