diff options
| author | Max Horn | 2010-01-19 00:56:29 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-19 00:56:29 +0000 |
| commit | 557bb394de6619dd1f360b72333fd2ec7b3defab (patch) | |
| tree | b1166a12105d01c92edb528177d24aa5115232e5 /sound/mixer.cpp | |
| parent | 69be7476212916b166ac16db41253cd367fb0dcc (diff) | |
| download | scummvm-rg350-557bb394de6619dd1f360b72333fd2ec7b3defab.tar.gz scummvm-rg350-557bb394de6619dd1f360b72333fd2ec7b3defab.tar.bz2 scummvm-rg350-557bb394de6619dd1f360b72333fd2ec7b3defab.zip | |
Get rid of Mixer::FLAG_AUTOFREE.
Also fix several recently introduced new/delete vs. malloc/free mismatches.
svn-id: r47369
Diffstat (limited to 'sound/mixer.cpp')
| -rw-r--r-- | sound/mixer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index a3aaa19e8f..7a5be35fbb 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -221,12 +221,14 @@ void MixerImpl::playRaw( SoundType type, SoundHandle *handle, void *sound, - uint32 size, uint rate, byte flags, + uint32 size, + DisposeAfterUse::Flag autofreeBuffer, + uint rate, byte flags, int id, byte volume, int8 balance, uint32 loopStart, uint32 loopEnd) { // Create the input stream - AudioStream *input = makeRawMemoryStream((byte *)sound, size, rate, flags, loopStart, loopEnd); + AudioStream *input = makeRawMemoryStream((byte *)sound, size, autofreeBuffer, rate, flags, loopStart, loopEnd); // Play it playInputStream(type, handle, input, id, volume, balance, DisposeAfterUse::YES, false, ((flags & Mixer::FLAG_REVERSE_STEREO) != 0)); |