summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-03-12 09:46:07 +0000
committertron <tron@openttd.org>2005-03-12 09:46:07 +0000
commit1cb9ea5c46bb3e02a248a27552ed3066a7eea1fc (patch)
tree872811a2edd88a463d671ad32b9de174dee2c9d6
parent39305c1a7c88d219ba3943aad59ae8856731ad52 (diff)
downloadopenttd-1cb9ea5c46bb3e02a248a27552ed3066a7eea1fc.tar.xz
(svn r2002) Rename MxActivate to MxActivateChannel, which is more appropriate
-rw-r--r--mixer.c2
-rw-r--r--mixer.h2
-rw-r--r--sound.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/mixer.c b/mixer.c
index e88b9533b..706eaae5d 100644
--- a/mixer.c
+++ b/mixer.c
@@ -139,7 +139,7 @@ void MxSetChannelVolume(MixerChannel *mc, uint left, uint right)
}
-void MxActivate(MixerChannel* mc)
+void MxActivateChannel(MixerChannel* mc)
{
mc->active = true;
}
diff --git a/mixer.h b/mixer.h
index 86ace050d..0ab04d287 100644
--- a/mixer.h
+++ b/mixer.h
@@ -19,6 +19,6 @@ void MxMixSamples(Mixer *mx, void *buffer, uint samples);
MixerChannel *MxAllocateChannel(Mixer *mx);
void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, uint size, uint rate, uint flags);
void MxSetChannelVolume(MixerChannel *mc, uint left, uint right);
-void MxActivate(MixerChannel*);
+void MxActivateChannel(MixerChannel*);
#endif
diff --git a/sound.c b/sound.c
index d0600445a..4d87d8fe6 100644
--- a/sound.c
+++ b/sound.c
@@ -124,7 +124,7 @@ static void StartSound(uint sound, uint panning, uint volume)
return;
if (SetBankSource(mc, sound)) {
MxSetChannelVolume(mc, volume << 8, volume << 8);
- MxActivate(mc);
+ MxActivateChannel(mc);
}
}
}