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 /scumm/smush | |
| 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 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_mixer.cpp | 2 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index 02dc117b29..a20b5e68a3 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -41,7 +41,7 @@ SmushMixer::SmushMixer(SoundMixer *m) : SmushMixer::~SmushMixer() { for (int32 i = 0; i < SoundMixer::NUM_CHANNELS; i++) { - _mixer->stop(_channels[i].mixer_index); + _mixer->stopChannel(_channels[i].mixer_index); } } diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index e82c7d6ae8..fb99c8a668 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -290,7 +290,7 @@ void SmushPlayer::deinit() { _base = NULL; } - _scumm->_mixer->stop(_IACTchannel); + _scumm->_mixer->stopChannel(_IACTchannel); _scumm->_insaneState = false; _scumm->abortCutscene(); |