[Scummvm-cvs-logs] scummvm master -> 61472ad2c590a34979a8366bcd7f5db46c54afc6

dreammaster dreammaster at scummvm.org
Mon Aug 1 11:36:19 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
61472ad2c5 TSAGE: Shift mutex locking to resolve a deadlock issue


Commit: 61472ad2c590a34979a8366bcd7f5db46c54afc6
    https://github.com/scummvm/scummvm/commit/61472ad2c590a34979a8366bcd7f5db46c54afc6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-08-01T02:33:04-07:00

Commit Message:
TSAGE: Shift mutex locking to resolve a deadlock issue

Changed paths:
    engines/tsage/sound.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 69ac426..e47a0ed 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -360,9 +360,6 @@ void SoundManager::rethinkVoiceTypes() {
 }
 
 void SoundManager::_sfSoundServer() {
-	Common::StackLock slock1(sfManager()._serverDisabledMutex);
-	Common::StackLock slock2(sfManager()._serverSuspendedMutex);
-
 	if (sfManager()._needToRethink) {
 		_sfRethinkVoiceTypes();
 		sfManager()._needToRethink = false;
@@ -2760,6 +2757,9 @@ void AdlibSoundDriver::setFrequency(int channel) {
 }
 
 int AdlibSoundDriver::readBuffer(int16 *buffer, const int numSamples) {
+	Common::StackLock slock1(SoundManager::sfManager()._serverDisabledMutex);
+	Common::StackLock slock2(SoundManager::sfManager()._serverSuspendedMutex);
+
 	int32 samplesLeft = numSamples;
 	memset(buffer, 0, sizeof(int16) * numSamples);
 	while (samplesLeft) {






More information about the Scummvm-git-logs mailing list