From 739a8290a8b05645a2d055aed8e5eb76ba2e24e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Fri, 28 Aug 2015 17:55:26 +0000 Subject: one-true indentation svn path=/trunk/externals/zexy/; revision=17537 --- src/0x3c0x7e.c | 172 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 93 insertions(+), 79 deletions(-) (limited to 'src/0x3c0x7e.c') diff --git a/src/0x3c0x7e.c b/src/0x3c0x7e.c index 3a348bd..f3d5e83 100644 --- a/src/0x3c0x7e.c +++ b/src/0x3c0x7e.c @@ -1,4 +1,4 @@ -/* +/* * <~: signal comparision * * (c) 1999-2011 IOhannes m zmölnig, forum::für::umläute, institute of electronic music and acoustics (iem) @@ -7,12 +7,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ @@ -25,14 +25,12 @@ /* ----------------------------- lt_tilde ----------------------------- */ static t_class *lt_tilde_class, *scalarlt_tilde_class; -typedef struct _lt_tilde -{ +typedef struct _lt_tilde { t_object x_obj; t_float x_f; } t_lt_tilde; -typedef struct _scalarlt_tilde -{ +typedef struct _scalarlt_tilde { t_object x_obj; t_float x_f; t_float x_g; /* inlet value */ @@ -40,24 +38,23 @@ typedef struct _scalarlt_tilde static void *lt_tilde_new(t_symbol *UNUSED(s), int argc, t_atom *argv) { - if (argc > 1) post("<~: extra arguments ignored"); - if (argc) - { - t_scalarlt_tilde *x = (t_scalarlt_tilde *)pd_new(scalarlt_tilde_class); - floatinlet_new(&x->x_obj, &x->x_g); - x->x_g = atom_getfloatarg(0, argc, argv); - outlet_new(&x->x_obj, gensym("signal")); - x->x_f = 0; - return (x); - } - else - { - t_lt_tilde *x = (t_lt_tilde *)pd_new(lt_tilde_class); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); - outlet_new(&x->x_obj, gensym("signal")); - x->x_f = 0; - return (x); - } + if (argc > 1) { + post("<~: extra arguments ignored"); + } + if (argc) { + t_scalarlt_tilde *x = (t_scalarlt_tilde *)pd_new(scalarlt_tilde_class); + floatinlet_new(&x->x_obj, &x->x_g); + x->x_g = atom_getfloatarg(0, argc, argv); + outlet_new(&x->x_obj, gensym("signal")); + x->x_f = 0; + return (x); + } else { + t_lt_tilde *x = (t_lt_tilde *)pd_new(lt_tilde_class); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + outlet_new(&x->x_obj, gensym("signal")); + x->x_f = 0; + return (x); + } } static t_int *lt_tilde_perform(t_int *w) @@ -66,7 +63,9 @@ static t_int *lt_tilde_perform(t_int *w) t_sample *in2 = (t_sample *)(w[2]); t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); - while (n--) *out++ = *in1++ < *in2++; + while (n--) { + *out++ = *in1++ < *in2++; + } return (w+5); } @@ -76,17 +75,22 @@ static t_int *lt_tilde_perf8(t_int *w) t_sample *in2 = (t_sample *)(w[2]); t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); - for (; n; n -= 8, in1 += 8, in2 += 8, out += 8) - { - t_sample f0 = in1[0], f1 = in1[1], f2 = in1[2], f3 = in1[3]; - t_sample f4 = in1[4], f5 = in1[5], f6 = in1[6], f7 = in1[7]; - - t_sample g0 = in2[0], g1 = in2[1], g2 = in2[2], g3 = in2[3]; - t_sample g4 = in2[4], g5 = in2[5], g6 = in2[6], g7 = in2[7]; - - out[0] = f0 < g0; out[1] = f1 < g1; out[2] = f2 < g2; out[3] = f3 < g3; - out[4] = f4 < g4; out[5] = f5 < g5; out[6] = f6 < g6; out[7] = f7 < g7; - } + for (; n; n -= 8, in1 += 8, in2 += 8, out += 8) { + t_sample f0 = in1[0], f1 = in1[1], f2 = in1[2], f3 = in1[3]; + t_sample f4 = in1[4], f5 = in1[5], f6 = in1[6], f7 = in1[7]; + + t_sample g0 = in2[0], g1 = in2[1], g2 = in2[2], g3 = in2[3]; + t_sample g4 = in2[4], g5 = in2[5], g6 = in2[6], g7 = in2[7]; + + out[0] = f0 < g0; + out[1] = f1 < g1; + out[2] = f2 < g2; + out[3] = f3 < g3; + out[4] = f4 < g4; + out[5] = f5 < g5; + out[6] = f6 < g6; + out[7] = f7 < g7; + } return (w+5); } @@ -96,7 +100,9 @@ static t_int *scalarlt_tilde_perform(t_int *w) t_sample f = *(t_float *)(w[2]); t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); - while (n--) *out++ = *in++ < f; + while (n--) { + *out++ = *in++ < f; + } return (w+5); } @@ -106,14 +112,19 @@ static t_int *scalarlt_tilde_perf8(t_int *w) t_sample g = *(t_float *)(w[2]); t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); - for (; n; n -= 8, in += 8, out += 8) - { - t_sample f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3]; - t_sample f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7]; - - out[0] = f0 < g; out[1] = f1 < g; out[2] = f2 < g; out[3] = f3 < g; - out[4] = f4 < g; out[5] = f5 < g; out[6] = f6 < g; out[7] = f7 < g; - } + for (; n; n -= 8, in += 8, out += 8) { + t_sample f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3]; + t_sample f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7]; + + out[0] = f0 < g; + out[1] = f1 < g; + out[2] = f2 < g; + out[3] = f3 < g; + out[4] = f4 < g; + out[5] = f5 < g; + out[6] = f6 < g; + out[7] = f7 < g; + } return (w+5); } #ifdef __SSE__ @@ -142,7 +153,7 @@ static t_int *lt_tilde_performSSE(t_int *w) in1+=4; in2+=4; out+=4; - } + } return (w+5); } @@ -185,20 +196,20 @@ static void lt_tilde_dsp(t_lt_tilde* UNUSED(x), t_signal **sp) int n=sp[0]->s_n; #ifdef __SSE__ if( - Z_SIMD_CHKBLOCKSIZE(n)&& - Z_SIMD_CHKALIGN(in1)&& - Z_SIMD_CHKALIGN(in2)&& - Z_SIMD_CHKALIGN(out)&& - ZEXY_TYPE_EQUAL(t_sample, float) - ) - { - dsp_add(lt_tilde_performSSE, 4, in1, in2, out, n); - } else + Z_SIMD_CHKBLOCKSIZE(n)&& + Z_SIMD_CHKALIGN(in1)&& + Z_SIMD_CHKALIGN(in2)&& + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) + ) { + dsp_add(lt_tilde_performSSE, 4, in1, in2, out, n); + } else #endif - if(n&7) - dsp_add(lt_tilde_perform, 4, in1, in2, out, n); - else - dsp_add(lt_tilde_perf8, 4, in1, in2, out, n); + if(n&7) { + dsp_add(lt_tilde_perform, 4, in1, in2, out, n); + } else { + dsp_add(lt_tilde_perf8, 4, in1, in2, out, n); + } } static void scalarlt_tilde_dsp(t_scalarlt_tilde *x, t_signal **sp) @@ -209,19 +220,19 @@ static void scalarlt_tilde_dsp(t_scalarlt_tilde *x, t_signal **sp) #ifdef __SSE__ if( - Z_SIMD_CHKBLOCKSIZE(n)&& - Z_SIMD_CHKALIGN(in)&& - Z_SIMD_CHKALIGN(out)&& - ZEXY_TYPE_EQUAL(t_sample, float) - ) - { - dsp_add(scalarlt_tilde_performSSE, 4, in, &x->x_g, out, n); - } else + Z_SIMD_CHKBLOCKSIZE(n)&& + Z_SIMD_CHKALIGN(in)&& + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) + ) { + dsp_add(scalarlt_tilde_performSSE, 4, in, &x->x_g, out, n); + } else #endif - if (n&7) - dsp_add(scalarlt_tilde_perform, 4, in, &x->x_g, out, n); - else - dsp_add(scalarlt_tilde_perf8, 4, in, &x->x_g, out, n); + if (n&7) { + dsp_add(scalarlt_tilde_perform, 4, in, &x->x_g, out, n); + } else { + dsp_add(scalarlt_tilde_perf8, 4, in, &x->x_g, out, n); + } } static void lt_tilde_help(t_object*x) { @@ -231,18 +242,21 @@ static void lt_tilde_help(t_object*x) void setup_0x3c0x7e(void) { lt_tilde_class = class_new(gensym("<~"), (t_newmethod)lt_tilde_new, 0, - sizeof(t_lt_tilde), 0, A_GIMME, 0); + sizeof(t_lt_tilde), 0, A_GIMME, 0); class_addmethod(lt_tilde_class, (t_method)lt_tilde_dsp, gensym("dsp"), 0); CLASS_MAINSIGNALIN(lt_tilde_class, t_lt_tilde, x_f); - class_addmethod (lt_tilde_class, (t_method)lt_tilde_help, gensym("help"), A_NULL); + class_addmethod (lt_tilde_class, (t_method)lt_tilde_help, gensym("help"), + A_NULL); class_sethelpsymbol(lt_tilde_class, gensym("zigbinops")); scalarlt_tilde_class = class_new(gensym("<~"), 0, 0, - sizeof(t_scalarlt_tilde), 0, 0); + sizeof(t_scalarlt_tilde), 0, 0); CLASS_MAINSIGNALIN(scalarlt_tilde_class, t_scalarlt_tilde, x_f); - class_addmethod(scalarlt_tilde_class, (t_method)scalarlt_tilde_dsp, gensym("dsp"), - 0); - class_addmethod (scalarlt_tilde_class, (t_method)lt_tilde_help, gensym("help"), A_NULL); + class_addmethod(scalarlt_tilde_class, (t_method)scalarlt_tilde_dsp, + gensym("dsp"), + 0); + class_addmethod (scalarlt_tilde_class, (t_method)lt_tilde_help, + gensym("help"), A_NULL); class_sethelpsymbol(scalarlt_tilde_class, gensym("zigbinops")); zexy_register("<~"); } @@ -250,6 +264,6 @@ void setup_0x3c0x7e(void) #ifndef ZEXY_LIBRARY void setup(void) { - setup_0x3c0x7e(); + setup_0x3c0x7e(); } #endif -- cgit v1.2.1