diff options
| author | Joost Peters | 2003-10-25 01:11:14 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-10-25 01:11:14 +0000 |
| commit | 6fc0cd791325b5e36cb486d36768b9a2a1c7dcf5 (patch) | |
| tree | 93c43e7846485a7c3ef36a5e9b0ca9ebf959e0c5 /sound | |
| parent | 3ad14b06f507d056da5c8e1506d95e607029f75e (diff) | |
| download | scummvm-rg350-6fc0cd791325b5e36cb486d36768b9a2a1c7dcf5.tar.gz scummvm-rg350-6fc0cd791325b5e36cb486d36768b9a2a1c7dcf5.tar.bz2 scummvm-rg350-6fc0cd791325b5e36cb486d36768b9a2a1c7dcf5.zip | |
whatever
svn-id: r10959
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.cpp | 7 | ||||
| -rw-r--r-- | sound/mixer.h | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 21439a648e..a46ad18db7 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -44,7 +44,6 @@ protected: RateConverter *_converter; AudioInputStream *_input; byte _volume; - byte _flags; int8 _pan; bool _paused; @@ -511,7 +510,6 @@ ChannelRaw::ChannelRaw(SoundMixer *mixer, PlayingSoundHandle *handle, void *soun : Channel(mixer, handle) { _id = id; _ptr = (byte *)sound; - _flags = flags; _volume = volume; _pan = pan; @@ -535,10 +533,7 @@ ChannelRaw::ChannelRaw(SoundMixer *mixer, PlayingSoundHandle *handle, void *soun } ChannelRaw::~ChannelRaw() { - if (_flags & SoundMixer::FLAG_AUTOFREE) - free(_ptr); - else if (_flags & SoundMixer::FLAG_AUTODELETE) - delete _ptr; + free(_ptr); } ChannelStream::ChannelStream(SoundMixer *mixer, PlayingSoundHandle *handle, diff --git a/sound/mixer.h b/sound/mixer.h index 12b51b705c..310703445d 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -55,8 +55,7 @@ public: FLAG_16BITS = 1 << 2, // sound is 16 bits wide (default: 8bit) FLAG_AUTOFREE = 1 << 3, // sound buffer is freed automagically at the end of playing FLAG_REVERSE_STEREO = 1 << 4, // reverse the left and right stereo channel - FLAG_LOOP = 1 << 5, // loop the audio - FLAG_AUTODELETE = 1 << 6 // same as AUTOFREE, but uses delete instead of free() + FLAG_LOOP = 1 << 5 // loop the audio }; |