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

[aquadran at users.sourceforge.net]

Revision: 30564
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30564&view=rev
Author:   aquadran
Date:     2008-01-19 05:26:53 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------
fixed support for compressed streams in dimuse

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-19 11:20:34 UTC (rev 30563)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-19 13:26:53 UTC (rev 30564)
@@ -175,13 +175,7 @@
 				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);

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-19 11:20:34 UTC (rev 30563)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-19 13:26:53 UTC (rev 30564)
@@ -156,15 +156,9 @@
 
 		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));


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