[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_track.cpp,1.57,1.58

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Jan 28 12:15:01 CET 2006


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

Modified Files:
	dimuse_track.cpp 
Log Message:
revert, that is still needed anyway

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- dimuse_track.cpp	28 Jan 2006 16:30:38 -0000	1.57
+++ dimuse_track.cpp	28 Jan 2006 20:13:53 -0000	1.58
@@ -75,8 +75,11 @@
 	}
 
 	Track *track = _track[l];
-	flushTracks();
-	assert(!track->used);
+	while (track->used) {
+		// The designated track is not yet available. So, we call flushTracks()
+		// to get it processed (and thus made ready for us).
+		flushTracks();
+	}
 	track->pan = 64;
 	track->vol = volume * 1000;
 	track->volFadeDest = 0;





More information about the Scummvm-git-logs mailing list