From 9e2e00881f4fcaa921e251dd237ee9aed06bf3cb Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 4 Apr 2005 17:43:00 +0000 Subject: Renamed getActiveChannelSoundID to getSoundID and fixed its semantics to avoid race conditions svn-id: r17377 --- scumm/sound.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'scumm/sound.cpp') 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]); } } -- cgit v1.2.3