diff options
| author | Filippos Karapetis | 2009-12-26 00:50:09 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-12-26 00:50:09 +0000 |
| commit | 12b6d4ab032cad05e54b9a40bd8c36736597bb71 (patch) | |
| tree | f8185acac1341d6713b23b3872b555781bf1479a /engines/sci/sfx | |
| parent | a88e4df7a0d01e572d7c942da67d53799fb4a6b5 (diff) | |
| download | scummvm-rg350-12b6d4ab032cad05e54b9a40bd8c36736597bb71.tar.gz scummvm-rg350-12b6d4ab032cad05e54b9a40bd8c36736597bb71.tar.bz2 scummvm-rg350-12b6d4ab032cad05e54b9a40bd8c36736597bb71.zip | |
Some more work on the new music code
svn-id: r46569
Diffstat (limited to 'engines/sci/sfx')
| -rw-r--r-- | engines/sci/sfx/music.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp index 06860ebc5e..b9159b1f83 100644 --- a/engines/sci/sfx/music.cpp +++ b/engines/sci/sfx/music.cpp @@ -130,11 +130,12 @@ bool SciMusic::restoreState(Common::InSaveFile *pFile){ void SciMusic::stopAll() { _mutex.lock(); _pMixer->stopAll(); - //audioStop(); - for(uint i = 0; i < _playList.size(); i++){ + + for (uint i = 0; i < _playList.size(); i++){ soundStop(_playList[i]); soundKill(_playList[i]); } + _mutex.unlock(); } //---------------------------------------- @@ -469,6 +470,7 @@ void SciMusic::soundKill(MusicEntry *pSnd) { for (i = 0; i < sz; i++) { if (_playList[i] == pSnd) { delete _playList[i]->soundRes; + _playList[i]->soundRes = 0; _playList.remove_at(i); break; } |