[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_script.cpp,1.42,1.43
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Feb 5 06:58:13 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9571/scumm/imuse_digi
Modified Files:
dimuse_script.cpp
Log Message:
revert experimental smush changes too
Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- dimuse_script.cpp 5 Feb 2006 13:46:39 -0000 1.42
+++ dimuse_script.cpp 5 Feb 2006 14:57:48 -0000 1.43
@@ -163,13 +163,15 @@
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;
More information about the Scummvm-git-logs
mailing list