aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/animation.cpp2
-rw-r--r--engines/agos/sound.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index ec51f8479b..9ba8320098 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -301,7 +301,7 @@ void MoviePlayerDXA::startSound() {
}
Common::MemoryReadStream stream(buffer, size);
- _bgSoundStream = Audio::makeWAVStream(stream);
+ _bgSoundStream = Audio::makeWAVStream(&stream, false);
free(buffer);
} else {
_bgSoundStream = Audio::AudioStream::openStreamFile(baseName);
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 5558e9025a..3aa3bd1865 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -247,7 +247,7 @@ Audio::AudioStream *WavSound::makeAudioStream(uint sound) {
return NULL;
_file->seek(_offsets[sound], SEEK_SET);
- return Audio::makeWAVStream(*_file);
+ return Audio::makeWAVStream(_file, false);
}
void WavSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, byte flags, int vol) {
@@ -263,6 +263,7 @@ void VocSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType typ
int size, rate;
byte *buffer = Audio::loadVOCFromStream(*_file, size, rate);
+ // TODO: Use makeVOCStream
assert(buffer);
_mixer->playRaw(type, handle, buffer, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE);
}
@@ -741,6 +742,7 @@ void Sound::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint soun
uint16 compType;
int blockAlign, rate;
+ // FIXME: How about using makeWAVStream() here?
int size = READ_LE_UINT32(soundData + 4);
Common::MemoryReadStream stream(soundData, size);
if (!Audio::loadWAVFromStream(stream, size, rate, flags, &compType, &blockAlign))