[Scummvm-cvs-logs] CVS: scummex/sound sound.cpp,1.2,1.3

Adrien Mercier yoshizf at users.sourceforge.net
Sun Apr 10 07:58:09 CEST 2005


Update of /cvsroot/scummvm/scummex/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25528/sound

Modified Files:
	sound.cpp 
Log Message:
Stop playing sound before playing a new one

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/sound/sound.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound.cpp	29 Sep 2003 20:45:54 -0000	1.2
+++ sound.cpp	10 Apr 2005 14:57:56 -0000	1.3
@@ -141,6 +141,7 @@
 		printf("cannot read %d bytes", _blockTable[index].blockSize);
 	}
 
+	_mixer->stopAll();
 	_mixer->playRaw(NULL, data, _blockTable[index].blockSize, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 	return 0;
 }
@@ -898,6 +899,7 @@
 		_output.write(buffer, s_size+44);
 		_output.close();
 	} else {
+		_mixer->stopAll();
 		if (bits == 8) {
 			_mixer->playRaw(NULL, buffer, s_size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, -1, 255);
 		} else if (bits == 16) {





More information about the Scummvm-git-logs mailing list