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

[fingolfin at users.sourceforge.net]

Revision: 26259
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26259&view=rev
Author:   fingolfin
Date:     2007-03-20 12:40:34 -0700 (Tue, 20 Mar 2007)

Log Message:
-----------
Make sure Track::soundHandle is always initialize, and added a FIXME (see also bug #1635361)

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	2007-03-20 19:37:31 UTC (rev 26258)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2007-03-20 19:40:34 UTC (rev 26259)
@@ -114,6 +114,7 @@
 		track->iteration = 0;
 		track->souStream = true;
 		track->soundName[0] = 0;
+		track->soundHandle = NULL;
 	} else {
 		track->souStream = false;
 		strcpy(track->soundName, soundName);
@@ -323,6 +324,8 @@
 	memcpy(fadeTrack, track, sizeof(Track));
 
 	// Clone the soundhandle
+	// FIXME: Shouldn't we check here whether track->soundHandle is NULL, resp. whether stream2
+	// is being used (as in, we are using compressed data)...
 	fadeTrack->soundHandle = _sound->cloneSound(track->soundHandle);
 	assert(fadeTrack->soundHandle);
 


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