diff options
| author | Max Horn | 2010-11-19 17:03:07 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-19 17:03:07 +0000 |
| commit | 2180b2d6b534d3786f89d02fe508c60c68b7ff89 (patch) | |
| tree | ac7af0e5f5049537f4c81c401d5685bebbb47068 /engines/queen | |
| parent | 111384473bb65741f7f2b945e1c00e6aeccc805c (diff) | |
| download | scummvm-rg350-2180b2d6b534d3786f89d02fe508c60c68b7ff89.tar.gz scummvm-rg350-2180b2d6b534d3786f89d02fe508c60c68b7ff89.tar.bz2 scummvm-rg350-2180b2d6b534d3786f89d02fe508c60c68b7ff89.zip | |
COMMON: Split common/stream.h into several headers
svn-id: r54385
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/resource.cpp | 1 | ||||
| -rw-r--r-- | engines/queen/sound.cpp | 8 |
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))); } |