[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_script.cpp,1.18,1.19 dimuse_track.cpp,1.31,1.32

[Pawel Kolodziejski]

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

Modified Files:
	dimuse_script.cpp dimuse_track.cpp 
Log Message:
dont wait for end of stream while playing insane

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dimuse_script.cpp	21 Jun 2004 05:31:51 -0000	1.18
+++ dimuse_script.cpp	21 Jun 2004 19:37:54 -0000	1.19
@@ -164,15 +164,18 @@
 	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->stream) && (!track->stream->endOfStream())) {
-	 			track->stream->finish();
-			} else if ((track->stream) && (track->stream->endOfStream())) {
-				_vm->_mixer->stopHandle(track->handle);
-				delete track->stream;
-				track->stream = NULL;
-				_sound->closeSound(track->soundHandle);
-				track->soundHandle = NULL;
-				track->used = false;
+			if (track->stream) {
+				if (!track->stream->endOfStream()) {
+	 				track->stream->finish();
+	 			}
+				if (track->stream->endOfStream() || _vm->_insaneRunning) {
+					_vm->_mixer->stopHandle(track->handle);
+					delete track->stream;
+					track->stream = NULL;
+					_sound->closeSound(track->soundHandle);
+					track->soundHandle = NULL;
+					track->used = false;
+				}
 			} else if (track->stream2) {
 				_vm->_mixer->stopHandle(track->handle);
 				delete track->stream2;

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- dimuse_track.cpp	20 Jun 2004 21:01:32 -0000	1.31
+++ dimuse_track.cpp	21 Jun 2004 19:37:54 -0000	1.32
@@ -179,7 +179,6 @@
 			track->used = true;
 			return;
 		}
-		_vm->_system->delay_msecs(50);
 	}
 }