--- a/mixer.c	Sat Mar 12 09:40:29 2005 +0000
+++ b/mixer.c	Sat Mar 12 09:46:07 2005 +0000
@@ -139,7 +139,7 @@
 }
 
 
-void MxActivate(MixerChannel* mc)
+void MxActivateChannel(MixerChannel* mc)
 {
 	mc->active = true;
 }

--- a/mixer.h	Sat Mar 12 09:40:29 2005 +0000
+++ b/mixer.h	Sat Mar 12 09:46:07 2005 +0000
@@ -19,6 +19,6 @@
 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

--- a/sound.c	Sat Mar 12 09:40:29 2005 +0000
+++ b/sound.c	Sat Mar 12 09:46:07 2005 +0000
@@ -124,7 +124,7 @@
 			return;
 		if (SetBankSource(mc, sound)) {
 			MxSetChannelVolume(mc, volume << 8, volume << 8);
-			MxActivate(mc);
+			MxActivateChannel(mc);
 		}
 	}
 }