aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk
diff options
context:
space:
mode:
authorMatthew Hoops2011-01-22 16:35:25 +0000
committerMatthew Hoops2011-01-22 16:35:25 +0000
commitc1e68ac94da1f8429462b75e0d51b9d6c2dc2f2f (patch)
tree5a4b87b1a5f9739d41c389199a99da28455c8933 /engines/mohawk
parentcbbafc962d6a35d9b8744cd6d0094dfd976dc30f (diff)
downloadscummvm-rg350-c1e68ac94da1f8429462b75e0d51b9d6c2dc2f2f.tar.gz
scummvm-rg350-c1e68ac94da1f8429462b75e0d51b9d6c2dc2f2f.tar.bz2
scummvm-rg350-c1e68ac94da1f8429462b75e0d51b9d6c2dc2f2f.zip
MOHAWK: Fix meaning of the sound loop variable
svn-id: r55433
Diffstat (limited to 'engines/mohawk')
-rw-r--r--engines/mohawk/sound.cpp12
-rw-r--r--engines/mohawk/sound.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index ac7aa79892..9781258e87 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -440,15 +440,15 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre
dataChunk.bitsPerSample = stream->readByte();
dataChunk.channels = stream->readByte();
dataChunk.encoding = stream->readUint16BE();
- dataChunk.loop = stream->readUint16BE();
+ dataChunk.loopCount = stream->readUint16BE();
dataChunk.loopStart = stream->readUint32BE();
dataChunk.loopEnd = stream->readUint32BE();
- // NOTE: We currently ignore all of the loop parameters here. Myst uses the loop
- // variable but the loopStart and loopEnd are always 0 and the size of the sample.
- // Myst ME doesn't use the Mohawk Sound format and just standard WAVE files and
- // therefore does not contain any of this metadata and we have to specify whether
- // or not to loop elsewhere.
+ // NOTE: We currently ignore all of the loop parameters here. Myst uses the
+ // loopCount variable but the loopStart and loopEnd are always 0 and the size of
+ // the sample. Myst ME doesn't use the Mohawk Sound format and just standard WAVE
+ // files and therefore does not contain any of this metadata and we have to specify
+ // whether or not to loop elsewhere.
dataChunk.audioData = stream->readStream(dataSize);
break;
diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h
index de8dffe1d3..73f7a728ab 100644
--- a/engines/mohawk/sound.h
+++ b/engines/mohawk/sound.h
@@ -110,7 +110,7 @@ struct DataChunk {
byte bitsPerSample;
byte channels;
uint16 encoding;
- uint16 loop;
+ uint16 loopCount; // 0 == no looping, 0xFFFF == infinite loop
uint32 loopStart;
uint32 loopEnd;
Common::SeekableReadStream *audioData;