[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_script.cpp,1.12,1.13 dimuse_track.cpp,1.26,1.27

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Jun 20 08:59:02 CEST 2004


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

Modified Files:
	dimuse_script.cpp dimuse_track.cpp 
Log Message:
better check if track is used

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dimuse_script.cpp	20 Jun 2004 15:28:10 -0000	1.12
+++ dimuse_script.cpp	20 Jun 2004 15:58:28 -0000	1.13
@@ -269,7 +269,7 @@
 	debug(5, "IMuseDigital::getSoundStatus(%d)", sound);
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 		Track *track = _track[l];
-		if ((track->soundId == sound) && track->handle.isActive()) {
+		if (track->used && (track->soundId == sound)) {
 			return 1;
 		}
 	}

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dimuse_track.cpp	20 Jun 2004 15:28:11 -0000	1.26
+++ dimuse_track.cpp	20 Jun 2004 15:58:28 -0000	1.27
@@ -83,7 +83,7 @@
 	Track *track = _track[l];
 	for (;;) {
 		flushTracks();
-		if (!track->used && !track->handle.isActive()) {
+		if (!track->used) {
 			track->pan = 64;
 			track->vol = volume * 1000;
 			track->volFadeDest = 0;





More information about the Scummvm-git-logs mailing list