diff options
| author | Max Horn | 2010-01-16 21:36:08 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-16 21:36:08 +0000 |
| commit | 7ec2da968c9c572daa888e4f3215e99ba0e9e86b (patch) | |
| tree | 17170e1ada083a09a6bbb8ac89889a9938473fa3 /engines/tucker | |
| parent | b8f2a3a34271b73ab2cb84ea25e5fbf80e076658 (diff) | |
| download | scummvm-rg350-7ec2da968c9c572daa888e4f3215e99ba0e9e86b.tar.gz scummvm-rg350-7ec2da968c9c572daa888e4f3215e99ba0e9e86b.tar.bz2 scummvm-rg350-7ec2da968c9c572daa888e4f3215e99ba0e9e86b.zip | |
Switch most AudioStream factories to use DisposeAfterUse::Flag
svn-id: r47334
Diffstat (limited to 'engines/tucker')
| -rw-r--r-- | engines/tucker/resource.cpp | 6 | ||||
| -rw-r--r-- | engines/tucker/sequences.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp index 6c244d070a..e1bca03724 100644 --- a/engines/tucker/resource.cpp +++ b/engines/tucker/resource.cpp @@ -43,7 +43,7 @@ enum { struct CompressedSoundFile { const char *filename; - Audio::SeekableAudioStream *(*makeStream)(Common::SeekableReadStream *stream, bool disposeAfterUse); + Audio::SeekableAudioStream *(*makeStream)(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse); }; static const CompressedSoundFile compressedSoundFilesTable[] = { @@ -270,7 +270,7 @@ Audio::RewindableAudioStream *CompressedSound::load(CompressedSoundType type, in _fCompressedSound.seek(dirOffset + dirSize * 8 + soundOffset); Common::MemoryReadStream *tmp = _fCompressedSound.readStream(soundSize); if (tmp) { - stream = (compressedSoundFilesTable[_compressedSoundType].makeStream)(tmp, true); + stream = (compressedSoundFilesTable[_compressedSoundType].makeStream)(tmp, DisposeAfterUse::YES); } } } @@ -946,7 +946,7 @@ void TuckerEngine::loadSound(Audio::Mixer::SoundType type, int num, int volume, snprintf(fileName, sizeof(fileName), fmt, num); Common::File *f = new Common::File; if (f->open(fileName)) { - stream = Audio::makeWAVStream(f, true); + stream = Audio::makeWAVStream(f, DisposeAfterUse::YES); } else { delete f; } diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index 204913addf..cd3423d8c2 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -603,7 +603,7 @@ Audio::RewindableAudioStream *AnimationSequencePlayer::loadSound(int index, Anim } break; case kAnimationSoundTypeWAV: - stream = Audio::makeWAVStream(&f, false); + stream = Audio::makeWAVStream(&f, DisposeAfterUse::NO); break; } |