From 1cb9ea5c46bb3e02a248a27552ed3066a7eea1fc Mon Sep 17 00:00:00 2001
From: tron <tron@openttd.org>
Date: Sat, 12 Mar 2005 09:46:07 +0000
Subject: [PATCH] (svn r2002) Rename MxActivate to MxActivateChannel, which is
 more appropriate

---
 mixer.c | 2 +-
 mixer.h | 2 +-
 sound.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mixer.c b/mixer.c
index e88b9533be..706eaae5db 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 86ace050d9..0ab04d287a 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 d0600445ae..4d87d8fe60 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);
 		}
 	}
 }