[Scummvm-cvs-logs] CVS: residual/imuse imuse_script.cpp,1.14,1.15

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Aug 21 06:32:08 CEST 2005


Update of /cvsroot/scummvm/residual/imuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27896

Modified Files:
	imuse_script.cpp 
Log Message:
revert some code.

Index: imuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/imuse/imuse_script.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- imuse_script.cpp	1 Aug 2005 03:49:02 -0000	1.14
+++ imuse_script.cpp	21 Aug 2005 13:31:20 -0000	1.15
@@ -146,12 +146,7 @@
 }
 
 void Imuse::stopAllSounds() {
-	int i;
-	StackLock lock(_mutex);
-	// Make 5 attempts to close out all the sounds before failing
-	// At this time it is inappropriate to say we are stable enough
-	// to just let this run forever
-	for(i = 5; i > 0; i--) {
+	for (;;) {
 		bool foundNotRemoved = false;
 		for (int l = 0; l < MAX_IMUSE_TRACKS + MAX_IMUSE_FADETRACKS; l++) {
 			Track *track = _track[l];
@@ -165,10 +160,6 @@
 		flushTracks();
 		SDL_Delay(50);
 	}
-	if (i == 0) {
-		if (debugLevel == DEBUG_IMUSE || debugLevel == DEBUG_WARN || debugLevel == DEBUG_ALL)
-			warning("Imuse::stopAllSounds() did not stop everything!");
-	}
 }
 
 void Imuse::pause(bool p) {





More information about the Scummvm-git-logs mailing list