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 /sound/mixer.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 'sound/mixer.cpp')
| -rw-r--r-- | sound/mixer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index f9f0e32316..5face1f8a9 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -367,10 +367,10 @@ bool SoundMixer::isSoundIDActive(int id) { return false; } -int SoundMixer::getActiveChannelSoundID(SoundHandle handle) { +int SoundMixer::getSoundID(SoundHandle handle) { Common::StackLock lock(_mutex); const int index = handle._val % NUM_CHANNELS; - if (_channels[index]) + if (_channels[index] && _channels[index]->_handle._val == handle._val) return _channels[index]->getId(); return 0; } |