diff options
| author | Max Horn | 2003-09-06 10:47:30 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-06 10:47:30 +0000 |
| commit | 0be019601319c8536cf42a64e97408ba6fb1716b (patch) | |
| tree | 47516a70382359f83871ad61b2e56700fd26aad6 /simon | |
| parent | c951e5f8420c858b6253b05fecf362646c872c8a (diff) | |
| download | scummvm-rg350-0be019601319c8536cf42a64e97408ba6fb1716b.tar.gz scummvm-rg350-0be019601319c8536cf42a64e97408ba6fb1716b.tar.bz2 scummvm-rg350-0be019601319c8536cf42a64e97408ba6fb1716b.zip | |
removed pauseMixer method from mixer, and renamed stop to stopChannel
svn-id: r10042
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp index 2aca4b955c..041f626cd9 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -441,7 +441,7 @@ void SimonSound::playVoice(uint sound) { 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 @@ void SimonSound::playAmbient(uint sound) { 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 @@ bool SimonSound::hasVoice() { } void SimonSound::stopVoice() { - _mixer->stop(_voice_index); + _mixer->stopChannel(_voice_index); } void SimonSound::stopAll() { @@ -495,7 +495,7 @@ void SimonSound::ambientPause(bool b) { _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; |