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

[Lionel Ulmer]

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

Modified Files:
	mixer.cpp 
Log Message:
As long as I am fixing regression bug introduced by my streaming
patch, fix also the 'FLAG_FILE' stuff.

Endy, you should be able to revert your patch to Simon as it should
not be needed anymore now :-)



Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- mixer.cpp	6 Jun 2002 21:42:11 -0000	1.30
+++ mixer.cpp	6 Jun 2002 21:50:20 -0000	1.31
@@ -335,6 +335,7 @@
 void SoundMixer::Channel_RAW::mix(int16 *data, uint len) {
 	byte *s, *s_org = NULL;
 	uint32 fp_pos;
+	byte *end;
 
 	if (_to_be_destroyed) {
 		real_destroy();
@@ -362,15 +363,17 @@
 				
 		s = s_org;
 		fp_pos = 0;
+		end = s_org + num;
 	} else {
 		s = (byte*)_ptr + _pos;
 		fp_pos = _fp_pos;
+		end = (byte *) _ptr + _realsize;
 	}
 
 	const uint32 fp_speed = _fp_speed;
 	const int16 *vol_tab = _mixer->_volume_table;
 
-	mixer_helper_table[_flags & 0x07](data, &len, &s, &fp_pos, fp_speed, vol_tab, (byte *) _ptr + _realsize);
+	mixer_helper_table[_flags & 0x07](data, &len, &s, &fp_pos, fp_speed, vol_tab, end);
 
 	_pos = s - (byte*) _ptr;
 	_fp_pos = fp_pos;