[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.85,1.86

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Wed Jul 30 11:21:21 CEST 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv31944

Modified Files:
	mixer.cpp 
Log Message:
Partial fix for bug #780167 ("SIMON1/2: Sound problems"). It seems to fix
the crash, but the sounds play at the wrong rate, I believe.


Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- mixer.cpp	30 Jul 2003 09:26:54 -0000	1.85
+++ mixer.cpp	30 Jul 2003 18:20:45 -0000	1.86
@@ -677,7 +677,7 @@
 	// TODO: add support for SoundMixer::FLAG_REVERSE_STEREO
 
 	// Get a rate converter instance
-	_converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO != 0);
+	_converter = makeRateConverter(rate, mixer->getOutputRate(), (flags & SoundMixer::FLAG_STEREO) != 0);
 #else
 	_pos = 0;
 	_fpPos = 0;
@@ -768,7 +768,7 @@
 	// TODO: add support for SoundMixer::FLAG_REVERSE_STEREO
 
 	// Get a rate converter instance
-	_converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO != 0);
+	_converter = makeRateConverter(rate, mixer->getOutputRate(), (flags & SoundMixer::FLAG_STEREO) != 0);
 #else
 	_flags = flags;
 	_bufferSize = buffer_size;





More information about the Scummvm-git-logs mailing list