aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/sound.cpp
diff options
context:
space:
mode:
authorMax Horn2010-11-19 17:03:07 +0000
committerMax Horn2010-11-19 17:03:07 +0000
commit2180b2d6b534d3786f89d02fe508c60c68b7ff89 (patch)
treeac7af0e5f5049537f4c81c401d5685bebbb47068 /engines/scumm/sound.cpp
parent111384473bb65741f7f2b945e1c00e6aeccc805c (diff)
downloadscummvm-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/scumm/sound.cpp')
-rw-r--r--engines/scumm/sound.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 380b52031f..ee8825d946 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -598,7 +598,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
#ifdef USE_MAD
{
assert(size > 0);
- Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
+ Common::SeekableReadStream *tmp = _sfxFile->readStream(size);
assert(tmp);
input = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
}
@@ -608,7 +608,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
#ifdef USE_VORBIS
{
assert(size > 0);
- Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
+ Common::SeekableReadStream *tmp = _sfxFile->readStream(size);
assert(tmp);
input = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
}
@@ -618,7 +618,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
#ifdef USE_FLAC
{
assert(size > 0);
- Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
+ Common::SeekableReadStream *tmp = _sfxFile->readStream(size);
assert(tmp);
input = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
}