diff options
| author | Johannes Schickel | 2011-10-12 21:42:24 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-11-06 13:30:34 +0100 |
| commit | 9fa9f68789ef51e078cb8631e06bead13cae13f2 (patch) | |
| tree | 12d08e3f6322daf536ba40f43e50683a216991dd /engines/kyra/sound.cpp | |
| parent | 6c23f78cb93e9056e5dc93a6e2e45061e2789755 (diff) | |
| download | scummvm-rg350-9fa9f68789ef51e078cb8631e06bead13cae13f2.tar.gz scummvm-rg350-9fa9f68789ef51e078cb8631e06bead13cae13f2.tar.bz2 scummvm-rg350-9fa9f68789ef51e078cb8631e06bead13cae13f2.zip | |
AUDIO: Implement a basic VocStream class.
Now all VOCs are streamed rather than preloaded. This deprecates the
STREAM_AUDIO_FROM_DISK define, which was previously used to stream VOCs from
disk.
This might very well break some engines which relied on the stream not being
changed after makeVOCStream! I adapted all engines which had a check for
STREAM_AUDIO_FROM_DISK in their code.
It would be wise to check all other engines using VOC to see if this might
cause any problems for them.
Diffstat (limited to 'engines/kyra/sound.cpp')
| -rw-r--r-- | engines/kyra/sound.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 5195271808..a1af1ad6f8 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -334,16 +334,7 @@ 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::SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse) { - -#ifdef STREAM_AUDIO_FROM_DISK Audio::SeekableAudioStream *as = Audio::makeVOCStream(stream, Audio::FLAG_UNSIGNED, disposeAfterUse); -#else - Audio::SeekableAudioStream *as = Audio::makeVOCStream(stream, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); - - if (disposeAfterUse) - delete stream; -#endif - return as; } |