[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.107,1.108 dimuse_script.cpp,1.22,1.23

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3215/scummvm/scumm/imuse_digi

Modified Files:
	dimuse.cpp dimuse_script.cpp 
Log Message:
added comment for insane hack and not tested fix for deadlock bug imuse + debugger

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- dimuse.cpp	19 Jul 2004 15:26:07 -0000	1.107
+++ dimuse.cpp	25 Aug 2004 07:03:37 -0000	1.108
@@ -156,9 +156,6 @@
 void IMuseDigital::callback() {
 	Common::StackLock lock(_mutex, "IMuseDigital::callback()");
 
-	if (_pause || !_vm)
-		return;
-
 	for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) {
 		Track *track = _track[l];
 		if (track->used && !track->readyToRemove) {
@@ -167,6 +164,9 @@
 				continue;
 			}
 
+			if (_pause || !_vm)
+				return;
+
 			if (track->volFadeUsed) {
 				if (track->volFadeStep < 0) {
 					if (track->vol > track->volFadeDest) {

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- dimuse_script.cpp	19 Jul 2004 15:21:29 -0000	1.22
+++ dimuse_script.cpp	25 Aug 2004 07:03:38 -0000	1.23
@@ -163,7 +163,8 @@
 	debug(5, "flushTracks()");
 	for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) {
 		Track *track = _track[l];
-		if (track->used && (track->readyToRemove || (_vm->_insaneRunning && track->toBeRemoved))) {
+		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();