diff options
author | peter1138 <peter1138@openttd.org> | 2009-07-13 10:17:22 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2009-07-13 10:17:22 +0000 |
commit | a67f861d5505106ec8b919222da762ab7d185af6 (patch) | |
tree | 872efbced77240a2052bf1942626bad71d4f6151 /src/mixer.cpp | |
parent | 2547ba9517a2137f58ea2227011f16605656813e (diff) | |
download | openttd-a67f861d5505106ec8b919222da762ab7d185af6.tar.xz |
(svn r16805) -Codechange: Remove 'unused' mixer channel flags, which always had the same value.
Diffstat (limited to 'src/mixer.cpp')
-rw-r--r-- | src/mixer.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mixer.cpp b/src/mixer.cpp index c6c5776da..cf8b30c9a 100644 --- 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(MixerChannel *sc, int16 *buffer, uint samples) 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; |