made all functions to _tilde

svn path=/trunk/externals/iemlib/; revision=6233

5 files changed, 61 insertions, 61 deletions

diff --git a/src/iemlib2/LFO_noise~.c b/src/iemlib2/LFO_noise~.c
index 95316a2..a1f3c83 100644
--- a/src/iemlib2/LFO_noise~.c
+++ b/src/iemlib2/LFO_noise~.c
@@ -27,15 +27,15 @@ typedef struct _LFO_noise_tilde
   t_float      x_phase;
 } t_LFO_noise_tilde;
 
-static int LFO_noise_makeseed(void)
+static int LFO_noise_tilde_makeseed(void)
 {
-  static unsigned int LFO_noise_nextseed = 1489853723;
+  static unsigned int LFO_noise_tilde_nextseed = 1489853723;
   
-  LFO_noise_nextseed = LFO_noise_nextseed * 435898247 + 938284287;
-  return(LFO_noise_nextseed & 0x7fffffff);
+  LFO_noise_tilde_nextseed = LFO_noise_tilde_nextseed * 435898247 + 938284287;
+  return(LFO_noise_tilde_nextseed & 0x7fffffff);
 }
 
-static float LFO_noise_new_rand(t_LFO_noise_tilde *x)
+static float LFO_noise_tilde_new_rand(t_LFO_noise_tilde *x)
 {
   unsigned int state = x->x_state;
   double new_val, range = x->x_range;
@@ -48,27 +48,27 @@ static float LFO_noise_new_rand(t_LFO_noise_tilde *x)
   return(new_val*(1.0/32767.0));
 }
 
-static void *LFO_noise_new(t_float freq)
+static void *LFO_noise_tilde_new(t_float freq)
 {
   t_LFO_noise_tilde *x = (t_LFO_noise_tilde *)pd_new(LFO_noise_tilde_class);
   
   x->x_range = 65535.0;
   x->x_rcp_range =  (double)x->x_range * (1.0/4294967296.0);
-  x->x_state = LFO_noise_makeseed();
+  x->x_state = LFO_noise_tilde_makeseed();
   x->x_fact = 2.0f / 44100.0f;
   x->x_incr = freq * x->x_fact;
   if(x->x_incr < 0.0f)
     x->x_incr = 0.0f;
   else if(x->x_incr > 0.1f)
     x->x_incr = 0.1f;
-  x->x_y1 = LFO_noise_new_rand(x);
-  x->x_y2 = LFO_noise_new_rand(x);
+  x->x_y1 = LFO_noise_tilde_new_rand(x);
+  x->x_y2 = LFO_noise_tilde_new_rand(x);
   x->x_phase = 0.0f;
   outlet_new(&x->x_obj, gensym("signal"));
   return (x);
 }
 
-static t_int *LFO_noise_perform(t_int *w)
+static t_int *LFO_noise_tilde_perform(t_int *w)
 {
   t_float *out = (t_float *)(w[1]);
   t_LFO_noise_tilde *x = (t_LFO_noise_tilde *)(w[2]);
@@ -83,7 +83,7 @@ static t_int *LFO_noise_perform(t_int *w)
     if(phase > 1.0f)
     {
       x_y1 = x_y2;
-      x_y2 = LFO_noise_new_rand(x);
+      x_y2 = LFO_noise_tilde_new_rand(x);
       phase -= 1.0;
     }
     *out++ = (x_y2 - x_y1) * phase + x_y1;
@@ -95,7 +95,7 @@ static t_int *LFO_noise_perform(t_int *w)
   return (w+4);
 }
 
-static void LFO_noise_float(t_LFO_noise_tilde *x, t_floatarg freq)
+static void LFO_noise_tilde_float(t_LFO_noise_tilde *x, t_floatarg freq)
 {
   x->x_incr = freq * x->x_fact;
   if(x->x_incr < 0.0f)
@@ -104,19 +104,19 @@ static void LFO_noise_float(t_LFO_noise_tilde *x, t_floatarg freq)
     x->x_incr = 0.1f;
 }
 
