changed t_signal, t_float, and date

svn path=/trunk/externals/iem/iem_delay/; revision=17187

1 files changed, 69 insertions, 78 deletions

diff --git a/src/n_delay1p_line~.c b/src/n_delay1p_line~.c
index e345aac..50ad6dc 100644
--- a/src/n_delay1p_line~.c
+++ b/src/n_delay1p_line~.c
@@ -1,7 +1,9 @@
 /* For information on usage and redistribution, and for a DISCLAIMER OF ALL
 * WARRANTIES, see the file, "LICENSE.txt," in this distribution.
 
-iem_delay written by Thomas Musil (c) IEM KUG Graz Austria 2002 - 2006 */
+iem_delay written by Thomas Musil (c) IEM KUG Graz Austria 2002 - 2011 */
+
+/* no good, hat schwirigkeiten bei help patch, kontinuierlich die formanten interpolation zu schaffen */
 
 
 #include "m_pd.h"
@@ -9,6 +11,8 @@ iem_delay written by Thomas Musil (c) IEM KUG Graz Austria 2002 - 2006 */
 #include "iem_delay.h"
 
 /* -------------------------- n_delay1p_line_tilde~ ------------------------------ */
+/* ----------- n non interpolated line~-signal driven delay taps ------------- */
+
 static t_class *n_delay1p_line_tilde_class;
 
 typedef struct _n_delay1p_line_tilde
@@ -16,8 +20,8 @@ typedef struct _n_delay1p_line_tilde
 	t_object	x_obj;
 	int				x_mallocsize;
 	t_float		x_max_delay_ms;
-	t_float		*x_begmem0;
-	t_float		*x_begmem1;
+	t_sample	*x_begmem1;
+	t_sample	*x_begmem2;
 	int				x_writeindex;
 	int				x_n_delays;
 	int				*x_del_samp256_end;
@@ -33,8 +37,8 @@ typedef struct _n_delay1p_line_tilde
 	int				x_ticksleft;
 	int				x_old;
 	int				x_retarget;
-	t_float		**x_io;
-	t_float		x_msi;
+	t_sample	**x_io;
+	t_float		x_scalar_sig_in;
 } t_n_delay1p_line_tilde;
 
 static void n_delay1p_line_tilde_list(t_n_delay1p_line_tilde *x, t_symbol *s, int argc, t_atom *argv)
@@ -44,29 +48,29 @@ static void n_delay1p_line_tilde_list(t_n_delay1p_line_tilde *x, t_symbol *s, in
 		int i;
 		t_float delay, max=x->x_max_delay_ms;
 
-		if(x->x_interpol_ms <= 0.0f)
+		if(x->x_interpol_ms <= (t_float)0.0)
 			x->x_ticksleft = x->x_retarget = 0;
 		else
 			x->x_retarget = 1;
 		for(i=0; i<argc; i++)
 		{
 			delay = atom_getfloat(argv++);
-			if(delay < 0.0f)
-				delay = 0.0f;
+			if(delay < (t_float)0.0)
+				delay = (t_float)0.0;
 			if(delay > max)
 				delay = max;
-			if(x->x_interpol_ms <= 0.0f)
-				x->x_del_samp256_end[i] = x->x_del_samp256_cur[i] = (int)(x->x_ms2samples256 * delay + 0.5f) + 127;
+			if(x->x_interpol_ms <= (t_float)0.0)
+				x->x_del_samp256_end[i] = x->x_del_samp256_cur[i] = (int)(x->x_ms2samples256 * delay + (t_float)0.5) + 127;
 			else
-				x->x_del_samp256_end[i] = (int)(x->x_ms2samples256 * delay  + 0.5f) + 127;
+				x->x_del_samp256_end[i] = (int)(x->x_ms2samples256 * delay  + (t_float)0.5) + 127;
 		}
 	}
 }
 
 static void n_delay1p_line_tilde_time(t_n_delay1p_line_tilde *x, t_floatarg interpol_ms)
 {
-	if(interpol_ms < 0.0f)
-		interpol_ms = 0.0f;
+	if(interpol_ms < (t_float)0.0)
+		interpol_ms = (t_float)0.0;
 	x->x_interpol_ms = interpol_ms;
 	x->x_interpol_ticks = (int)(x->x_ms2tick * interpol_ms);
 }
