aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2010-06-26 11:48:42 +0000
committerMartin Kiewitz2010-06-26 11:48:42 +0000
commite4153044d42ec976699389956441020cc52d9005 (patch)
treed0dbfd51b8159ba9f636b3d8e12e7401c42504ec
parentbe75870100e7e411b35f70cd96a851d7e50c20da (diff)
downloadscummvm-rg350-e4153044d42ec976699389956441020cc52d9005.tar.gz
scummvm-rg350-e4153044d42ec976699389956441020cc52d9005.tar.bz2
scummvm-rg350-e4153044d42ec976699389956441020cc52d9005.zip
SCI: reverting r50315 - had the deadlock just again...
svn-id: r50316
-rw-r--r--engines/sci/sound/music.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index ec9cbd8506..a29b6edee2 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -164,13 +164,11 @@ public:
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);
}