diff options
-rw-r--r-- | iem_t3_lib/src/t3_bpe.c | 8 | ||||
-rw-r--r-- | iem_t3_lib/src/t3_line~.c | 18 | ||||
-rw-r--r-- | iemlib1/src/lp1_t~.c | 44 |
3 files changed, 35 insertions, 35 deletions
diff --git a/iem_t3_lib/src/t3_bpe.c b/iem_t3_lib/src/t3_bpe.c index dbd140a..d68ba43 100644 --- a/iem_t3_lib/src/t3_bpe.c +++ b/iem_t3_lib/src/t3_bpe.c @@ -35,7 +35,7 @@ static void t3_bpe_tick(t_t3_bpe *x) { t_atom *vec = x->x_beg; t_float val; - double dticks, time; + double dticks, dtime; int iticks; if(x->x_curindex >= x->x_curnum) @@ -48,12 +48,12 @@ static void t3_bpe_tick(t_t3_bpe *x) x->x_hit = 0; vec += x->x_curindex; val = atom_getfloat(vec++); - time = (double)atom_getfloat(vec); - outlet_float(x->x_out_time, time); + dtime = (double)atom_getfloat(vec); + outlet_float(x->x_out_time, dtime); x->x_at[1].a_w.w_float = val; x->x_at[0].a_w.w_float = x->x_t3_bang; outlet_list(x->x_obj.ob_outlet, &s_list, 2, x->x_at); - dticks = (time + x->x_t3_bang)/x->x_ticks2ms; + dticks = (dtime + x->x_t3_bang)/x->x_ticks2ms; iticks = (int)dticks; x->x_t3_bang = (dticks - (double)iticks)*x->x_ticks2ms; if(!x->x_hit) diff --git a/iem_t3_lib/src/t3_line~.c b/iem_t3_lib/src/t3_line~.c index 8d386f0..21b7f85 100644 --- a/iem_t3_lib/src/t3_line~.c +++ b/iem_t3_lib/src/t3_line~.c @@ -175,7 +175,7 @@ static void t3_line_tilde_list(t_t3_line_tilde *x, t_symbol *s, int ac, t_atom * if((ac >= 2)&&IS_A_FLOAT(av,0)&&IS_A_FLOAT(av,1)) { int t3_bang_samps, ticks; - double time; + double dtime; x->x_inlet_val = (double)atom_getfloatarg(1, ac, av); t3_bang_samps = (int)((t_float)atom_getfloatarg(0, ac, av)*x->x_ms2samps); @@ -185,10 +185,10 @@ static void t3_line_tilde_list(t_t3_line_tilde *x, t_symbol *s, int ac, t_atom * x->x_t3_bang_samps = t3_bang_samps - x->x_n * ticks; if((ac >= 3)&&IS_A_FLOAT(av,2)) { - time = (double)atom_getfloatarg(2, ac, av); - if(time < 0.0) - time = 0.0; - x->x_inlet_time = time; + dtime = (double)atom_getfloatarg(2, ac, av); + if(dtime < 0.0) + dtime = 0.0; + x->x_inlet_time = dtime; } if(ticks < 1) t3_line_tilde_tick(x); @@ -197,11 +197,11 @@ static void t3_line_tilde_list(t_t3_line_tilde *x, t_symbol *s, int ac, t_atom * } } -static void t3_line_tilde_ft1(t_t3_line_tilde *x, t_float time) +static void t3_line_tilde_ft1(t_t3_line_tilde *x, t_float ftime) { - if(time < 0.0) - time = 0.0; - x->x_inlet_time = (double)time; + if(ftime < 0.0) + ftime = 0.0; + x->x_inlet_time = (double)ftime; } static void t3_line_tilde_stop(t_t3_line_tilde *x) diff --git a/iemlib1/src/lp1_t~.c b/iemlib1/src/lp1_t~.c index 987f527..5eb86a4 100644 --- a/iemlib1/src/lp1_t~.c +++ b/iemlib1/src/lp1_t~.c @@ -80,36 +80,36 @@ static t_int *lp1_t_tilde_perf8(t_int *w) t_float *out = (t_float *)(w[2]); t_lp1_t_tilde *x = (t_lp1_t_tilde *)(w[3]); int i, n = (t_int)(w[4]); - t_float yn[9]; + t_float ynn[9]; t_float c0=x->c0, c1=x->c1; lp1_t_tilde_dsp_tick(x); - yn[0] = x->yn1; + ynn[0] = x->yn1; for(i=0; i<n; i+=8, in+=8, out+=8) { - yn[1] = in[0]*c0 + yn[0]*c1; - out[0] = yn[1]; - yn[2] = in[1]*c0 + yn[1]*c1; - out[1] = yn[2]; - yn[3] = in[2]*c0 + yn[2]*c1; - out[2] = yn[3]; - yn[4] = in[3]*c0 + yn[3]*c1; - out[3] = yn[4]; - yn[5] = in[4]*c0 + yn[4]*c1; - out[4] = yn[5]; - yn[6] = in[5]*c0 + yn[5]*c1; - out[5] = yn[6]; - yn[7] = in[6]*c0 + yn[6]*c1; - out[6] = yn[7]; - yn[8] = in[7]*c0 + yn[7]*c1; - out[7] = yn[8]; - yn[0] = yn[8]; + ynn[1] = in[0]*c0 + ynn[0]*c1; + out[0] = ynn[1]; + ynn[2] = in[1]*c0 + ynn[1]*c1; + out[1] = ynn[2]; + ynn[3] = in[2]*c0 + ynn[2]*c1; + out[2] = ynn[3]; + ynn[4] = in[3]*c0 + ynn[3]*c1; + out[3] = ynn[4]; + ynn[5] = in[4]*c0 + ynn[4]*c1; + out[4] = ynn[5]; + ynn[6] = in[5]*c0 + ynn[5]*c1; + out[5] = ynn[6]; + ynn[7] = in[6]*c0 + ynn[6]*c1; + out[6] = ynn[7]; + ynn[8] = in[7]*c0 + ynn[7]*c1; + out[7] = ynn[8]; + ynn[0] = ynn[8]; } /* NAN protect */ - if(IEM_DENORMAL(yn[0])) - yn[0] = 0.0f; + if(IEM_DENORMAL(ynn[0])) + ynn[0] = 0.0f; - x->yn1 = yn[0]; + x->yn1 = ynn[0]; return(w+5); } |