@@ -85,30 +89,25 @@ static t_int *n_delay1p_line_tilde_perform(t_int *w)
 	t_n_delay1p_line_tilde *x = (t_n_delay1p_line_tilde *)(w[1]);
 	int hn=(int)(w[2]);
 	int nout=x->x_n_delays;
-	t_float *in;
-	t_float *out;
+	t_sample *in;
+	t_sample *out;
 	int writeindex = x->x_writeindex;
 	int i, j, n;
 	int malloc_samples = x->x_mallocsize;
-	t_float *begvec0 = x->x_begmem0;
-	t_float *begvec1 = x->x_begmem1;
-	t_float *writevec;
-	t_float *readvec;
+	t_sample *begvec1 = x->x_begmem1;
+	t_sample *begvec2 = x->x_begmem2;
+	t_sample *writevec;
+	t_sample *readvec;
 	int del256, inc256;
 
-	writevec = begvec0 + writeindex;
-	in=x->x_io[0];
-	n = hn;
-	while(n--)
-	{
-		*writevec++ = *in++;
-	}
-	writevec = begvec1 + writeindex;
+	begvec1 += writeindex;
+  writevec = begvec2 + writeindex;
 	in=x->x_io[0];
 	n = hn;
 	while(n--)
 	{
-		*writevec++ = *in++;
+		*begvec1++ = *in;
+    *writevec++ = *in++;
 	}
 
 	if(x->x_retarget)
@@ -135,7 +134,7 @@ static t_int *n_delay1p_line_tilde_perform(t_int *w)
 			out = x->x_io[j+1];
 			for(i=0; i<hn; i++)
 			{
-				readvec = begvec1 + writeindex - (del256 >> 8) + i;
+				readvec = begvec2 + writeindex - (del256 >> 8) + i;
 				*out++ = *readvec;
 				del256 += inc256;
 			}
