diff --git a/src/mixer.cpp b/src/mixer.cpp --- a/src/mixer.cpp +++ b/src/mixer.cpp @@ -21,8 +21,6 @@ struct MixerChannel { /* Mixing volume */ int volume_left; int volume_right; - - uint flags; }; static MixerChannel _channels[8]; @@ -80,7 +78,7 @@ static void mix_int8_to_int16(MixerChann static void MxCloseChannel(MixerChannel *mc) { - if (mc->flags & MX_AUTOFREE) free(mc->memory); + free(mc->memory); mc->active = false; mc->memory = NULL; } @@ -112,10 +110,9 @@ MixerChannel *MxAllocateChannel() return NULL; } -void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, size_t size, uint rate, uint flags) +void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, size_t size, uint rate) { mc->memory = mem; - mc->flags = flags; mc->frac_pos = 0; mc->pos = 0; diff --git a/src/mixer.h b/src/mixer.h --- a/src/mixer.h +++ b/src/mixer.h @@ -7,18 +7,11 @@ struct MixerChannel; -enum { - MX_AUTOFREE = 1, -// MX_8BIT = 2, -// MX_STEREO = 4, -// MX_UNSIGNED = 8, -}; - bool MxInitialize(uint rate); void MxMixSamples(void *buffer, uint samples); MixerChannel *MxAllocateChannel(); -void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, size_t size, uint rate, uint flags); +void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, size_t size, uint rate); void MxSetChannelVolume(MixerChannel *mc, uint left, uint right); void MxActivateChannel(MixerChannel*); diff --git a/src/sound.cpp b/src/sound.cpp --- a/src/sound.cpp +++ b/src/sound.cpp @@ -111,7 +111,7 @@ static bool SetBankSource(MixerChannel * assert(sound->bits_per_sample == 8 && sound->channels == 1 && sound->file_size != 0 && sound->rate != 0); - MxSetChannelRawSrc(mc, mem, sound->file_size, sound->rate, MX_AUTOFREE); + MxSetChannelRawSrc(mc, mem, sound->file_size, sound->rate); return true; }