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

[aquadran at users.sourceforge.net]

Revision: 30488
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30488&view=rev
Author:   aquadran
Date:     2008-01-14 13:42:39 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
revert last experimental dimuse change, force flush

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

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-14 20:35:58 UTC (rev 30487)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-14 21:42:39 UTC (rev 30488)
@@ -328,8 +328,8 @@
 	}
 
 	if (_track[track->trackId + MAX_DIGITAL_TRACKS]->used) {
-		warning("IMuseDigital::cloneToFadeOutTrack: No free fade track, force flush");
-		flushTrack(_track[track->trackId + MAX_DIGITAL_TRACKS]);
+		warning("IMuseDigital::cloneToFadeOutTrack: No free fade track");
+		return NULL;
 	}
 
 	fadeTrack = _track[track->trackId + MAX_DIGITAL_TRACKS];


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