[Scummvm-cvs-logs] SF.net SVN: scummvm:[50758] scummvm/trunk/engines/sci/sound/soundcmd.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Fri Jul 9 15:01:48 CEST 2010


Revision: 50758
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50758&view=rev
Author:   m_kiewitz
Date:     2010-07-09 13:01:48 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
SCI: removing unneeded mutex locking inside sci0 update cues

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-09 12:30:34 UTC (rev 50757)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-09 13:01:48 UTC (rev 50758)
@@ -584,8 +584,6 @@
 	bool noOnePlaying = true;
 	MusicEntry *pWaitingForPlay = NULL;
 
-	_music->_mutex.lock();
-
 	const MusicList::iterator end = _music->getPlayListEnd();
 	for (MusicList::iterator i = _music->getPlayListStart(); i != end; ++i) {
 		// Is the sound stopped, and the sound object updated too? If yes, skip
@@ -604,7 +602,6 @@
 		processUpdateCues((*i)->soundObj);
 		noOnePlaying = false;
 	}
-	_music->_mutex.unlock();
 
 	if (noOnePlaying && pWaitingForPlay) {
 		// If there is a queued entry, play it now ffs: SciMusic::soundPlay()


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