ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restored the mutexes in onTimer, and removed them from soundKill - fixes the freeze in LSL5 intro

Browse Source 
svn-id: r46577
This commit is contained in:
Filippos Karapetis
2009-12-26 10:50:05 +00:00
parent bc0da4dce8
commit 8940a1f537
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/sci/sfx/music.cpp
+4 -4
View File
@@ -345,7 +345,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) {
}
//----------------------------------------
void SciMusic::onTimer() {
// _mutex.lock();
_mutex.lock();
uint sz = _playList.size();
for (uint i = 0; i < sz; i++) {
@@ -372,7 +372,7 @@ void SciMusic::onTimer() {
}
}//for()
// _mutex.unlock();
_mutex.unlock();
}
//---------------------------------------------
void SciMusic::doFade(MusicEntry *pSnd) {
@@ -452,7 +452,8 @@ void SciMusic::soundSetPriority(MusicEntry *pSnd, byte prio) {
}
//---------------------------------------------
void SciMusic::soundKill(MusicEntry *pSnd) {
_mutex.lock();
// For some reason, adding a mutex here freezes some games (e.g. LSL5)
pSnd->status = kSndStatusStopped;
if (pSnd->pMidiParser) {
@@ -476,7 +477,6 @@ void SciMusic::soundKill(MusicEntry *pSnd) {
}
}
_mutex.unlock();
}
//---------------------------------------------
void SciMusic::soundPause(MusicEntry *pSnd) {