diff options
| author | Neil Millstone | 2009-08-13 21:46:41 +0000 |
|---|---|---|
| committer | Neil Millstone | 2009-08-13 21:46:41 +0000 |
| commit | a135a7f9385b59b91d5a7f23fd8792ff36afb353 (patch) | |
| tree | f1512bebeb41858db45580f666d42d0177178417 /engines/kyra | |
| parent | 83216b1d17ff12104a917314a9888001c12fc3ee (diff) | |
| download | scummvm-rg350-a135a7f9385b59b91d5a7f23fd8792ff36afb353.tar.gz scummvm-rg350-a135a7f9385b59b91d5a7f23fd8792ff36afb353.tar.bz2 scummvm-rg350-a135a7f9385b59b91d5a7f23fd8792ff36afb353.zip | |
Allow VOCs to stream from disk. Disabled by default, use symbol STREAM_AUDIO_FROM_DISK to enable. See patch #2834001.
svn-id: r43357
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/sound.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 4d42b1efb7..91945d91ee 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -235,10 +235,15 @@ 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) { + +#ifdef STREAM_AUDIO_FROM_DISK + Audio::AudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED, 0, 0, disposeAfterUse); +#else Audio::AudioStream *as = Audio::makeVOCStream(*stream, Audio::Mixer::FLAG_UNSIGNED); if (disposeAfterUse) delete stream; +#endif return as; } |