[Scummvm-cvs-logs] SF.net SVN: scummvm:[47220] scummvm/trunk/engines/sci/resource.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 47220
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47220&view=rev
Author:   m_kiewitz
Date:     2010-01-10 11:01:36 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
SCI: changed SoundResource constructor to set values for digitalChannelNr/digitalSampleRate and digitalSampleSize at any time

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-01-10 09:42:55 UTC (rev 47219)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-01-10 11:01:36 UTC (rev 47220)
@@ -1966,10 +1966,10 @@
 				_tracks[trackNr].channelCount++;
 			}
 			_tracks[trackNr].channels = new Channel[_tracks[trackNr].channelCount];
+			_tracks[trackNr].digitalChannelNr = -1; // No digital sound associated
+			_tracks[trackNr].digitalSampleRate = 0;
+			_tracks[trackNr].digitalSampleSize = 0;
 			if (_tracks[trackNr].type != 0xF0) { // Digital track marker - not supported currently
-				_tracks[trackNr].digitalChannelNr = -1; // No digital sound associated
-				_tracks[trackNr].digitalSampleRate = 0;
-				_tracks[trackNr].digitalSampleSize = 0;
 				for (channelNr = 0; channelNr < _tracks[trackNr].channelCount; channelNr++) {
 					channel = &_tracks[trackNr].channels[channelNr];
 					channel->prio = READ_LE_UINT16(data);


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