[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.61,1.62
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Dec 28 07:49:02 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13002
Modified Files:
sound.cpp
Log Message:
added 16 bits samples to playVoice
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- sound.cpp 28 Dec 2002 15:42:44 -0000 1.61
+++ sound.cpp 28 Dec 2002 15:48:37 -0000 1.62
@@ -1189,7 +1189,14 @@
byte * final = (byte *)malloc(size);
memcpy(final, ptr, size);
- return _scumm->_mixer->playRaw(NULL, final, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ if (bits == 8) {
+ return _scumm->_mixer->playRaw(NULL, final, size, rate, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
+ } else if (bits == 16){
+ return _scumm->_mixer->playRaw(NULL, final, size, rate, SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE);
+ } else {
+ warning("Sound::playBundleSound() to do more options to playRaw...");
+ return -1;
+ }
}
int Sound::playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned) {
More information about the Scummvm-git-logs
mailing list