aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2008-01-19 13:26:53 +0000
committerPaweł Kołodziejski2008-01-19 13:26:53 +0000
commit00de5113350caefc542244c5f9f75ee7d153bd4c (patch)
treeb70de3b6c62cd1970698a4e3a2927cc2d39036d7 /engines/scumm
parent4cbd3e6af8272eadde5bd876625b09c12a751f75 (diff)
downloadscummvm-rg350-00de5113350caefc542244c5f9f75ee7d153bd4c.tar.gz
scummvm-rg350-00de5113350caefc542244c5f9f75ee7d153bd4c.tar.bz2
scummvm-rg350-00de5113350caefc542244c5f9f75ee7d153bd4c.zip
fixed support for compressed streams in dimuse
svn-id: r30564
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/imuse_digi/dimuse.cpp6
-rw-r--r--engines/scumm/imuse_digi/dimuse_track.cpp12
2 files changed, 3 insertions, 15 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index ed244651dd..afb707504c 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -175,13 +175,7 @@ void IMuseDigital::saveOrLoad(Serializer *ser) {
continue;
}
-/* if (track->sndDataExtComp) {
- track->regionOffset = 0;
- }
track->sndDataExtComp = _sound->isSndDataExtComp(track->soundDesc);
- if (track->sndDataExtComp) {
- track->regionOffset = 0;
- }*/
track->dataOffset = _sound->getRegionOffset(track->soundDesc, track->curRegion);
int bits = _sound->getBits(track->soundDesc);
int channels = _sound->getChannels(track->soundDesc);
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp
index 191e227eae..d91e272c2d 100644
--- a/engines/scumm/imuse_digi/dimuse_track.cpp
+++ b/engines/scumm/imuse_digi/dimuse_track.cpp
@@ -156,15 +156,9 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
if (otherTrack && otherTrack->used && !otherTrack->toBeRemoved) {
track->curRegion = otherTrack->curRegion;
-/* if (track->sndDataExtComp) {
- track->dataOffset = _sound->getRegionOffset(track->soundDesc, track->curRegion);
- track->regionOffset = 0;
- track->dataMod12Bit = 0;
- } else */{
- track->dataOffset = otherTrack->dataOffset;
- track->regionOffset = otherTrack->regionOffset;
- track->dataMod12Bit = otherTrack->dataMod12Bit;
- }
+ track->dataOffset = otherTrack->dataOffset;
+ track->regionOffset = otherTrack->regionOffset;
+ track->dataMod12Bit = otherTrack->dataMod12Bit;
}
track->stream = Audio::makeAppendableAudioStream(freq, makeMixerFlags(track->mixerFlags));