[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.125,1.126

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Tue Sep 16 00:07:03 CEST 2003


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

Modified Files:
	mixer.cpp 
Log Message:
Don't call the premix function when the mixer is paused. (This is
particularly noticeable in games with PC speaker emulation, but I could
hear faint noises in AdLib music as well.)


Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- mixer.cpp	10 Sep 2003 12:19:57 -0000	1.125
+++ mixer.cpp	16 Sep 2003 07:06:17 -0000	1.126
@@ -278,7 +278,7 @@
 void SoundMixer::mix(int16 *buf, uint len) {
 	StackLock lock(_mutex);
 
-	if (_premixProc) {
+	if (_premixProc && !_paused) {
 		int i;
 		_premixProc(_premixParam, buf, len);
 		// Convert mono data from the premix proc to stereo





More information about the Scummvm-git-logs mailing list