[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.31,1.32

James Brown ender at users.sourceforge.net
Wed Jun 26 03:21:03 CEST 2002


Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv7479/sound

Modified Files:
	mixer.cpp 
Log Message:
Hacks to make SMUSH mixer a bit more tollerable.



Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- mixer.cpp	6 Jun 2002 21:50:20 -0000	1.31
+++ mixer.cpp	26 Jun 2002 10:20:56 -0000	1.32
@@ -459,13 +459,17 @@
 		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;
 }





More information about the Scummvm-git-logs mailing list