diff options
| author | Paul Gilbert | 2014-06-30 23:31:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-06-30 23:31:42 -0400 |
| commit | 6ba1ba86b9eccb1e589f0c06b029e618c42be564 (patch) | |
| tree | a4dec7a46491362e4bc939f7dfc316e3c473606a | |
| parent | 53eee91c3f8acc41d54719d5f46ddffcf48fa60b (diff) | |
| download | scummvm-rg350-6ba1ba86b9eccb1e589f0c06b029e618c42be564.tar.gz scummvm-rg350-6ba1ba86b9eccb1e589f0c06b029e618c42be564.tar.bz2 scummvm-rg350-6ba1ba86b9eccb1e589f0c06b029e618c42be564.zip | |
TSAGE: Remove mutex locks that were causing occassional deadlocks
| -rw-r--r-- | engines/tsage/sound.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp index c5c38505a7..fee1bd752b 100644 --- a/engines/tsage/sound.cpp +++ b/engines/tsage/sound.cpp @@ -379,7 +379,6 @@ void SoundManager::updateSoundLoop(Sound *sound) { } void SoundManager::rethinkVoiceTypes() { - Common::StackLock slock(sfManager()._serverSuspendedMutex); sfRethinkVoiceTypes(); } @@ -1442,8 +1441,6 @@ bool SoundManager::sfDoRemoveFromPlayList(Sound *sound) { } void SoundManager::sfDoUpdateVolume(Sound *sound) { - Common::StackLock slock(sfManager()._serverSuspendedMutex); - for (int voiceIndex = 0; voiceIndex < SOUND_ARR_SIZE; ++voiceIndex) { VoiceTypeStruct *vs = sfManager()._voiceTypeStructPtrs[voiceIndex]; if (!vs) @@ -1707,8 +1704,6 @@ void Sound::pause(bool flag) { } void Sound::mute(bool flag) { - Common::StackLock slock(g_globals->_soundManager._serverSuspendedMutex); - if (flag) ++_mutedCount; else if (_mutedCount > 0) |