From 33dd6d603830640766aa1a5fe70137c856e2c145 Mon Sep 17 00:00:00 2001
From: musil <tmusil@users.sourceforge.net>
Date: Thu, 6 Sep 2012 15:54:46 +0000
Subject: other variable names, t_float to t_sample change, array access 64 bit

svn path=/trunk/externals/iemlib/; revision=16193
---
 iemlib1/src/rvu~.c | 75 +++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

(limited to 'iemlib1/src/rvu~.c')

diff --git a/iemlib1/src/rvu~.c b/iemlib1/src/rvu~.c
index 059a064..e93e420 100644
--- a/iemlib1/src/rvu~.c
+++ b/iemlib1/src/rvu~.c
@@ -30,9 +30,9 @@ static void rvu_tilde_tick_metro(t_rvu_tilde *x);
 
 static void rvu_tilde_reset(t_rvu_tilde *x)
 {
-  outlet_float(x->x_obj.ob_outlet, -99.9f);
-  x->x_sum_rms = 0.0f;
-  x->x_old_rms = 0.0f;
+  outlet_float(x->x_obj.ob_outlet, -99.9);
+  x->x_sum_rms = 0.0;
+  x->x_old_rms = 0.0;
   clock_delay(x->x_clock_metro, x->x_metro_time);
 }
 
