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/tinsel/sound.cpp | |
| 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/tinsel/sound.cpp')
| -rw-r--r-- | engines/tinsel/sound.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 9921d0edfa..8f6dd762ba 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -139,17 +139,17 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound switch (_soundMode) { case kMP3Mode: #ifdef USE_MAD - sampleStream = Audio::makeMP3Stream(compressedStream, true); + sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES); #endif break; case kVorbisMode: #ifdef USE_VORBIS - sampleStream = Audio::makeVorbisStream(compressedStream, true); + sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES); #endif break; case kFlacMode: #ifdef USE_FLAC - sampleStream = Audio::makeFlacStream(compressedStream, true); + sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES); #endif break; default: @@ -289,21 +289,21 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p switch (_soundMode) { case kMP3Mode: #ifdef USE_MAD - sampleStream = Audio::makeMP3Stream(compressedStream, true); + sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES); #endif break; case kVorbisMode: #ifdef USE_VORBIS - sampleStream = Audio::makeVorbisStream(compressedStream, true); + sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES); #endif break; case kFlacMode: #ifdef USE_FLAC - sampleStream = Audio::makeFlacStream(compressedStream, true); + sampleStream = Audio::makeFlacStream(compressedStream, DisposeAfterUse::YES); #endif break; default: - sampleStream = Audio::makeADPCMStream(compressedStream, true, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24); + sampleStream = Audio::makeADPCMStream(compressedStream, DisposeAfterUse::YES, sampleLen, Audio::kADPCMTinsel6, 22050, 1, 24); break; } |