diff options
Diffstat (limited to 'iemlib1/src/peakenv_hold~.c')
| -rw-r--r-- | iemlib1/src/peakenv_hold~.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/iemlib1/src/peakenv_hold~.c b/iemlib1/src/peakenv_hold~.c index 9019527..715bed9 100644 --- a/iemlib1/src/peakenv_hold~.c +++ b/iemlib1/src/peakenv_hold~.c @@ -1,7 +1,7 @@ /* For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. -iemlib1 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2008 */ +iemlib1 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2010 */ #include "m_pd.h" @@ -13,11 +13,11 @@ iemlib1 written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2008 typedef struct _peakenv_hold_tilde { t_object x_obj; - t_float x_sr; - t_float x_old_peak; - t_float x_c1; - t_float x_releasetime; - t_float x_holdtime; + double x_sr; + double x_old_peak; + double x_c1; + double x_releasetime; + double x_holdtime; t_int x_n_hold; t_int x_counter; t_float x_msi; @@ -27,7 +27,7 @@ static t_class *peakenv_hold_tilde_class; static void peakenv_hold_tilde_reset(t_peakenv_hold_tilde *x) { - x->x_old_peak = 0.0f; + x->x_old_peak = 0.0; } static void peakenv_hold_tilde_ft1(t_peakenv_hold_tilde *x, t_float t_hold)/* hold-time in ms */ @@ -36,18 +36,18 @@ static void peakenv_hold_tilde_ft1(t_peakenv_hold_tilde *x, t_float t_hold)/* ho if(t_hold < 0.0f) t_hold = 0.0f; - x->x_holdtime = t_hold; - dhold = (double)x->x_sr*(double)0.001*(double)x->x_holdtime; + x->x_holdtime = (double)t_hold; + dhold = x->x_sr*0.001*x->x_holdtime; if(dhold > 2147483647.0) dhold = 2147483647.0; - x->x_n_hold = (t_int)(dhold + (double)0.5); + x->x_n_hold = (t_int)(dhold + 0.5); } static void peakenv_hold_tilde_ft2(t_peakenv_hold_tilde *x, t_float t_rel)/* release-time in ms */ { if(t_rel < 0.0f) t_rel = 0.0f; - x->x_releasetime = t_rel; + x->x_releasetime = (double)t_rel; x->x_c1 = exp(-1.0/(x->x_sr*0.001*x->x_releasetime)); } @@ -57,15 +57,15 @@ static t_int *peakenv_hold_tilde_perform(t_int *w) t_float *out = (t_float *)(w[2]); t_peakenv_hold_tilde *x = (t_peakenv_hold_tilde *)(w[3]); int n = (int)(w[4]); - t_float peak = x->x_old_peak; - t_float c1 = x->x_c1; - t_float absolute; + double peak = x->x_old_peak; + double c1 = x->x_c1; + double absolute; t_int i, counter; counter = x->x_counter; for(i=0; i<n; i++) { - absolute = fabs(*in++); + absolute = (double)fabs(*in++); if(counter > 0) counter--;// hold peride else @@ -75,11 +75,11 @@ static t_int *peakenv_hold_tilde_perform(t_int *w) peak = absolute; counter = x->x_n_hold;// new hold initialisation } - *out++ = peak; + *out++ = (t_float)peak; } /* NAN protect */ - if(IEM_DENORMAL(peak)) - peak = 0.0f; + //if(IEM_DENORMAL(peak)) + // peak = 0.0f; x->x_old_peak = peak; x->x_counter = counter; return(w+5); @@ -87,7 +87,7 @@ static t_int *peakenv_hold_tilde_perform(t_int *w) static void peakenv_hold_tilde_dsp(t_peakenv_hold_tilde *x, t_signal **sp) { - x->x_sr = (t_float)sp[0]->s_sr; + x->x_sr = (double)sp[0]->s_sr; peakenv_hold_tilde_ft1(x, x->x_holdtime); peakenv_hold_tilde_ft2(x, x->x_releasetime); dsp_add(peakenv_hold_tilde_perform, 4, sp[0]->s_vec, sp[1]->s_vec, x, sp[0]->s_n); @@ -97,10 +97,10 @@ static void *peakenv_hold_tilde_new(t_float t_hold, t_float t_rel) { t_peakenv_hold_tilde *x = (t_peakenv_hold_tilde *)pd_new(peakenv_hold_tilde_class); - x->x_sr = 44100.0f; + x->x_sr = 44100.0; peakenv_hold_tilde_ft1(x, t_hold); peakenv_hold_tilde_ft2(x, t_rel); - x->x_old_peak = 0.0f; + x->x_old_peak = 0.0; x->x_counter = 0; inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("ft1")); inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("ft2")); |