@@ -50,7 +50,7 @@ static void rvu_tilde_start(t_rvu_tilde *x)
 
 static void rvu_tilde_float(t_rvu_tilde *x, t_floatarg f)
 {
-  if(f == 0.0f)
+  if(f == 0.0)
   {
     clock_unset(x->x_clock_metro);
     x->x_started = 0;
@@ -64,24 +64,24 @@ static void rvu_tilde_float(t_rvu_tilde *x, t_floatarg f)
 
 static void rvu_tilde_t_release(t_rvu_tilde *x, t_floatarg release_time)
 {
-  if(release_time <= 5.0f)
-    release_time = 5.0f;
+  if(release_time <= 5.0)
+    release_time = 5.0;
   x->x_release_time = release_time;
-  x->x_c1 = exp(-2.0f*x->x_metro_time/x->x_release_time);
+  x->x_c1 = exp(-2.0*x->x_metro_time/x->x_release_time);
 }
 
 static void rvu_tilde_t_metro(t_rvu_tilde *x, t_floatarg metro_time)
 {
-  if(metro_time <= 5.0f)
-    metro_time = 5.0f;
+  if(metro_time <= 5.0)
+    metro_time = 5.0;
   x->x_metro_time = metro_time;
-  x->x_c1 = exp(-2.0f*x->x_metro_time/x->x_release_time);
-  x->x_rcp = 1.0f/(x->x_sr*x->x_metro_time);
+  x->x_c1 = exp(-2.0*x->x_metro_time/x->x_release_time);
+  x->x_rcp = 1.0/(x->x_sr*x->x_metro_time);
 }
 
 static t_int *rvu_tilde_perform(t_int *w)
 {
-  t_float *in = (t_float *)(w[1]);
+  t_sample *in = (t_sample *)(w[1]);
   t_rvu_tilde *x = (t_rvu_tilde *)(w[2]);
   int n = (int)(w[3]);
   t_float sum=x->x_sum_rms;
@@ -91,7 +91,7 @@ static t_int *rvu_tilde_perform(t_int *w)
   {
     for(i=0; i<n; i++)
     {
-      sum += in[i]*in[i];
+      sum += (t_float)(in[i]*in[i]);
     }
     x->x_sum_rms = sum;
   }
@@ -101,7 +101,7 @@ static t_int *rvu_tilde_perform(t_int *w)
 static void rvu_tilde_dsp(t_rvu_tilde *x, t_signal **sp)
 {
   x->x_sr = 0.001*(t_float)sp[0]->s_sr;
-  x->x_rcp = 1.0f/(x->x_sr*x->x_metro_time);
+  x->x_rcp = 1.0/(x->x_sr*x->x_metro_time);
   dsp_add(rvu_tilde_perform, 3, sp[0]->s_vec, x, sp[0]->s_n);
   clock_delay(x->x_clock_metro, x->x_metro_time);
 }
@@ -110,21 +110,21 @@ static void rvu_tilde_tick_metro(t_rvu_tilde *x)
 {
   t_float dbr, cur_rms, c1=x->x_c1;
   
-  cur_rms = (1.0f - c1)*x->x_sum_rms*x->x_rcp + c1*x->x_old_rms;
+  cur_rms = (1.0 - c1)*x->x_sum_rms*x->x_rcp + c1*x->x_old_rms;
   /* NAN protect */
   if(IEM_DENORMAL(cur_rms))
-    cur_rms = 0.0f;
+    cur_rms = 0.0;
   
-  if(cur_rms <= 0.0000000001f)
-    dbr = -99.9f;
-  else if(cur_rms > 1000000.0f)
+  if(cur_rms <= 0.0000000001)
+    dbr = -99.9;
+  else if(cur_rms > 1000000.0)
   {
-    dbr = 60.0f;
-    x->x_old_rms = 1000000.0f;
+    dbr = 60.0;
+    x->x_old_rms = 1000000.0;
   }
   else
-    dbr = 4.3429448195f*log(cur_rms);
-  x->x_sum_rms = 0.0f;
+    dbr = 4.3429448195*log(cur_rms);
+  x->x_sum_rms = 0.0;
   x->x_old_rms = cur_rms;
   outlet_float(x->x_obj.ob_outlet, dbr);
   clock_delay(x->x_clock_metro, x->x_metro_time);
@@ -139,25 +139,25 @@ static void *rvu_tilde_new(t_floatarg metro_time, t_floatarg release_time)
 {
   t_rvu_tilde *x=(t_rvu_tilde *)pd_new(rvu_tilde_class);
   
-  if(metro_time <= 0.0f)
-    metro_time = 300.0f;
-  if(metro_time <= 5.0f)
-    metro_time = 5.0f;
-  if(release_time <= 0.0f)
-    release_time = 300.0f;
-  if(release_time <= 5.0f)
-    release_time = 5.0f;
+  if(metro_time <= 0.0)
+    metro_time = 300.0;
+  if(metro_time <= 5.0)
+    metro_time = 5.0;
+  if(release_time <= 0.0)
+    release_time = 300.0;
+  if(release_time <= 5.0)
+    release_time = 5.0;
   x->x_metro_time = metro_time;
   x->x_release_time = release_time;
-  x->x_c1 = exp(-2.0f*x->x_metro_time/x->x_release_time);
-  x->x_sum_rms = 0.0f;
-  x->x_old_rms = 0.0f;
-  x->x_sr = 44.1f;
-  x->x_rcp = 1.0f/(x->x_sr*x->x_metro_time);
+  x->x_c1 = exp(-2.0*x->x_metro_time/x->x_release_time);
+  x->x_sum_rms = 0.0;
+  x->x_old_rms = 0.0;
+  x->x_sr = 44.1;
+  x->x_rcp = 1.0/(x->x_sr*x->x_metro_time);
   x->x_clock_metro = clock_new(x, (t_method)rvu_tilde_tick_metro);
   x->x_started = 1;
   outlet_new(&x->x_obj, &s_float);
-  x->x_float_sig_in = 0.0f;
+  x->x_float_sig_in = 0.0;
   return(x);
 }
 
@@ -174,5 +174,4 @@ void rvu_tilde_setup(void)
   class_addmethod(rvu_tilde_class, (t_method)rvu_tilde_stop, gensym("stop"), 0);
   class_addmethod(rvu_tilde_class, (t_method)rvu_tilde_t_release, gensym("t_release"), A_FLOAT, 0);
   class_addmethod(rvu_tilde_class, (t_method)rvu_tilde_t_metro, gensym("t_metro"), A_FLOAT, 0);
-//  class_sethelpsymbol(rvu_tilde_class, gensym("iemhelp/help-rvu~"));
 }
-- 
cgit v1.2.1