[Scummvm-cvs-logs] SF.net SVN: scummvm: [30260] scummvm/trunk/engines/scumm/imuse_digi/ dimuse_script.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Jan 5 21:52:42 CET 2008


Revision: 30260
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30260&view=rev
Author:   fingolfin
Date:     2008-01-05 12:52:42 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
Clarified some iMuse Digital code as I understand it

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp	2008-01-05 20:52:30 UTC (rev 30259)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp	2008-01-05 20:52:42 UTC (rev 30260)
@@ -288,12 +288,14 @@
 	return 0;
 }
 
-int IMuseDigital::getSoundStatus(int sound) const {
+int IMuseDigital::getSoundStatus(int soundId) const {
 	Common::StackLock lock(_mutex, "IMuseDigital::getSoundStatus()");
-	debug(5, "IMuseDigital::getSoundStatus(%d)", sound);
+	debug(5, "IMuseDigital::getSoundStatus(%d)", soundId);
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 		Track *track = _track[l];
-		if (track->soundId == sound) {
+		// Note: We do not check track->toBeRemoved here on purpose.
+		// Tracks which are about to stop are still running.
+		if ((track->soundId == soundId) && track->used) {
 			if (_mixer->isSoundHandleActive(track->mixChanHandle)) {
 				return 1;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list