diff options
| author | Johannes Schickel | 2011-10-09 21:01:52 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-10-09 21:24:06 +0200 |
| commit | 3e1405b939014252611696f7f298b8af58af9786 (patch) | |
| tree | 52530d888b481e812ae808688fbbcc7c0b7aa562 | |
| parent | d4f54a2c97ca5bff03846eca09882b17e0c3a3fa (diff) | |
| download | scummvm-rg350-3e1405b939014252611696f7f298b8af58af9786.tar.gz scummvm-rg350-3e1405b939014252611696f7f298b8af58af9786.tar.bz2 scummvm-rg350-3e1405b939014252611696f7f298b8af58af9786.zip | |
AUDIO: Add default disposeAfterUse value to makeVOCStream again.
| -rw-r--r-- | audio/decoders/voc.h | 2 | ||||
| -rw-r--r-- | engines/agos/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/touche/resource.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/audio/decoders/voc.h b/audio/decoders/voc.h index 335a66e76d..0c2d3b176d 100644 --- a/audio/decoders/voc.h +++ b/audio/decoders/voc.h @@ -94,7 +94,7 @@ extern byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate) * * This does not use any of the looping features of VOC files! */ -SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, byte flags, DisposeAfterUse::Flag disposeAfterUse); +SeekableAudioStream *makeVOCStream(Common::SeekableReadStream *stream, byte flags, DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::NO); } // End of namespace Audio diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 9145688710..11a1cd792e 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -255,7 +255,7 @@ public: Audio::AudioStream *VocSound::makeAudioStream(uint sound) { assert(_offsets); _file->seek(_offsets[sound], SEEK_SET); - return Audio::makeVOCStream(_file.get(), _flags, DisposeAfterUse::NO); + return Audio::makeVOCStream(_file.get(), _flags); } void VocSound::playSound(uint sound, uint loopSound, Audio::Mixer::SoundType type, Audio::SoundHandle *handle, bool loop, int vol) { diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 1700e682f7..ba8c6e2277 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -628,7 +628,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle #endif break; default: - input = Audio::makeVOCStream(_sfxFile, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); + input = Audio::makeVOCStream(_sfxFile, Audio::FLAG_UNSIGNED); break; } diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp index d87f80157f..6df6fc0e5f 100644 --- a/engines/touche/resource.cpp +++ b/engines/touche/resource.cpp @@ -591,7 +591,7 @@ void ToucheEngine::res_loadSound(int priority, int num) { uint32 size; const uint32 offs = res_getDataOffset(kResourceTypeSound, num, &size); _fData.seek(offs); - Audio::AudioStream *stream = Audio::makeVOCStream(&_fData, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); + Audio::AudioStream *stream = Audio::makeVOCStream(&_fData, Audio::FLAG_UNSIGNED); if (stream) { _mixer->playStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream); } @@ -649,7 +649,7 @@ void ToucheEngine::res_loadSpeechSegment(int num) { return; } _fSpeech[i].seek(offs); - stream = Audio::makeVOCStream(&_fSpeech[i], Audio::FLAG_UNSIGNED, DisposeAfterUse::NO); + stream = Audio::makeVOCStream(&_fSpeech[i], Audio::FLAG_UNSIGNED); } else { if (num >= 750) { num -= 750; |