[Scummvm-cvs-logs] SF.net SVN: scummvm:[50315] scummvm/trunk/engines/sci/sound/music.h

[m_kiewitz at users.sourceforge.net]

Revision: 50315
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50315&view=rev
Author:   m_kiewitz
Date:     2010-06-26 11:43:14 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
SCI: fixing deadlock possiblity on samples (sq3 deadlocked on door opening/where am i on me)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.h

Modified: scummvm/trunk/engines/sci/sound/music.h
===================================================================
--- scummvm/trunk/engines/sci/sound/music.h	2010-06-26 11:31:04 UTC (rev 50314)
+++ scummvm/trunk/engines/sci/sound/music.h	2010-06-26 11:43:14 UTC (rev 50315)
@@ -164,11 +164,13 @@
 	uint32 soundGetTempo() const { return _dwTempo; }
 
 	bool soundIsActive(MusicEntry *pSnd) {
+		Common::StackLock lock(_mutex);
 		assert(pSnd->pStreamAud != 0);
 		return _pMixer->isSoundHandleActive(pSnd->hCurrentAud);
 	}
 
 	void updateAudioStreamTicker(MusicEntry *pSnd) {
+		Common::StackLock lock(_mutex);
 		assert(pSnd->pStreamAud != 0);
 		pSnd->ticker = (uint16)(_pMixer->getSoundElapsedTime(pSnd->hCurrentAud) * 0.06);
 	}


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