[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.42,1.43
Max Horn
fingolfin at users.sourceforge.net
Sat Sep 6 03:48:04 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv21491/simon
Modified Files:
sound.cpp
Log Message:
removed pauseMixer method from mixer, and renamed stop to stopChannel
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- sound.cpp 5 Sep 2003 21:06:32 -0000 1.42
+++ sound.cpp 6 Sep 2003 10:47:29 -0000 1.43
@@ -441,7 +441,7 @@
return;
if (_voice_handle)
- _mixer->stop(_voice_index);
+ _mixer->stopChannel(_voice_index);
_voice_index = _voice->playSound(sound, &_voice_handle, (_game == GAME_SIMON1CD32) ? 0 : SoundMixer::FLAG_UNSIGNED);
}
@@ -469,7 +469,7 @@
return;
if (_ambient_handle)
- _mixer->stop(_ambient_index);
+ _mixer->stopChannel(_ambient_index);
_ambient_index = _effects->playSound(sound, &_ambient_handle, SoundMixer::FLAG_LOOP|SoundMixer::FLAG_UNSIGNED);
}
@@ -479,7 +479,7 @@
}
void SimonSound::stopVoice() {
- _mixer->stop(_voice_index);
+ _mixer->stopChannel(_voice_index);
}
void SimonSound::stopAll() {
@@ -495,7 +495,7 @@
_ambient_paused = b;
if (_ambient_paused && _ambient_playing) {
- _mixer->stop(_ambient_index);
+ _mixer->stopChannel(_ambient_index);
} else if (_ambient_playing) {
uint tmp = _ambient_playing;
_ambient_playing = 0;
More information about the Scummvm-git-logs
mailing list