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

[fingolfin at users.sourceforge.net]

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

Log Message:
-----------
As far as I can tell / understand, IMuseDigital::getSoundStatus can safely just use isSoundHandleActive for both stream and streamSou (warning: might cause regressions)

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:49:18 UTC (rev 30257)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp	2008-01-05 20:50:10 UTC (rev 30258)
@@ -294,9 +294,8 @@
 	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 		Track *track = _track[l];
 		if (track->soundId == sound) {
-			if ((track->streamSou && _mixer->isSoundHandleActive(track->mixChanHandle)) ||
-				(track->stream && !track->stream->endOfStream())) {
-					return 1;
+			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.