Cut the files in half and it might work better (note to self: check your tree is really clean before patching)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21070 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 0 insertions, 319 deletions

diff --git a/apps/plugins/pdbox/PDa/src/d_delay.c b/apps/plugins/pdbox/PDa/src/d_delay.c
index 37fb90e..d04ded9 100644
--- a/apps/plugins/pdbox/PDa/src/d_delay.c
+++ b/apps/plugins/pdbox/PDa/src/d_delay.c
@@ -317,322 +317,3 @@ void d_delay_setup(void)
     sigvd_setup();
 }
 
-/* Copyright (c) 1997-1999 Miller Puckette.
-* For information on usage and redistribution, and for a DISCLAIMER OF ALL
-* WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
-
-/*  send~, delread~, throw~, catch~ */
-
-#include "m_pd.h"
-extern int ugen_getsortno(void);
-
-#define DEFDELVS 64	    	/* LATER get this from canvas at DSP time */
-static int delread_zero = 0;	/* four bytes of zero for delread~, vd~ */
-
-/* ----------------------------- delwrite~ ----------------------------- */
-static t_class *sigdelwrite_class;
-
-typedef struct delwritectl
-{
-    int c_n;
-    float *c_vec;
-    int c_phase;
-} t_delwritectl;
-
-typedef struct _sigdelwrite
-{
-    t_object x_obj;
-    t_symbol *x_sym;
-    t_delwritectl x_cspace;
-    int x_sortno;   /* DSP sort number at which this was last put on chain */
-    int x_rsortno;  /* DSP sort # for first delread or write in chain */
-    int x_vecsize;  /* vector size for delread~ to use */
-    float x_f;
-} t_sigdelwrite;
-
-#define XTRASAMPS 4
-#define SAMPBLK 4
-
-    /* routine to check that all delwrites/delreads/vds have same vecsize */
-static void sigdelwrite_checkvecsize(t_sigdelwrite *x, int vecsize)
-{
-    /*
-    	LATER this should really check sample rate and blocking, once that is
-	supported.  Probably we don't actually care about vecsize.
-	For now just suppress this check... */
-#if 0
-    if (x->x_rsortno != ugen_getsortno())
-    {
-    	x->x_vecsize = vecsize;
-	x->x_rsortno = ugen_getsortno();
-    }
-    else if (vecsize != x->x_vecsize)
-    	pd_error(x, "delread/delwrite/vd vector size mismatch");
-#endif
-}
-
-static void *sigdelwrite_new(t_symbol *s, t_floatarg msec)
-{
-    int nsamps;
-    t_sigdelwrite *x = (t_sigdelwrite *)pd_new(sigdelwrite_class);
-    if (!*s->s_name) s = gensym("delwrite~");
-    pd_bind(&x->x_obj.ob_pd, s);
-    x->x_sym = s;
-    nsamps = msec * sys_getsr() * (float)(0.001f);
-    if (nsamps < 1) nsamps = 1;
-    nsamps += ((- nsamps) & (SAMPBLK - 1));
-    nsamps += DEFDELVS;
-    x->x_cspace.c_n = nsamps;
-    x->x_cspace.c_vec =
-    	(float *)getbytes((nsamps + XTRASAMPS) * sizeof(float));
-    x->x_cspace.c_phase = XTRASAMPS;
-    x->x_sortno = 0;
-    x->x_vecsize = 0;
-    x->x_f = 0;
-    return (x);
-}
-
-static t_int *sigdelwrite_perform(t_int *w)
-{
-    t_float *in = (t_float *)(w[1]);
-    t_delwritectl *c = (t_delwritectl *)(w[2]);
-    int n = (int)(w[3]);
-    int phase = c->c_phase, nsamps = c->c_n;
-    float *vp = c->c_vec, *bp = vp + phase, *ep = vp + (c->c_n + XTRASAMPS);
-    phase += n;
-    while (n--)
-    {
-    	float f = *in++;
-    	if (PD_BIGORSMALL(f))
-	    f = 0;
-    	*bp++ = f;
-    	if (bp == ep)
-    	{
-    	    vp[0] = ep[-4];
-    	    vp[1] = ep[-3];
-    	    vp[2] = ep[-2];
-    	    vp[3] = ep[-1];
-    	    bp = vp + XTRASAMPS;
-    	    phase -= nsamps;
-    	}
-    }
-    c->c_phase = phase; 
-    return (w+4);
-}
-
-static void sigdelwrite_dsp(t_sigdelwrite *x, t_signal **sp)
-{
-    dsp_add(sigdelwrite_perform, 3, sp[0]->s_vec, &x->x_cspace, sp[0]->s_n);
-    x->x_sortno = ugen_getsortno();
-    sigdelwrite_checkvecsize(x, sp[0]->s_n);
-}
-
-static void sigdelwrite_free(t_sigdelwrite *x)
-{
-    pd_unbind(&x->x_obj.ob_pd, x->x_sym);
-    freebytes(x->x_cspace.c_vec,
-    	(x->x_cspace.c_n + XTRASAMPS) * sizeof(float));
-}
-
-static void sigdelwrite_setup(void)
-{
-    sigdelwrite_class = class_new(gensym("delwrite~"), 
-    	(t_newmethod)sigdelwrite_new, (t_method)sigdelwrite_free,
-    	sizeof(t_sigdelwrite), 0, A_DEFSYM, A_DEFFLOAT, 0);
-    CLASS_MAINSIGNALIN(sigdelwrite_class, t_sigdelwrite, x_f);
-    class_addmethod(sigdelwrite_class, (t_method)sigdelwrite_dsp,
-    	gensym("dsp"), 0);
-}
-
-/* ----------------------------- delread~ ----------------------------- */
-static t_class *sigdelread_class;
-
-typedef struct _sigdelread
-{
-    t_object x_obj;
-    t_symbol *x_sym;
-    t_float x_deltime;	/* delay in msec */
-    int x_delsamps; 	/* delay in samples */
-    t_float x_sr;   	/* samples per msec */
-    t_float x_n;   	/* vector size */
-    int x_zerodel;  	/* 0 or vecsize depending on read/write order */
-} t_sigdelread;
-
-static void sigdelread_float(t_sigdelread *x, t_float f);
-
-static void *sigdelread_new(t_symbol *s, t_floatarg f)
-{
-    t_sigdelread *x = (t_sigdelread *)pd_new(sigdelread_class);
-    x->x_sym = s;
-    x->x_sr = 1;
-    x->x_n = 1;
-    x->x_zerodel = 0;
-    sigdelread_float(x, f);
-    outlet_new(&x->x_obj, &s_signal);
-    return (x);
-}
-
-static void sigdelread_float(t_sigdelread *x, t_float f)
-{
-    int samps;
-    t_sigdelwrite *delwriter =
-    	(t_sigdelwrite *)pd_findbyclass(x->x_sym, sigdelwrite_class);
-    x->x_deltime = f;
-    if (delwriter)
-    {
-    	int delsize = delwriter->x_cspace.c_n;
-    	x->x_delsamps = (int)(0.5 + x->x_sr * x->x_deltime)
-    	    + x->x_n - x->x_zerodel;
-    	if (x->x_delsamps < x->x_n) x->x_delsamps = x->x_n;
-    	else if (x->x_delsamps > delwriter->x_cspace.c_n - DEFDELVS)
-    	    x->x_delsamps = delwriter->x_cspace.c_n - DEFDELVS;
-    }
-}
-
-static t_int *sigdelread_perform(t_int *w)
-{
-    t_float *out = (t_float *)(w[1]);
-    t_delwritectl *c = (t_delwritectl *)(w[2]);
-    int delsamps = *(int *)(w[3]);
-    int n = (int)(w[4]);
-    int phase = c->c_phase - delsamps, nsamps = c->c_n;
-    float *vp = c->c_vec, *bp, *ep = vp + (c->c_n + XTRASAMPS);
-
-    if (phase < 0) phase += nsamps;
-    bp = vp + phase;
-    while (n--)
-    {
-    	*out++ = *bp++;
-    	if (bp == ep) bp -= nsamps;
-    }
-    return (w+5);
-}
-
-static void sigdelread_dsp(t_sigdelread *x, t_signal **sp)
-{
-    t_sigdelwrite *delwriter =
-    	(t_sigdelwrite *)pd_findbyclass(x->x_sym, sigdelwrite_class);
-    x->x_sr = sp[0]->s_sr * 0.001;
-    x->x_n = sp[0]->s_n;
-    if (delwriter)
-    {
-    	sigdelwrite_checkvecsize(delwriter, sp[0]->s_n);
-    	x->x_zerodel = (delwriter->x_sortno == ugen_getsortno() ?
-    	    0 : delwriter->x_vecsize);
-    	sigdelread_float(x, x->x_deltime);
-    	dsp_add(sigdelread_perform, 4,
-    	    sp[0]->s_vec, &delwriter->x_cspace, &x->x_delsamps, sp[0]->s_n);
-    }
-    else if (*x->x_sym->s_name)
-    	error("delread~: %s: no such delwrite~",x->x_sym->s_name);
-}
-
-static void sigdelread_setup(void)
-{
-    sigdelread_class = class_new(gensym("delread~"),
-    	(t_newmethod)sigdelread_new, 0,
-    	sizeof(t_sigdelread), 0, A_DEFSYM, A_DEFFLOAT, 0);
-    class_addmethod(sigdelread_class, (t_method)sigdelread_dsp,
-    	gensym("dsp"), 0);
-    class_addfloat(sigdelread_class, (t_method)sigdelread_float);
-}
-
-
-/* ----------------------------- vd~ ----------------------------- */
-static t_class *sigvd_class;
-
-typedef struct _sigvd
-{
-    t_object x_obj;
-    t_symbol *x_sym;
-    t_float x_sr;   	/* samples per msec */
-    int x_zerodel;  	/* 0 or vecsize depending on read/write order */
-    float x_f;
-} t_sigvd;
-
-static void *sigvd_new(t_symbol *s)
-{
-    t_sigvd *x = (t_sigvd *)pd_new(sigvd_class);
-    if (!*s->s_name) s = gensym("vd~");
-    x->x_sym = s;
-    x->x_sr = 1;
-    x->x_zerodel = 0;
-    outlet_new(&x->x_obj, &s_signal);
-    x->x_f = 0;
-    return (x);
-}
-
-static t_int *sigvd_perform(t_int *w)
-{
-    t_float *in = (t_float *)(w[1]);
-    t_float *out = (t_float *)(w[2]);
-    t_delwritectl *ctl = (t_delwritectl *)(w[3]);
-    t_sigvd *x = (t_sigvd *)(w[4]);
-    int n = (int)(w[5]);
-
-    int nsamps = ctl->c_n;
-    float limit = nsamps - n - 1;
-    float fn = n-1;
-    float *vp = ctl->c_vec, *bp, *wp = vp + ctl->c_phase;
-    float zerodel = x->x_zerodel;
-    while (n--)
-    {
-    	float delsamps = x->x_sr * *in++ - zerodel, frac;
-    	int idelsamps;
-    	float a, b, c, d, cminusb;
-    	if (delsamps < 1.00001f) delsamps = 1.00001f;
-    	if (delsamps > limit) delsamps = limit;
-    	delsamps += fn;
-    	fn = fn - 1.0f;
-    	idelsamps = delsamps;
-    	frac = delsamps - (float)idelsamps;
-    	bp = wp - idelsamps;
-    	if (bp < vp + 4) bp += nsamps;
-    	d = bp[-3];
-    	c = bp[-2];
-    	b = bp[-1];
-    	a = bp[0];
-    	cminusb = c-b;
-    	*out++ = b + frac * (
-	    cminusb - 0.1666667f * (1.-frac) * (
-		(d - a - 3.0f * cminusb) * frac + (d + 2.0f*a - 3.0f*b)
-	    )
-	);
-    }
-    return (w+6);
-}
-
-static void sigvd_dsp(t_sigvd *x, t_signal **sp)
-{
-    t_sigdelwrite *delwriter =
-    	(t_sigdelwrite *)pd_findbyclass(x->x_sym, sigdelwrite_class);
-    x->x_sr = sp[0]->s_sr * 0.001;
-    if (delwriter)
-    {
-    	sigdelwrite_checkvecsize(delwriter, sp[0]->s_n);
-    	x->x_zerodel = (delwriter->x_sortno == ugen_getsortno() ?
-    	    0 : delwriter->x_vecsize);
-    	dsp_add(sigvd_perform, 5,
-    	    sp[0]->s_vec, sp[1]->s_vec,
-    	    	&delwriter->x_cspace, x, sp[0]->s_n);
-    }
-    else error("vd~: %s: no such delwrite~",x->x_sym->s_name);
-}
-
-static void sigvd_setup(void)
-{
-    sigvd_class = class_new(gensym("vd~"), (t_newmethod)sigvd_new, 0,
-    	sizeof(t_sigvd), 0, A_DEFSYM, 0);
-    class_addmethod(sigvd_class, (t_method)sigvd_dsp, gensym("dsp"), 0);
-    CLASS_MAINSIGNALIN(sigvd_class, t_sigvd, x_f);
-}
-
-/* ----------------------- global setup routine ---------------- */
-
-void d_delay_setup(void)
-{
-    sigdelwrite_setup();
-    sigdelread_setup();
-    sigvd_setup();
-}
-