summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2009-07-13 10:17:22 +0000
committerpeter1138 <peter1138@openttd.org>2009-07-13 10:17:22 +0000
commita67f861d5505106ec8b919222da762ab7d185af6 (patch)
tree872efbced77240a2052bf1942626bad71d4f6151
parent2547ba9517a2137f58ea2227011f16605656813e (diff)
downloadopenttd-a67f861d5505106ec8b919222da762ab7d185af6.tar.xz
(svn r16805) -Codechange: Remove 'unused' mixer channel flags, which always had the same value.
-rw-r--r--src/mixer.cpp7
-rw-r--r--src/mixer.h9
-rw-r--r--src/sound.cpp2
3 files changed, 4 insertions, 14 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;
diff --git a/src/mixer.h b/src/mixer.h
index 562954d5f..cdd6f65b4 100644
--- 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
index 104ff9e10..0e4b705fb 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -111,7 +111,7 @@ static bool SetBankSource(MixerChannel *mc, const SoundEntry *sound)
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;
}