diff options
| author | Johannes Schickel | 2010-01-05 02:27:24 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-05 02:27:24 +0000 |
| commit | f5c3bd887e2257fc7fdfb0d141ddbae592f1e83b (patch) | |
| tree | ebbd8705d76d5d23a2b217f7bd31012afe271d2c /engines/kyra/sound.cpp | |
| parent | 00e48f687ff0b0302383abfb9971f5420dc3c265 (diff) | |
| download | scummvm-rg350-f5c3bd887e2257fc7fdfb0d141ddbae592f1e83b.tar.gz scummvm-rg350-f5c3bd887e2257fc7fdfb0d141ddbae592f1e83b.tar.bz2 scummvm-rg350-f5c3bd887e2257fc7fdfb0d141ddbae592f1e83b.zip | |
- Add a new SeekableAudioStream interface. Soon to be used to replace audio stream specific looping code by generic code in Mixer...
- Adapted some existing AudioStreams to implement that interface (not tested!)
svn-id: r47013
Diffstat (limited to 'engines/kyra/sound.cpp')
| -rw-r--r-- | engines/kyra/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 865360dfc1..e5ae400de3 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -241,12 +241,12 @@ namespace { // A simple wrapper to create VOC streams the way like creating MP3, OGG/Vorbis and FLAC streams. // Possible TODO: Think of making this complete and moving it to sound/voc.cpp ? -Audio::AudioStream *makeVOCStream(Common::SeekableReadStream *stream, bool disposeAfterUse, uint32 startTime, uint32 duration, uint numLoops) { +Audio::SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, bool disposeAfterUse, uint32 startTime, uint32 duration, uint numLoops) { #ifdef STREAM_AUDIO_FROM_DISK - Audio::AudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, 0, 0, disposeAfterUse); + Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, 0, 0, disposeAfterUse); #else - Audio::AudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED); + Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED); if (disposeAfterUse) delete stream; |