@@ -148,7 +147,7 @@ static t_int *n_delay1p_line_tilde_perform(t_int *w)
 		for(j=0; j<nout; j++)
 		{
 			del256 = x->x_del_samp256_cur[j] = x->x_del_samp256_end[j];
-			readvec = begvec1 + writeindex - (del256 >> 8);
+			readvec = begvec2 + writeindex - (del256 >> 8);
 			out = x->x_io[j+1];
 			n = hn;
 			while(n--)
@@ -171,42 +170,34 @@ static t_int *n_delay1p_line_tilde_perf8(t_int *w)
 	t_n_delay1p_line_tilde *x = (t_n_delay1p_line_tilde *)(w[1]);
 	int hn=(int)(w[2]);
 	int nout=x->x_n_delays;
-	t_float *in;
-	t_float *out;
+	t_sample *in;
+	t_sample *out;
 	int writeindex = x->x_writeindex;
 	int i, j, k, n;
 	int malloc_samples = x->x_mallocsize;
-	t_float *begvec0 = x->x_begmem0;
-	t_float *begvec1 = x->x_begmem1;
-	t_float *writevec;
-	t_float *readvec;
+	t_sample *begvec1 = x->x_begmem1;
+	t_sample *begvec2 = x->x_begmem2;
+	t_sample *writevec;
+	t_sample *readvec;
 	int del256, inc256;
 
 //	post("writevec = %d",writeindex);
-	writevec = begvec0 + writeindex;
-	in=x->x_io[0];
-	n = hn;
-	while(n)
-	{
-		writevec[0] = in[0];
-		writevec[1] = in[1];
-		writevec[2] = in[2];
-		writevec[3] = in[3];
-		writevec[4] = in[4];
-		writevec[5] = in[5];
-		writevec[6] = in[6];
-		writevec[7] = in[7];
-
-		writevec += 8;
-		n -= 8;
-		in += 8;
-	}
-	writevec = begvec1 + writeindex;
+	begvec1 += writeindex;
+  writevec = begvec2 + writeindex;
 	in=x->x_io[0];
 	n = hn;
 	while(n)
 	{
-		writevec[0] = in[0];
+		begvec1[0] = in[0];
+		begvec1[1] = in[1];
+		begvec1[2] = in[2];
+		begvec1[3] = in[3];
+		begvec1[4] = in[4];
+		begvec1[5] = in[5];
+		begvec1[6] = in[6];
+		begvec1[7] = in[7];
+    
+    writevec[0] = in[0];
 		writevec[1] = in[1];
 		writevec[2] = in[2];
 		writevec[3] = in[3];
@@ -215,6 +206,7 @@ static t_int *n_delay1p_line_tilde_perf8(t_int *w)
 		writevec[6] = in[6];
 		writevec[7] = in[7];
 
+    begvec1 += 8;
 		writevec += 8;
 		n -= 8;
 		in += 8;
@@ -242,7 +234,7 @@ static t_int *n_delay1p_line_tilde_perf8(t_int *w)
 			inc256 = x->x_inc256[j];
 			del256 = x->x_del_samp256_cur[j];
 			out = x->x_io[j+1];
-			readvec = begvec1 + writeindex;
+			readvec = begvec2 + writeindex;
 			for(i=0; i<hn; i+=8)
 			{
 				k = del256 >> 8;
@@ -289,7 +281,7 @@ static t_int *n_delay1p_line_tilde_perf8(t_int *w)
 		for(j=0; j<nout; j++)
 		{
 			del256 = x->x_del_samp256_cur[j] = x->x_del_samp256_end[j];
-			readvec = begvec1 + writeindex - (del256 >> 8);
+			readvec = begvec2 + writeindex - (del256 >> 8);
 			out = x->x_io[j+1];
 			n = hn;
 			while(n)
@@ -326,35 +318,35 @@ static void n_delay1p_line_tilde_dsp(t_n_delay1p_line_tilde *x, t_signal **sp)
 
 	if(!x->x_blocksize)/*first time*/
 	{
-		int nsamps = x->x_max_delay_ms * (t_float)sp[0]->s_sr * 0.001f;
+		int nsamps = x->x_max_delay_ms * (t_float)sp[0]->s_sr * (t_float)0.001;
 
 		if(nsamps < 1)
 			nsamps = 1;
 		nsamps += ((- nsamps) & (n - 1));
 		nsamps += n;
 		x->x_mallocsize = nsamps;
-		x->x_begmem0 = (t_float *)getbytes(2 * x->x_mallocsize * sizeof(t_float));
-		x->x_begmem1 = x->x_begmem0 + x->x_mallocsize;
+		x->x_begmem1 = (t_sample *)getbytes(2 * x->x_mallocsize * sizeof(t_sample));
+		x->x_begmem2 = x->x_begmem1 + x->x_mallocsize;
 		x->x_writeindex = n;
 	}
 	else if((x->x_blocksize != n) || ((t_float)sp[0]->s_sr != x->x_sr))
 	{
-		int nsamps = x->x_max_delay_ms * (t_float)sp[0]->s_sr * 0.001f;
+		int nsamps = x->x_max_delay_ms * (t_float)sp[0]->s_sr * (t_float)0.001;
 
 		if(nsamps < 1)
 			nsamps = 1;
 		nsamps += ((- nsamps) & (n - 1));
 		nsamps += n;
 		
-		x->x_begmem0 = (t_float *)resizebytes(x->x_begmem0, 2*x->x_mallocsize*sizeof(t_float), 2*nsamps*sizeof(t_float));
+		x->x_begmem1 = (t_sample *)resizebytes(x->x_begmem1, 2*x->x_mallocsize*sizeof(t_sample), 2*nsamps*sizeof(t_sample));
 		x->x_mallocsize = nsamps;
-		x->x_begmem1 = x->x_begmem0 + x->x_mallocsize;
+		x->x_begmem2 = x->x_begmem1 + x->x_mallocsize;
 		if(x->x_writeindex >= nsamps)
 			x->x_writeindex -= nsamps;
 	}
 	x->x_blocksize = n;
-	x->x_ms2tick = 0.001f * (t_float)sp[0]->s_sr / (t_float)n;
-	x->x_ms2samples256 = 0.256f * (t_float)sp[0]->s_sr;
+	x->x_ms2tick = (t_float)0.001 * (t_float)sp[0]->s_sr / (t_float)n;
+	x->x_ms2samples256 = (t_float)0.256 * (t_float)sp[0]->s_sr;
 	x->x_interpol_ticks = (int)(x->x_ms2tick * x->x_interpol_ms);
 	for(i=0; i<nd; i++)
 		x->x_io[i] = sp[i]->s_vec;
@@ -368,7 +360,7 @@ static void *n_delay1p_line_tilde_new(t_floatarg fout, t_floatarg delay_ms, t_fl
 {
 	t_n_delay1p_line_tilde *x = (t_n_delay1p_line_tilde *)pd_new(n_delay1p_line_tilde_class);
 	int i, n_out = (int)fout;
-	int nsamps = delay_ms * sys_getsr() * 0.001f;
+	int nsamps = delay_ms * sys_getsr() * (t_float)0.001;
 
 	if(n_out < 1)
 		n_out = 1;
@@ -379,15 +371,15 @@ static void *n_delay1p_line_tilde_new(t_floatarg fout, t_floatarg delay_ms, t_fl
 	nsamps += ((- nsamps) & (DELLINE_DEF_VEC_SIZE - 1));
 	nsamps += DELLINE_DEF_VEC_SIZE;
 	x->x_mallocsize = nsamps;
-	x->x_begmem0 = (t_float *)getbytes(2 * x->x_mallocsize * sizeof(t_float));
-	x->x_begmem1 = x->x_begmem0 + x->x_mallocsize;
+	x->x_begmem1 = (t_sample *)getbytes(2 * x->x_mallocsize * sizeof(t_sample));
+	x->x_begmem2 = x->x_begmem1 + x->x_mallocsize;
 	x->x_writeindex = DELLINE_DEF_VEC_SIZE;
 	x->x_blocksize = 0;
-	x->x_sr = 0.0f;
-	if(interpol_ms < 0.0f)
-		interpol_ms = 0.0f;
+	x->x_sr = (t_float)0.0;
+	if(interpol_ms < (t_float)0.0)
+		interpol_ms = (t_float)0.0;
 	x->x_interpol_ms = interpol_ms;
-	x->x_io = (t_float **)getbytes((x->x_n_delays + 1) * sizeof(t_float *));
+	x->x_io = (t_sample **)getbytes((x->x_n_delays + 1) * sizeof(t_sample *));
 	for(i=0; i<n_out; i++)
 		outlet_new(&x->x_obj, &s_signal);
 	x->x_del_samp256_end = (int *)getbytes(x->x_n_delays * sizeof(int));
@@ -401,7 +393,7 @@ static void *n_delay1p_line_tilde_new(t_floatarg fout, t_floatarg delay_ms, t_fl
 		x->x_inc256[i] = x->x_biginc256[i] = 0;
 	}
 	x->x_interpol_ticks = 0;
-	x->x_msi = 0.0f;
+	x->x_scalar_sig_in = (t_float)0.0;
 	return (x);
 }
 
@@ -411,18 +403,17 @@ static void n_delay1p_line_tilde_free(t_n_delay1p_line_tilde *x)
 	freebytes(x->x_del_samp256_cur, x->x_n_delays * sizeof(int));
 	freebytes(x->x_inc256, x->x_n_delays * sizeof(int));
 	freebytes(x->x_biginc256, x->x_n_delays * sizeof(int));
-	freebytes(x->x_io, (x->x_n_delays + 1) * sizeof(t_float *));
-	freebytes(x->x_begmem0, 2 * x->x_mallocsize * sizeof(t_float));
+	freebytes(x->x_io, (x->x_n_delays + 1) * sizeof(t_sample *));
+	freebytes(x->x_begmem1, 2 * x->x_mallocsize * sizeof(t_sample));
 }
 
 void n_delay1p_line_tilde_setup(void)
 {
 	n_delay1p_line_tilde_class = class_new(gensym("n_delay1p_line~"), (t_newmethod)n_delay1p_line_tilde_new, (t_method)n_delay1p_line_tilde_free,
 		sizeof(t_n_delay1p_line_tilde), 0, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0);
-	CLASS_MAINSIGNALIN(n_delay1p_line_tilde_class, t_n_delay1p_line_tilde, x_msi);
+	CLASS_MAINSIGNALIN(n_delay1p_line_tilde_class, t_n_delay1p_line_tilde, x_scalar_sig_in);
 	class_addlist(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_list);
 	class_addmethod(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_dsp, gensym("dsp"), 0);
 	class_addmethod(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_stop, gensym("stop"), 0);
 	class_addmethod(n_delay1p_line_tilde_class, (t_method)n_delay1p_line_tilde_time, gensym("time"), A_FLOAT, 0);
-//	class_sethelpsymbol(n_delay1p_line_tilde_class, gensym("iemhelp2/n_delay1p_line~-help"));
 }