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.h | |
| 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.h')
| -rw-r--r-- | sound/mixer.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 23ad29082d..0055e51d87 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -88,9 +88,6 @@ public: /** reverse the left and right stereo channel */ FLAG_REVERSE_STEREO = 1 << 4, - /** sound buffer is freed automagically at the end of playing */ - FLAG_AUTOFREE = 1 << 5, - /** loop the audio */ FLAG_LOOP = 1 << 6 }; @@ -137,7 +134,9 @@ public: virtual void playRaw( SoundType type, SoundHandle *handle, - void *sound, uint32 size, uint rate, byte flags, + void *sound, uint32 size, + DisposeAfterUse::Flag autofreeBuffer, + uint rate, byte flags, int id = -1, byte volume = kMaxChannelVolume, int8 balance = 0, uint32 loopStart = 0, uint32 loopEnd = 0) = 0; |