diff options
author | Paweł Kołodziejski | 2006-02-05 14:57:48 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2006-02-05 14:57:48 +0000 |
commit | b4f4175c1cf00b7c7c69f50366e71d8097b4d5f7 (patch) | |
tree | ecd945c2ce359db9f1a3279b2afdd19a209b268e /scumm/imuse_digi/dimuse_script.cpp | |
parent | 419caac2b922f69e4c48afb20ba6d0961a2c0e42 (diff) | |
download | scummvm-rg350-b4f4175c1cf00b7c7c69f50366e71d8097b4d5f7.tar.gz scummvm-rg350-b4f4175c1cf00b7c7c69f50366e71d8097b4d5f7.tar.bz2 scummvm-rg350-b4f4175c1cf00b7c7c69f50366e71d8097b4d5f7.zip |
revert experimental smush changes too
svn-id: r20402
Diffstat (limited to 'scumm/imuse_digi/dimuse_script.cpp')
-rw-r--r-- | scumm/imuse_digi/dimuse_script.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp index 7dc435017e..fcadf609dc 100644 --- a/scumm/imuse_digi/dimuse_script.cpp +++ b/scumm/imuse_digi/dimuse_script.cpp @@ -163,13 +163,15 @@ void IMuseDigital::flushTracks() { debug(5, "flushTracks()"); for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) { Track *track = _track[l]; - if (track->used && track->readyToRemove) { + if (track->used && (track->readyToRemove || + (_vm->_insaneRunning && track->toBeRemoved))) { // INSANE hack for sync timer mode if (track->stream) { if (!track->stream->endOfStream()) { track->stream->finish(); } if (track->stream->endOfStream() - || _vm->_mixer->isPaused()) { // hack for paused Mixer + || _vm->_mixer->isPaused() // hack for paused Mixer + || _vm->_insaneRunning) { // INSANE hack for sync timer mode _vm->_mixer->stopHandle(track->handle); delete track->stream; track->stream = NULL; |