-static void LFO_noise_dsp(t_LFO_noise_tilde *x, t_signal **sp)
+static void LFO_noise_tilde_dsp(t_LFO_noise_tilde *x, t_signal **sp)
 {
   x->x_fact = 2.0f / sp[0]->s_sr;
-  dsp_add(LFO_noise_perform, 3, sp[0]->s_vec, x, sp[0]->s_n);
+  dsp_add(LFO_noise_tilde_perform, 3, sp[0]->s_vec, x, sp[0]->s_n);
 }
 
 void LFO_noise_tilde_setup(void)
 {
   LFO_noise_tilde_class = class_new(gensym("LFO_noise~"),
-    (t_newmethod)LFO_noise_new, 0,
+    (t_newmethod)LFO_noise_tilde_new, 0,
     sizeof(t_LFO_noise_tilde), 0, A_DEFFLOAT, 0);
-  class_addmethod(LFO_noise_tilde_class, (t_method)LFO_noise_dsp,
+  class_addmethod(LFO_noise_tilde_class, (t_method)LFO_noise_tilde_dsp,
     gensym("dsp"), 0);
-  class_addfloat(LFO_noise_tilde_class, (t_method)LFO_noise_float);
+  class_addfloat(LFO_noise_tilde_class, (t_method)LFO_noise_tilde_float);
   class_sethelpsymbol(LFO_noise_tilde_class, gensym("iemhelp/help-LFO_noise~"));
 }
diff --git a/src/iemlib2/fade~.c b/src/iemlib2/fade~.c
index 2cae70d..3a2c91b 100644
--- a/src/iemlib2/fade~.c
+++ b/src/iemlib2/fade~.c
@@ -21,14 +21,14 @@ t_float *iem_fade_tilde_table_hann=(t_float *)0L;
 
 static t_class *fade_tilde_class;
 
-typedef struct _fade
+typedef struct _fade_tilde
 {
   t_object x_obj;
   t_float *x_table;
   t_float x_f;
 } t_fade_tilde;
 
-static void fade_set(t_fade_tilde *x, t_symbol *s)
+static void fade_tilde_set(t_fade_tilde *x, t_symbol *s)
 {
   if(s == gensym("_lin"))
     x->x_table = iem_fade_tilde_table_lin;
@@ -44,17 +44,17 @@ static void fade_set(t_fade_tilde *x, t_symbol *s)
     x->x_table = iem_fade_tilde_table_hann;
 }
 
-static void *fade_new(t_symbol *s)
+static void *fade_tilde_new(t_symbol *s)
 {
   t_fade_tilde *x = (t_fade_tilde *)pd_new(fade_tilde_class);
   outlet_new(&x->x_obj, gensym("signal"));
   x->x_f = 0;
   x->x_table = iem_fade_tilde_table_lin;
-  fade_set(x, s);
+  fade_tilde_set(x, s);
   return (x);
 }
 
-static t_int *fade_perform(t_int *w)
+static t_int *fade_tilde_perform(t_int *w)
 {
   t_float *in = (t_float *)(w[1]);
   t_float *out = (t_float *)(w[2]);
@@ -105,12 +105,12 @@ static t_int *fade_perform(t_int *w)
   return (w+5);
 }
 
-static void fade_dsp(t_fade_tilde *x, t_signal **sp)
+static void fade_tilde_dsp(t_fade_tilde *x, t_signal **sp)
 {
-  dsp_add(fade_perform, 4, sp[0]->s_vec, sp[1]->s_vec, x, sp[0]->s_n);
+  dsp_add(fade_tilde_perform, 4, sp[0]->s_vec, sp[1]->s_vec, x, sp[0]->s_n);
 }
 
-static void fade_maketable(void)
+static void fade_tilde_maketable(void)
 {
   int i;
   t_float *fp, phase, fff,phsinc = 0.5*3.141592653 / ((t_float)COSTABSIZE*0.99999);
@@ -166,11 +166,11 @@ static void fade_maketable(void)
 
 void fade_tilde_setup(void)
 {
-  fade_tilde_class = class_new(gensym("fade~"), (t_newmethod)fade_new, 0,
+  fade_tilde_class = class_new(gensym("fade~"), (t_newmethod)fade_tilde_new, 0,
     sizeof(t_fade_tilde), 0, A_DEFSYM, 0);
   CLASS_MAINSIGNALIN(fade_tilde_class, t_fade_tilde, x_f);
-  class_addmethod(fade_tilde_class, (t_method)fade_dsp, gensym("dsp"), 0);
-  class_addmethod(fade_tilde_class, (t_method)fade_set, gensym("set"), A_DEFSYM, 0);
+  class_addmethod(fade_tilde_class, (t_method)fade_tilde_dsp, gensym("dsp"), 0);
+  class_addmethod(fade_tilde_class, (t_method)fade_tilde_set, gensym("set"), A_DEFSYM, 0);
   class_sethelpsymbol(fade_tilde_class, gensym("iemhelp/help-fade~"));
-  fade_maketable();
+  fade_tilde_maketable();
 }
diff --git a/src/iemlib2/iem_blocksize~.c b/src/iemlib2/iem_blocksize~.c
index d10110d..8865fcd 100644
--- a/src/iemlib2/iem_blocksize~.c
+++ b/src/iemlib2/iem_blocksize~.c
@@ -12,7 +12,7 @@ iemlib2 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2005
 
 static t_class *iem_blocksize_tilde_class;
 
-typedef struct _iem_blocksize
+typedef struct _iem_blocksize_tilde
 {
   t_object  x_obj;
   t_float   x_blocksize;
@@ -20,27 +20,27 @@ typedef struct _iem_blocksize
   t_float   x_f;
 } t_iem_blocksize_tilde;
 
-static void iem_blocksize_out(t_iem_blocksize_tilde *x)
+static void iem_blocksize_tilde_out(t_iem_blocksize_tilde *x)
 {
   outlet_float(x->x_obj.ob_outlet, x->x_blocksize);
 }
 
-static void iem_blocksize_free(t_iem_blocksize_tilde *x)
+static void iem_blocksize_tilde_free(t_iem_blocksize_tilde *x)
 {
   clock_free(x->x_clock);
 }
 
-static void *iem_blocksize_new(t_symbol *s)
+static void *iem_blocksize_tilde_new(t_symbol *s)
 {
   t_iem_blocksize_tilde *x = (t_iem_blocksize_tilde *)pd_new(iem_blocksize_tilde_class);
-  x->x_clock = clock_new(x, (t_method)iem_blocksize_out);
+  x->x_clock = clock_new(x, (t_method)iem_blocksize_tilde_out);
   outlet_new(&x->x_obj, &s_float);
   x->x_blocksize = 64.0f;
   x->x_f = 0.0f;
   return (x);
 }
 
-static void iem_blocksize_dsp(t_iem_blocksize_tilde *x, t_signal **sp)
+static void iem_blocksize_tilde_dsp(t_iem_blocksize_tilde *x, t_signal **sp)
 {
   x->x_blocksize = (t_float)(sp[0]->s_n);
   clock_delay(x->x_clock, 0.0f);
@@ -48,8 +48,8 @@ static void iem_blocksize_dsp(t_iem_blocksize_tilde *x, t_signal **sp)
 
 void iem_blocksize_tilde_setup(void)
 {
-  iem_blocksize_tilde_class = class_new(gensym("iem_blocksize~"), (t_newmethod)iem_blocksize_new,
-    (t_method)iem_blocksize_free, sizeof(t_iem_blocksize_tilde), 0, 0);
+  iem_blocksize_tilde_class = class_new(gensym("iem_blocksize~"), (t_newmethod)iem_blocksize_tilde_new,
+    (t_method)iem_blocksize_tilde_free, sizeof(t_iem_blocksize_tilde), 0, 0);
   CLASS_MAINSIGNALIN(iem_blocksize_tilde_class, t_iem_blocksize_tilde, x_f);
-  class_addmethod(iem_blocksize_tilde_class, (t_method)iem_blocksize_dsp, gensym("dsp"), 0);
+  class_addmethod(iem_blocksize_tilde_class, (t_method)iem_blocksize_tilde_dsp, gensym("dsp"), 0);
 }
diff --git a/src/iemlib2/iem_samplerate~.c b/src/iemlib2/iem_samplerate~.c
index 184a66d..91833d7 100644
--- a/src/iemlib2/iem_samplerate~.c
+++ b/src/iemlib2/iem_samplerate~.c
@@ -12,7 +12,7 @@ iemlib2 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2005
 
 static t_class *iem_samplerate_tilde_class;
 
-typedef struct _iem_samplerate
+typedef struct _iem_samplerate_tilde
 {
   t_object  x_obj;
   t_float   x_samplerate;
@@ -20,27 +20,27 @@ typedef struct _iem_samplerate
   t_float   x_f;
 } t_iem_samplerate_tilde;
 
-static void iem_samplerate_out(t_iem_samplerate_tilde *x)
+static void iem_samplerate_tilde_out(t_iem_samplerate_tilde *x)
 {
   outlet_float(x->x_obj.ob_outlet, x->x_samplerate);
 }
 
-static void iem_samplerate_free(t_iem_samplerate_tilde *x)
+static void iem_samplerate_tilde_free(t_iem_samplerate_tilde *x)
 {
   clock_free(x->x_clock);
 }
 
-static void *iem_samplerate_new(t_symbol *s)
+static void *iem_samplerate_tilde_new(t_symbol *s)
 {
   t_iem_samplerate_tilde *x = (t_iem_samplerate_tilde *)pd_new(iem_samplerate_tilde_class);
-  x->x_clock = clock_new(x, (t_method)iem_samplerate_out);
+  x->x_clock = clock_new(x, (t_method)iem_samplerate_tilde_out);
   outlet_new(&x->x_obj, &s_float);
   x->x_samplerate = 44100.0f;
   x->x_f = 0.0f;
   return (x);
 }
 
-static void iem_samplerate_dsp(t_iem_samplerate_tilde *x, t_signal **sp)
+static void iem_samplerate_tilde_dsp(t_iem_samplerate_tilde *x, t_signal **sp)
 {
   x->x_samplerate = (t_float)(sp[0]->s_sr);
   clock_delay(x->x_clock, 0.0f);
@@ -48,8 +48,8 @@ static void iem_samplerate_dsp(t_iem_samplerate_tilde *x, t_signal **sp)
 
 void iem_samplerate_tilde_setup(void)
 {
-  iem_samplerate_tilde_class = class_new(gensym("iem_samplerate~"), (t_newmethod)iem_samplerate_new,
-    (t_method)iem_samplerate_free, sizeof(t_iem_samplerate_tilde), 0, 0);
+  iem_samplerate_tilde_class = class_new(gensym("iem_samplerate~"), (t_newmethod)iem_samplerate_tilde_new,
+    (t_method)iem_samplerate_tilde_free, sizeof(t_iem_samplerate_tilde), 0, 0);
   CLASS_MAINSIGNALIN(iem_samplerate_tilde_class, t_iem_samplerate_tilde, x_f);
-  class_addmethod(iem_samplerate_tilde_class, (t_method)iem_samplerate_dsp, gensym("dsp"), 0);
+  class_addmethod(iem_samplerate_tilde_class, (t_method)iem_samplerate_tilde_dsp, gensym("dsp"), 0);
 }
diff --git a/src/iemlib2/m2f~.c b/src/iemlib2/m2f~.c
index 7139d87..8774fe4 100644
--- a/src/iemlib2/m2f~.c
+++ b/src/iemlib2/m2f~.c
@@ -11,7 +11,7 @@ iemlib2 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2005
 /* ----------- m2f~ ----------- */
 /* --------- obsolete --------- */
 
-#define M2FTABSIZE 2048
+#define M2FTILDETABSIZE 2048
 
 t_float *iem_m2f_tilde_table=(t_float *)0L;
 
@@ -23,7 +23,7 @@ typedef struct _m2f
   t_float x_msi;
 } t_m2f_tilde;
 
-static void *m2f_new(void)
+static void *m2f_tilde_new(void)
 {
   t_m2f_tilde *x = (t_m2f_tilde *)pd_new(m2f_tilde_class);
   outlet_new(&x->x_obj, gensym("signal"));
@@ -31,7 +31,7 @@ static void *m2f_new(void)
   return (x);
 }
 
-static t_int *m2f_perform(t_int *w)
+static t_int *m2f_tilde_perform(t_int *w)
 {
   t_float *in = (t_float *)(w[1]);
   t_float *out = (t_float *)(w[2]);
@@ -51,7 +51,7 @@ static t_int *m2f_perform(t_int *w)
     iinn = (*in++)*10.0+670.0;
     dphase = (double)iinn + UNITBIT32;
     tf.tf_d = dphase;
-    addr = tab + (tf.tf_i[HIOFFSET] & (M2FTABSIZE-1));
+    addr = tab + (tf.tf_i[HIOFFSET] & (M2FTILDETABSIZE-1));
     tf.tf_i[HIOFFSET] = normhipart;
     frac = tf.tf_d - UNITBIT32;
     f1 = addr[0];
@@ -63,7 +63,7 @@ static t_int *m2f_perform(t_int *w)
   iinn = (*in++)*10.0+670.0;
   dphase = (double)iinn + UNITBIT32;
   tf.tf_d = dphase;
-  addr = tab + (tf.tf_i[HIOFFSET] & (M2FTABSIZE-1));
+  addr = tab + (tf.tf_i[HIOFFSET] & (M2FTILDETABSIZE-1));
   tf.tf_i[HIOFFSET] = normhipart;
   while (--n)
   {
@@ -73,7 +73,7 @@ static t_int *m2f_perform(t_int *w)
     tf.tf_d = dphase;
     f1 = addr[0];
     f2 = addr[1];
-    addr = tab + (tf.tf_i[HIOFFSET] & (M2FTABSIZE-1));
+    addr = tab + (tf.tf_i[HIOFFSET] & (M2FTILDETABSIZE-1));
     *out++ = f1 + frac * (f2 - f1);
     tf.tf_i[HIOFFSET] = normhipart;
   }
@@ -85,12 +85,12 @@ static t_int *m2f_perform(t_int *w)
   return (w+5);
 }
 
-static void m2f_dsp(t_m2f_tilde *x, t_signal **sp)
+static void m2f_tilde_dsp(t_m2f_tilde *x, t_signal **sp)
 {
-  dsp_add(m2f_perform, 4, sp[0]->s_vec, sp[1]->s_vec, x, sp[0]->s_n);
+  dsp_add(m2f_tilde_perform, 4, sp[0]->s_vec, sp[1]->s_vec, x, sp[0]->s_n);
 }
 
-static void m2f_maketable(void)
+static void m2f_tilde_maketable(void)
 {
   union tabfudge tf;
   
@@ -99,8 +99,8 @@ static void m2f_maketable(void)
     int i;
     t_float *fp, midi, refexp=440.0*exp(-5.75*log(2.0));
     
-    iem_m2f_tilde_table = (t_float *)getbytes(sizeof(t_float) * (M2FTABSIZE+1));
-    for(i=0, fp=iem_m2f_tilde_table, midi=-67.0; i<=M2FTABSIZE; i++, fp++, midi+=0.1)
+    iem_m2f_tilde_table = (t_float *)getbytes(sizeof(t_float) * (M2FTILDETABSIZE+1));
+    for(i=0, fp=iem_m2f_tilde_table, midi=-67.0; i<=M2FTILDETABSIZE; i++, fp++, midi+=0.1)
       *fp = refexp * exp(0.057762265047 * midi);
   }
   tf.tf_d = UNITBIT32 + 0.5;
@@ -110,10 +110,10 @@ static void m2f_maketable(void)
 
 void m2f_tilde_setup(void)
 {
-  m2f_tilde_class = class_new(gensym("m2f~"), (t_newmethod)m2f_new, 0,
+  m2f_tilde_class = class_new(gensym("m2f~"), (t_newmethod)m2f_tilde_new, 0,
     sizeof(t_m2f_tilde), 0, 0);
   CLASS_MAINSIGNALIN(m2f_tilde_class, t_m2f_tilde, x_msi);
-  class_addmethod(m2f_tilde_class, (t_method)m2f_dsp, gensym("dsp"), 0);
-  m2f_maketable();
+  class_addmethod(m2f_tilde_class, (t_method)m2f_tilde_dsp, gensym("dsp"), 0);
+  m2f_tilde_maketable();
   class_sethelpsymbol(m2f_tilde_class, gensym("iemhelp/help-m2f~"));
 }