From 9ac3f92be1abeed35ca7e76bc072a8517d88b399 Mon Sep 17 00:00:00 2001
From: James Brown
Date: Wed, 26 Jun 2002 10:20:56 +0000
Subject: Hacks to make SMUSH mixer a bit more tollerable.

svn-id: r4429
---
 sound/mixer.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'sound/mixer.cpp')

diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 0fbaf627e6..115ca37fb8 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -459,13 +459,17 @@ void SoundMixer::Channel_STREAM::mix(int16 *data, uint len) {
 		mixer_helper_table[_flags & 0x07](data, &len, &_pos, &fp_pos, fp_speed, vol_tab, _ptr + _buffer_size);
 		if (len != 0) {
 			_pos = _ptr;
-			mixer_helper_table[_flags & 0x07](data, &len, &_pos, &fp_pos, fp_speed, vol_tab, end_of_data);
-		}
-	}
-	if (len != 0) {
-		warning("Streaming underflow ");
-		real_destroy();
-		return;
+			mixer_helper_table[_flags & 0x07](data, &len, &_pos, &fp_pos, fp_speed, vol_tab, end_of_data);			
+		} else
+			_to_be_destroyed = true;
+	}	
+	if (len != 0) {		
+		// FIXME: BBrox, what does this mean? :)
+		//        Commented by Ender to remove non-existant
+		//        streamer bug in Dig smush movies.
+		//warning("Streaming underflow of %d bytes", len);
+		//real_destroy();
+		//return;
 	}
 	_fp_pos = fp_pos;
 }
-- 
cgit v1.2.3