From 00de5113350caefc542244c5f9f75ee7d153bd4c Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Sat, 19 Jan 2008 13:26:53 +0000
Subject: fixed support for compressed streams in dimuse

svn-id: r30564
---
 engines/scumm/imuse_digi/dimuse.cpp       |  6 ------
 engines/scumm/imuse_digi/dimuse_track.cpp | 12 +++---------
 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));
-- 
cgit v1.2.3