[Scummvm-cvs-logs] SF.net SVN: scummvm:[46575] scummvm/trunk/engines/sci/sfx/music.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sat Dec 26 11:20:58 CET 2009


Revision: 46575
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46575&view=rev
Author:   m_kiewitz
Date:     2009-12-26 10:20:57 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
SCI/newmusic: Removed mutex from onTimer, fixes freeze in sci1 games

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/music.cpp

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-26 01:38:57 UTC (rev 46574)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-26 10:20:57 UTC (rev 46575)
@@ -345,7 +345,7 @@
 }
 //----------------------------------------
 void SciMusic::onTimer() {
-	_mutex.lock();
+//	_mutex.lock();
 
 	uint sz = _playList.size();
 	for (uint i = 0; i < sz; i++) {
@@ -372,7 +372,7 @@
 		}
 	}//for()
 	
-	_mutex.unlock();
+//	_mutex.unlock();
 }
 //---------------------------------------------
 void SciMusic::doFade(MusicEntry *pSnd) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list