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/sword2 | |
| 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/sword2')
| -rw-r--r-- | engines/sword2/music.cpp | 6 | ||||
| -rw-r--r-- | engines/sword2/sound.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index 67d04c870d..e5936bb958 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -199,17 +199,17 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, #ifdef USE_MAD case kMP3Mode: tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len); - return Audio::makeMP3Stream(tmp, true); + return Audio::makeMP3Stream(tmp, DisposeAfterUse::YES); #endif #ifdef USE_VORBIS case kVorbisMode: tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len); - return Audio::makeVorbisStream(tmp, true); + return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES); #endif #ifdef USE_FLAC case kFlacMode: tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len); - return Audio::makeFlacStream(tmp, true); + return Audio::makeFlacStream(tmp, DisposeAfterUse::YES); #endif default: return NULL; diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index 224bc66a95..2d02a2d3ba 100644 --- a/engines/sword2/sound.cpp +++ b/engines/sword2/sound.cpp @@ -336,7 +336,7 @@ int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vo if (Sword2Engine::isPsx()) input = new Audio::VagStream(stream); else - input = Audio::makeWAVStream(stream, true); + input = Audio::makeWAVStream(stream, DisposeAfterUse::YES); assert(input); |