aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Hoops2011-04-13 09:43:08 -0400
committerMatthew Hoops2011-04-13 09:45:13 -0400
commitdeb46ab38b8a904543ede68ff2d2315f40168096 (patch)
tree6e2ad650d4fc2f255607e22c779db13935be1de5 /engines
parent3be6ff23d7f83254e8282d801d38dedfc36b51a1 (diff)
downloadscummvm-rg350-deb46ab38b8a904543ede68ff2d2315f40168096.tar.gz
scummvm-rg350-deb46ab38b8a904543ede68ff2d2315f40168096.tar.bz2
scummvm-rg350-deb46ab38b8a904543ede68ff2d2315f40168096.zip
AUDIO: Split the Intel DVI ADPCM into its own class
IMA is really just the definition on how to decode a sample from a nibble, DVI is just a way for those nibbles to be stored in the stream.
Diffstat (limited to 'engines')
-rw-r--r--engines/mohawk/sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index b4ae50b74a..9759f14699 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -479,7 +479,7 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre
return Audio::makeRawStream(dataChunk.audioData, dataChunk.sampleRate, flags);
} else if (dataChunk.encoding == kCodecADPCM) {
uint32 blockAlign = dataChunk.channels * dataChunk.bitsPerSample / 8;
- return Audio::makeADPCMStream(dataChunk.audioData, DisposeAfterUse::YES, dataSize, Audio::kADPCMIma, dataChunk.sampleRate, dataChunk.channels, blockAlign);
+ return Audio::makeADPCMStream(dataChunk.audioData, DisposeAfterUse::YES, dataSize, Audio::kADPCMDVI, dataChunk.sampleRate, dataChunk.channels, blockAlign);
} else if (dataChunk.encoding == kCodecMPEG2) {
#ifdef USE_MAD
return Audio::makeMP3Stream(dataChunk.audioData, DisposeAfterUse::YES);