diff options
| author | Johannes Schickel | 2010-01-10 15:20:14 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-10 15:20:14 +0000 |
| commit | 6ca0570fe3bb3f3765677ff8cd3f9e0cbf062d6b (patch) | |
| tree | 732a2cc846d6f70dd2c42b0dc0cd52d45de34bb2 /engines/kyra | |
| parent | bda3fc940c3ecca011b04a32fb20970f53f49d1c (diff) | |
| download | scummvm-rg350-6ca0570fe3bb3f3765677ff8cd3f9e0cbf062d6b.tar.gz scummvm-rg350-6ca0570fe3bb3f3765677ff8cd3f9e0cbf062d6b.tar.bz2 scummvm-rg350-6ca0570fe3bb3f3765677ff8cd3f9e0cbf062d6b.zip | |
- Add a SubLoopingAudioStream, which loops a nested part of a stream and thus features the same looping capabilites as LinearMemoryStream and LinearDiskStream.
- Remove custom looping code from LinearMemoryStream and LinearDiskStream.
- Adapt various client code to the changes.
svn-id: r47226
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 4049d2b456..b97d367206 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -244,9 +244,9 @@ namespace { Audio::SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, bool disposeAfterUse) { #ifdef STREAM_AUDIO_FROM_DISK - Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, 0, 0, disposeAfterUse); + Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, disposeAfterUse); #else - Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED); + Audio::SeekableAudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, false); if (disposeAfterUse) delete stream; |