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/sci | |
| 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/sci')
| -rw-r--r-- | engines/sci/sound/audio.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/music.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index 4011aa9fa3..54655eb0c7 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -230,7 +230,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32 if (memcmp(audioRes->data, "RIFF", 4) == 0) { // WAVE detected Common::MemoryReadStream *waveStream = new Common::MemoryReadStream(audioRes->data, audioRes->size, DisposeAfterUse::NO); - audioStream = Audio::makeWAVStream(waveStream, true); + audioStream = Audio::makeWAVStream(waveStream, DisposeAfterUse::YES); } } if (!audioStream) { diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index d7642d10b7..59554b93a1 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -228,7 +228,7 @@ void SciMusic::soundPlay(MusicEntry *pSnd) { if (pSnd->pStreamAud && !_pMixer->isSoundHandleActive(pSnd->hCurrentAud)) { if (pSnd->loop > 1) { pSnd->pLoopStream = new Audio::LoopingAudioStream(pSnd->pStreamAud, - pSnd->loop, false + pSnd->loop, DisposeAfterUse::NO ); _pMixer->playInputStream(pSnd->soundType, &pSnd->hCurrentAud, pSnd->pLoopStream, -1, pSnd->volume, 0, |