From 8b69cff4357081fdd688f2c29273d34235157d22 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 30 Jan 2012 16:45:10 +0000 Subject: rename [cartopol~] files so they follow the classname svn path=/trunk/externals/miXed/; revision=15925 --- ViCious/cyclone/objects | 2 +- cyclone/Makefile.sources | 2 +- cyclone/sickle/Makefile.sources | 2 +- cyclone/sickle/cartopol.c | 79 ----------------------------------------- cyclone/sickle/cartopol~.c | 79 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 cyclone/sickle/cartopol.c create mode 100644 cyclone/sickle/cartopol~.c diff --git a/ViCious/cyclone/objects b/ViCious/cyclone/objects index 66c21db..954230f 100644 --- a/ViCious/cyclone/objects +++ b/ViCious/cyclone/objects @@ -132,7 +132,7 @@ ALL_SICKLES = \ $(SRCDIR)\sickle\bitxor.obj \ $(SRCDIR)\sickle\buffir.obj \ $(SRCDIR)\sickle\capture.obj \ - $(SRCDIR)\sickle\cartopol.obj \ + $(SRCDIR)\sickle\cartopol~.obj \ $(SRCDIR)\sickle\change.obj \ $(SRCDIR)\sickle\click.obj \ $(SRCDIR)\sickle\Clip.obj \ diff --git a/cyclone/Makefile.sources b/cyclone/Makefile.sources index a5f40ca..b44ac05 100644 --- a/cyclone/Makefile.sources +++ b/cyclone/Makefile.sources @@ -182,7 +182,7 @@ sickle/pong.c SFRAGILE_TILDE = $(TILDE) SFRAGILE_SOURCES = \ -sickle/cartopol.c \ +sickle/cartopol~.c \ sickle/poltocar.c SFRAGILEFITTER_TILDE = $(TILDE) diff --git a/cyclone/sickle/Makefile.sources b/cyclone/sickle/Makefile.sources index ce8b493..9957270 100644 --- a/cyclone/sickle/Makefile.sources +++ b/cyclone/sickle/Makefile.sources @@ -21,7 +21,7 @@ bitshift.c \ bitxor.c \ buffir.c \ capture.c \ -cartopol.c \ +cartopol~.c \ change.c \ click.c \ Clip.c \ diff --git a/cyclone/sickle/cartopol.c b/cyclone/sickle/cartopol.c deleted file mode 100644 index 4c25797..0000000 --- a/cyclone/sickle/cartopol.c +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright (c) 2002-2003 krzYszcz and others. - * For information on usage and redistribution, and for a DISCLAIMER OF ALL - * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - -#include -#include "m_pd.h" -#include "unstable/fragile.h" -#include "sickle/sic.h" - -#if defined(NT) || defined(MACOSX) -/* cf pd/src/x_arithmetic.c */ -#define atan2f atan2 -#define hypotf hypot -#endif - -typedef struct _cartopol -{ - t_sic x_sic; - t_outlet *x_out2; -} t_cartopol; - -static t_class *cartopol_class; - -static t_int *cartopol_perform(t_int *w) -{ - int nblock = (int)(w[1]); - t_float *in1 = (t_float *)(w[2]); - t_float *in2 = (t_float *)(w[3]); - t_float *out1 = (t_float *)(w[4]); - t_float *out2 = (t_float *)(w[5]); - while (nblock--) - { - float rl = *in1++, im = -*in2++; /* CHECKED */ - *out1++ = hypotf(rl, im); - *out2++ = atan2f(im, rl); - } - return (w + 6); -} - -static t_int *cartopol_perform_nophase(t_int *w) -{ - int nblock = (int)(w[1]); - t_float *in1 = (t_float *)(w[2]); - t_float *in2 = (t_float *)(w[3]); - t_float *out1 = (t_float *)(w[4]); - while (nblock--) - { - float rl = *in1++, im = -*in2++; /* CHECKED */ - *out1++ = hypotf(rl, im); - } - return (w + 5); -} - -static void cartopol_dsp(t_cartopol *x, t_signal **sp) -{ - if (fragile_outlet_connections(x->x_out2)) - dsp_add(cartopol_perform, 5, sp[0]->s_n, sp[0]->s_vec, - sp[1]->s_vec, sp[2]->s_vec, sp[3]->s_vec); - else - dsp_add(cartopol_perform_nophase, 4, sp[0]->s_n, sp[0]->s_vec, - sp[1]->s_vec, sp[2]->s_vec); -} - -static void *cartopol_new(void) -{ - t_cartopol *x = (t_cartopol *)pd_new(cartopol_class); - inlet_new((t_object *)x, (t_pd *)x, &s_signal, &s_signal); - outlet_new((t_object *)x, &s_signal); - x->x_out2 = outlet_new((t_object *)x, &s_signal); - return (x); -} - -void cartopol_tilde_setup(void) -{ - cartopol_class = class_new(gensym("cartopol~"), - (t_newmethod)cartopol_new, 0, - sizeof(t_cartopol), 0, 0); - sic_setup(cartopol_class, cartopol_dsp, SIC_FLOATTOSIGNAL); -} diff --git a/cyclone/sickle/cartopol~.c b/cyclone/sickle/cartopol~.c new file mode 100644 index 0000000..4c25797 --- /dev/null +++ b/cyclone/sickle/cartopol~.c @@ -0,0 +1,79 @@ +/* Copyright (c) 2002-2003 krzYszcz and others. + * For information on usage and redistribution, and for a DISCLAIMER OF ALL + * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ + +#include +#include "m_pd.h" +#include "unstable/fragile.h" +#include "sickle/sic.h" + +#if defined(NT) || defined(MACOSX) +/* cf pd/src/x_arithmetic.c */ +#define atan2f atan2 +#define hypotf hypot +#endif + +typedef struct _cartopol +{ + t_sic x_sic; + t_outlet *x_out2; +} t_cartopol; + +static t_class *cartopol_class; + +static t_int *cartopol_perform(t_int *w) +{ + int nblock = (int)(w[1]); + t_float *in1 = (t_float *)(w[2]); + t_float *in2 = (t_float *)(w[3]); + t_float *out1 = (t_float *)(w[4]); + t_float *out2 = (t_float *)(w[5]); + while (nblock--) + { + float rl = *in1++, im = -*in2++; /* CHECKED */ + *out1++ = hypotf(rl, im); + *out2++ = atan2f(im, rl); + } + return (w + 6); +} + +static t_int *cartopol_perform_nophase(t_int *w) +{ + int nblock = (int)(w[1]); + t_float *in1 = (t_float *)(w[2]); + t_float *in2 = (t_float *)(w[3]); + t_float *out1 = (t_float *)(w[4]); + while (nblock--) + { + float rl = *in1++, im = -*in2++; /* CHECKED */ + *out1++ = hypotf(rl, im); + } + return (w + 5); +} + +static void cartopol_dsp(t_cartopol *x, t_signal **sp) +{ + if (fragile_outlet_connections(x->x_out2)) + dsp_add(cartopol_perform, 5, sp[0]->s_n, sp[0]->s_vec, + sp[1]->s_vec, sp[2]->s_vec, sp[3]->s_vec); + else + dsp_add(cartopol_perform_nophase, 4, sp[0]->s_n, sp[0]->s_vec, + sp[1]->s_vec, sp[2]->s_vec); +} + +static void *cartopol_new(void) +{ + t_cartopol *x = (t_cartopol *)pd_new(cartopol_class); + inlet_new((t_object *)x, (t_pd *)x, &s_signal, &s_signal); + outlet_new((t_object *)x, &s_signal); + x->x_out2 = outlet_new((t_object *)x, &s_signal); + return (x); +} + +void cartopol_tilde_setup(void) +{ + cartopol_class = class_new(gensym("cartopol~"), + (t_newmethod)cartopol_new, 0, + sizeof(t_cartopol), 0, 0); + sic_setup(cartopol_class, cartopol_dsp, SIC_FLOATTOSIGNAL); +} -- cgit v1.2.1