diff options
| author | Max Horn | 2003-06-22 01:55:53 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-22 01:55:53 +0000 |
| commit | 4ad5a183ce4c37ede13e88f3bc0d5b0c0c687026 (patch) | |
| tree | ecd3d72be68b996ab004d22ff775dac259c395ac /scumm | |
| parent | 573a1e3e9907d228d4826cfb26a99d27ca15676d (diff) | |
| download | scummvm-rg350-4ad5a183ce4c37ede13e88f3bc0d5b0c0c687026.tar.gz scummvm-rg350-4ad5a183ce4c37ede13e88f3bc0d5b0c0c687026.tar.bz2 scummvm-rg350-4ad5a183ce4c37ede13e88f3bc0d5b0c0c687026.zip | |
renamed SoundMixer::hasActiveChannel->hasActiveSFXChannel, and fixed the regression in it caused by removing _beginSlots (I hope); added isActiveChannel method used by scumm/sound.cpp (this allowed me to move the Channel class from mixer.h into mixer.cpp); replaced Channel::soundFinished method by isActive
svn-id: r8597
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 19f4c74c13..5eaf0beedc 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -958,7 +958,7 @@ void Sound::stopSfxSound() { } bool Sound::isSfxFinished() { - return !_scumm->_mixer->hasActiveChannel(); + return !_scumm->_mixer->hasActiveSFXChannel(); } uint32 Sound::decode12BitsSample(byte *src, byte **dst, uint32 size, bool stereo = false) { @@ -1577,7 +1577,7 @@ int Sound::updateMP3CD() { return -1; } - if (_scumm->_mixer->_channels[_dig_cd_index]->soundFinished()) { + if (!_scumm->_mixer->isActiveChannel(_dig_cd_index)) { if (_dig_cd_num_loops == -1 || --_dig_cd_num_loops > 0) playMP3CDTrack(_dig_cd_track, _dig_cd_num_loops, _dig_cd_start, _dig_cd_delay); else |