1 files changed, 33 insertions, 34 deletions

diff --git a/src/multiplex~.c b/src/multiplex~.c
index de8f5e3..1d879f2 100644
--- a/src/multiplex~.c
+++ b/src/multiplex~.c
@@ -1,25 +1,24 @@
-/******************************************************
- * zexy - implementation file
+/* 
+ * mux~ : multiplex a specified signal to the output 
  *
- * copyleft (c) IOhannes m zmölnig
+ * (c) 1999-2011 IOhannes m zmölnig, forum::für::umläute, institute of electronic music and acoustics (iem)
  *
- *   1999:forum::für::umläute:2004
- *
- *   institute of electronic music and acoustics (iem)
- *
- ******************************************************
- *
- * license: GNU General Public License v.2
- *
- ******************************************************/
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "zexy.h"
 
-
-/* ------------------------------------------------------------------------------ */
-
-/* mux~ : multiplex a specified signal to the output */
-
 static t_class *mux_class;
 
 typedef struct _mux {
@@ -31,16 +30,16 @@ typedef struct _mux {
   t_sample **in;
 } t_mux;
 
-static void mux_input(t_mux *x, t_floatarg f)
+static void mux_tilde_input(t_mux *x, t_floatarg f)
 {
   if ((f>=0)&&(f<x->n_in)){
     x->input=f;
   } else
-    error("multiplex: %d is channel out of range (0..%d)", (int)f, x->n_in);
+    error("multiplex~: %d is channel out of range (0..%d)", (int)f, x->n_in);
 
 }
 
-static t_int *mux_perform(t_int *w)
+static t_int *mux_tilde_perform(t_int *w)
 {
   t_mux *x = (t_mux *)(w[1]);
   t_sample *out = (t_sample *)(w[2]);
@@ -53,32 +52,32 @@ static t_int *mux_perform(t_int *w)
   return (w+4);
 }
 
-static void mux_dsp(t_mux *x, t_signal **sp)
+static void mux_tilde_dsp(t_mux *x, t_signal **sp)
 {
   int n = 0;
   t_sample **dummy=x->in;
 
   for(n=0;n<x->n_in;n++)*dummy++=sp[n]->s_vec;
 
-  dsp_add(mux_perform, 3, x, sp[n]->s_vec, sp[0]->s_n);
+  dsp_add(mux_tilde_perform, 3, x, sp[n]->s_vec, sp[0]->s_n);
 }
 
-static void mux_helper(void)
+static void mux_tilde_helper(void)
 {
-  post("\n%c mux~\t:: multiplex a one of various signals to one outlet", HEARTSYMBOL);
+  post("\n%c multiplex~\t:: multiplex a one of various signals to one outlet", HEARTSYMBOL);
   post("<#out>\t : the inlet-number (counting from 0) witch is routed to the outlet"
        "'help'\t : view this");
   post("creation : \"mux~ [arg1 [arg2...]]\"\t: the number of arguments equals the number of inlets\n");
 }
 
-static void mux_free(t_mux *x)
+static void mux_tilde_free(t_mux *x)
 {
   freebytes(x->in, x->n_in * sizeof(t_sample *));
 }
 
-static void *mux_new(t_symbol *s, int argc, t_atom *argv)
+static void *mux_tilde_new(t_symbol *s, int argc, t_atom *argv)
 {
-  t_mux *x = (t_mux *)pd_new(mux_class);
+  t_mux *x = (t_mux *)pd_new(mux_tilde_class);
   int i;
   ZEXY_USEVAR(s);
   ZEXY_USEVAR(argv);
@@ -101,17 +100,17 @@ static void *mux_new(t_symbol *s, int argc, t_atom *argv)
 
 void multiplex_tilde_setup(void)
 {
-  mux_class = class_new(gensym("multiplex~"), (t_newmethod)mux_new, (t_method)mux_free, sizeof(t_mux), 0, A_GIMME, 0);
-  class_addcreator((t_newmethod)mux_new, gensym("mux~"), A_GIMME, 0);
+  mux_tilde_class = class_new(gensym("multiplex~"), (t_newmethod)mux_tilde_new, (t_method)mux_tilde_free, sizeof(t_mux), 0, A_GIMME, 0);
+  class_addcreator((t_newmethod)mux_tilde_new, gensym("mux~"), A_GIMME, 0);
 
-  class_addfloat(mux_class, mux_input);
-  class_addmethod(mux_class, (t_method)mux_dsp, gensym("dsp"), 0);
-  class_addmethod(mux_class, nullfn, gensym("signal"), 0);
+  class_addfloat(mux_tilde_class, mux_tilde_input);
+  class_addmethod(mux_tilde_class, (t_method)mux_tilde_dsp, gensym("dsp"), 0);
+  class_addmethod(mux_tilde_class, nullfn, gensym("signal"), 0);
 
-  class_addmethod(mux_class, (t_method)mux_helper, gensym("help"), 0);
+  class_addmethod(mux_tilde_class, (t_method)mux_tilde_helper, gensym("help"), 0);
   zexy_register("multiplex~");
 }
-void mux_tilde_setup(void)
+void mux_tilde_tilde_setup(void)
 {
   multiplex_tilde_setup();
 }