[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.19,1.20
Pawe? Ko?odziejski
aquadran at users.sourceforge.net
Mon Sep 30 12:32:15 CEST 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv17424
Modified Files:
sound.cpp
Log Message:
changed the dig music into stream sound
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sound.cpp 30 Sep 2002 19:10:35 -0000 1.19
+++ sound.cpp 30 Sep 2002 19:31:41 -0000 1.20
@@ -977,7 +977,13 @@
byte * buffer = NULL;
uint32 final_size = decode12BitsSample(ptr, &buffer, size);
- _scumm->_mixer->playRaw(NULL, buffer, final_size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO);
+ if (_scumm->_mixer->_channels[SoundMixer::NUM_CHANNELS - 1] == NULL) {
+ _scumm->_mixer->playStream(NULL, SoundMixer::NUM_CHANNELS - 1, buffer, final_size, rate,
+ SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO);
+ } else {
+ _scumm->_mixer->append(SoundMixer::NUM_CHANNELS - 1, buffer, final_size, rate,
+ SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO);
+ }
}
void Sound::playBundleSound(char *sound) {
More information about the Scummvm-git-logs
mailing list