[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.194,1.195

Max Horn fingolfin at users.sourceforge.net
Thu Aug 7 16:56:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3626

Modified Files:
	sound.cpp 
Log Message:
work around odd cases with odd lens for 16 bit audio data

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- sound.cpp	6 Aug 2003 18:20:15 -0000	1.194
+++ sound.cpp	7 Aug 2003 23:54:59 -0000	1.195
@@ -1415,6 +1415,9 @@
 	if (bits == 8) {
 		_scumm->_mixer->playRaw(handle, final, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 	} else if (bits == 16) {
+		// FIXME: For some weird reasons, sometimes we get an odd size, even though
+		// the data is supposed to be in 16 bit format... that makes no sense...
+		size &= ~1;
 		_scumm->_mixer->playRaw(handle, final, size, rate, SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE);
 	} else {
 		warning("Sound::playBundleSound() to do more options to playRaw...");





More information about the Scummvm-git-logs mailing list