diff options
| author | Max Horn | 2005-04-04 17:43:00 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-04 17:43:00 +0000 |
| commit | 9e2e00881f4fcaa921e251dd237ee9aed06bf3cb (patch) | |
| tree | 31554712d3ab433aebef5cf9274438587c5b2e73 /scumm/sound.cpp | |
| parent | e46a677c0ee9621cefe82031796c2337b6319d84 (diff) | |
| download | scummvm-rg350-9e2e00881f4fcaa921e251dd237ee9aed06bf3cb.tar.gz scummvm-rg350-9e2e00881f4fcaa921e251dd237ee9aed06bf3cb.tar.bz2 scummvm-rg350-9e2e00881f4fcaa921e251dd237ee9aed06bf3cb.zip | |
Renamed getActiveChannelSoundID to getSoundID and fixed its semantics to avoid race conditions
svn-id: r17377
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index fe71f936b0..fbff939923 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -849,11 +849,7 @@ int Sound::isSoundRunning(int sound) const { else if (_vm->_imuse) return (_vm->_imuse->getSoundStatus(sound)); } else if (sound >= 10000) { - int channel = sound - 10000; - if (_vm->_mixer->isSoundHandleActive(_heSoundChannels[channel])) - return _vm->_mixer->getActiveChannelSoundID(_heSoundChannels[channel]); - else - return 0; + return _vm->_mixer->getSoundID(_heSoundChannels[sound - 10000]); } } |