From 6ba1ba86b9eccb1e589f0c06b029e618c42be564 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 30 Jun 2014 23:31:42 -0400 Subject: TSAGE: Remove mutex locks that were causing occassional deadlocks --- engines/tsage/sound.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'engines/tsage') 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) -- cgit v1.2.3