diff options
| author | Norbert Lange | 2009-08-16 16:39:34 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-16 16:39:34 +0000 |
| commit | c96affd0c1e5480fe1a4a3d3e82583c795570d21 (patch) | |
| tree | 3f3a71bc02976024345c5c3e44534055d9c9c4cd /engines/kyra/sound.cpp | |
| parent | 2b147c57161cdacf3cdc5bc572ce46160cbd6b5e (diff) | |
| parent | ce30a513acdaab2ca5eacd136cc80ade1beabb3a (diff) | |
| download | scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.gz scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.bz2 scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.zip | |
merge with trunk
svn-id: r43443
Diffstat (limited to 'engines/kyra/sound.cpp')
| -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 83584ab454..781516282e 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -242,10 +242,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; } |