aboutsummaryrefslogtreecommitdiff
path: root/engines/queen
diff options
context:
space:
mode:
Diffstat (limited to 'engines/queen')
-rw-r--r--engines/queen/resource.cpp1
-rw-r--r--engines/queen/sound.cpp8
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp
index 1e2eff8458..a70d1f1613 100644
--- a/engines/queen/resource.cpp
+++ b/engines/queen/resource.cpp
@@ -26,6 +26,7 @@
#include "common/debug.h"
#include "common/endian.h"
#include "common/config-manager.h"
+#include "common/substream.h"
#include "queen/resource.h"
namespace Queen {
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index 659da2dd97..10ffd61724 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -26,7 +26,7 @@
#include "common/config-manager.h"
#include "common/endian.h"
-#include "common/stream.h"
+#include "common/memstream.h"
#include "queen/sound.h"
#include "queen/input.h"
@@ -119,7 +119,7 @@ public:
MP3Sound(Audio::Mixer *mixer, QueenEngine *vm) : PCSound(mixer, vm) {}
protected:
void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
- Common::MemoryReadStream *tmp = f->readStream(size);
+ Common::SeekableReadStream *tmp = f->readStream(size);
assert(tmp);
_mixer->playStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeMP3Stream(tmp, DisposeAfterUse::YES)));
}
@@ -132,7 +132,7 @@ public:
OGGSound(Audio::Mixer *mixer, QueenEngine *vm) : PCSound(mixer, vm) {}
protected:
void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
- Common::MemoryReadStream *tmp = f->readStream(size);
+ Common::SeekableReadStream *tmp = f->readStream(size);
assert(tmp);
_mixer->playStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeVorbisStream(tmp, DisposeAfterUse::YES)));
}
@@ -145,7 +145,7 @@ public:
FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : PCSound(mixer, vm) {}
protected:
void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) {
- Common::MemoryReadStream *tmp = f->readStream(size);
+ Common::SeekableReadStream *tmp = f->readStream(size);
assert(tmp);
_mixer->playStream(Audio::Mixer::kSFXSoundType, soundHandle, new AudioStreamWrapper(Audio::makeFLACStream(tmp, DisposeAfterUse::YES)));
}