aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-10 11:01:36 +0000
committerMartin Kiewitz2010-01-10 11:01:36 +0000
commitc371c395681b932535f40e1ebe768b14d77255f3 (patch)
tree8cd20947d5bce58097a9a986e51d515c01e29689
parent231e122c639e745094062e14273ab64b6bb84ea4 (diff)
downloadscummvm-rg350-c371c395681b932535f40e1ebe768b14d77255f3.tar.gz
scummvm-rg350-c371c395681b932535f40e1ebe768b14d77255f3.tar.bz2
scummvm-rg350-c371c395681b932535f40e1ebe768b14d77255f3.zip
SCI: changed SoundResource constructor to set values for digitalChannelNr/digitalSampleRate and digitalSampleSize at any time
svn-id: r47220
-rw-r--r--engines/sci/resource.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index feff560c04..9d7f9b4c06 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1966,10 +1966,10 @@ SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersi
_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);