From 34a2ba5cba836ebc1211b33381c648160ca71ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 3 Jan 2008 11:15:25 +0000 Subject: use t_float/t_sample instead of "float" and where appropriate svn path=/trunk/externals/zexy/; revision=9111 --- src/0x260x260x7e.c | 36 +++++++++++++++++++----------------- src/0x3c0x7e.c | 48 +++++++++++++++++++++++++----------------------- src/0x3d0x3d0x7e.c | 48 +++++++++++++++++++++++++----------------------- src/0x3e0x7e.c | 48 +++++++++++++++++++++++++----------------------- src/0x7c0x7c0x7e.c | 10 ++++++---- src/drip.c | 2 +- src/lpt.c | 4 ++-- src/pack~.c | 4 ++-- src/relay.c | 2 +- src/sfplay.c | 2 +- src/sgn~.c | 3 ++- src/zexy.c | 2 +- 12 files changed, 110 insertions(+), 99 deletions(-) (limited to 'src') diff --git a/src/0x260x260x7e.c b/src/0x260x260x7e.c index 8304d84..8a37cc9 100644 --- a/src/0x260x260x7e.c +++ b/src/0x260x260x7e.c @@ -30,13 +30,13 @@ static t_class *andand_tilde_class, *scalarandand_tilde_class; typedef struct _andand_tilde { t_object x_obj; - float x_f; + t_float x_f; } t_andand_tilde; typedef struct _scalarandand_tilde { t_object x_obj; - float x_f; + t_float x_f; t_float x_g; /* inlet value */ } t_scalarandand_tilde; @@ -65,9 +65,9 @@ static void *andand_tilde_new(t_symbol *s, int argc, t_atom *argv) static t_int *andand_tilde_perform(t_int *w) { - t_float *in1 = (t_float *)(w[1]); - t_float *in2 = (t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in1 = (t_sample *)(w[1]); + t_sample *in2 = (t_sample *)(w[2]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); while (n--){ int f=(int)*in1++; @@ -79,9 +79,9 @@ static t_int *andand_tilde_perform(t_int *w) static t_int *andand_tilde_perf8(t_int *w) { - t_float *in1 = (t_float *)(w[1]); - t_float *in2 = (t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in1 = (t_sample *)(w[1]); + 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) { @@ -99,19 +99,19 @@ static t_int *andand_tilde_perf8(t_int *w) static t_int *scalarandand_tilde_perform(t_int *w) { - t_float *in = (t_float *)(w[1]); - t_float f = *(t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in = (t_sample *)(w[1]); + int f = *(t_float *)(w[2]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); - while (n--) *out++ = (int)*in++ && (int)f; + while (n--) *out++ = (int)*in++ && f; return (w+5); } static t_int *scalarandand_tilde_perf8(t_int *w) { - t_float *in = (t_float *)(w[1]); + t_sample *in = (t_sample *)(w[1]); int g = *(t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); for (; n; n -= 8, in += 8, out += 8) { @@ -178,7 +178,7 @@ static t_int *scalarandand_tilde_performSSE(t_int *w) { __m128 *in = (__m128 *)(w[1]); __m128 *out = (__m128 *)(w[3]); - t_float f = *(t_float *)(w[2]); + float f = *(t_float *)(w[2]); __m128 scalar = _mm_set1_ps(f); int n = (int)(w[4])>>4; @@ -231,7 +231,8 @@ static void andand_tilde_dsp(t_andand_tilde *x, t_signal **sp) Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in1)&& Z_SIMD_CHKALIGN(in2)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(andand_tilde_performSSE, 4, in1, in2, out, n); @@ -255,7 +256,8 @@ static void scalarandand_tilde_dsp(t_scalarandand_tilde *x, t_signal **sp) if( Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(scalarandand_tilde_performSSE, 4, in, &x->x_g, out, n); diff --git a/src/0x3c0x7e.c b/src/0x3c0x7e.c index 0333553..c7d5d8b 100644 --- a/src/0x3c0x7e.c +++ b/src/0x3c0x7e.c @@ -31,13 +31,13 @@ static t_class *lt_tilde_class, *scalarlt_tilde_class; typedef struct _lt_tilde { t_object x_obj; - float x_f; + t_float x_f; } t_lt_tilde; typedef struct _scalarlt_tilde { t_object x_obj; - float x_f; + t_float x_f; t_float x_g; /* inlet value */ } t_scalarlt_tilde; @@ -66,9 +66,9 @@ static void *lt_tilde_new(t_symbol *s, int argc, t_atom *argv) static t_int *lt_tilde_perform(t_int *w) { - t_float *in1 = (t_float *)(w[1]); - t_float *in2 = (t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in1 = (t_sample *)(w[1]); + t_sample *in2 = (t_sample *)(w[2]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); while (n--) *out++ = *in1++ < *in2++; return (w+5); @@ -76,17 +76,17 @@ static t_int *lt_tilde_perform(t_int *w) static t_int *lt_tilde_perf8(t_int *w) { - t_float *in1 = (t_float *)(w[1]); - t_float *in2 = (t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in1 = (t_sample *)(w[1]); + 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) { - float f0 = in1[0], f1 = in1[1], f2 = in1[2], f3 = in1[3]; - float f4 = in1[4], f5 = in1[5], f6 = in1[6], f7 = in1[7]; + 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]; - float g0 = in2[0], g1 = in2[1], g2 = in2[2], g3 = in2[3]; - float g4 = in2[4], g5 = in2[5], g6 = in2[6], g7 = in2[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; @@ -96,9 +96,9 @@ static t_int *lt_tilde_perf8(t_int *w) static t_int *scalarlt_tilde_perform(t_int *w) { - t_float *in = (t_float *)(w[1]); - t_float f = *(t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in = (t_sample *)(w[1]); + t_sample f = *(t_float *)(w[2]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); while (n--) *out++ = *in++ < f; return (w+5); @@ -106,14 +106,14 @@ static t_int *scalarlt_tilde_perform(t_int *w) static t_int *scalarlt_tilde_perf8(t_int *w) { - t_float *in = (t_float *)(w[1]); - t_float g = *(t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in = (t_sample *)(w[1]); + 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) { - float f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3]; - float f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7]; + 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; @@ -154,7 +154,7 @@ static t_int *scalarlt_tilde_performSSE(t_int *w) { __m128 *in = (__m128 *)(w[1]); __m128 *out = (__m128 *)(w[3]); - t_float f = *(t_float *)(w[2]); + float f = *(t_float *)(w[2]); __m128 scalar = _mm_set1_ps(f); int n = (int)(w[4])>>4; const __m128 one = _mm_set1_ps(1.f); @@ -193,7 +193,8 @@ static void lt_tilde_dsp(t_lt_tilde *x, t_signal **sp) Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in1)&& Z_SIMD_CHKALIGN(in2)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(lt_tilde_performSSE, 4, in1, in2, out, n); @@ -215,7 +216,8 @@ static void scalarlt_tilde_dsp(t_scalarlt_tilde *x, t_signal **sp) if( Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(scalarlt_tilde_performSSE, 4, in, &x->x_g, out, n); diff --git a/src/0x3d0x3d0x7e.c b/src/0x3d0x3d0x7e.c index 132f9ce..f1c9ebf 100644 --- a/src/0x3d0x3d0x7e.c +++ b/src/0x3d0x3d0x7e.c @@ -28,13 +28,13 @@ static t_class *eq_tilde_class, *scalareq_tilde_class; typedef struct _eq_tilde { t_object x_obj; - float x_f; + t_float x_f; } t_eq_tilde; typedef struct _scalareq_tilde { t_object x_obj; - float x_f; + t_float x_f; t_float x_g; /* inlet value */ } t_scalareq_tilde; @@ -63,9 +63,9 @@ static void *eq_tilde_new(t_symbol *s, int argc, t_atom *argv) static t_int *eq_tilde_perform(t_int *w) { - t_float *in1 = (t_float *)(w[1]); - t_float *in2 = (t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in1 = (t_sample *)(w[1]); + t_sample *in2 = (t_sample *)(w[2]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); while (n--) *out++ = (*in1++ == *in2++); return (w+5); @@ -73,17 +73,17 @@ static t_int *eq_tilde_perform(t_int *w) static t_int *eq_tilde_perf8(t_int *w) { - t_float *in1 = (t_float *)(w[1]); - t_float *in2 = (t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in1 = (t_sample *)(w[1]); + 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) { - float f0 = in1[0], f1 = in1[1], f2 = in1[2], f3 = in1[3]; - float f4 = in1[4], f5 = in1[5], f6 = in1[6], f7 = in1[7]; + 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]; - float g0 = in2[0], g1 = in2[1], g2 = in2[2], g3 = in2[3]; - float g4 = in2[4], g5 = in2[5], g6 = in2[6], g7 = in2[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; @@ -93,9 +93,9 @@ static t_int *eq_tilde_perf8(t_int *w) static t_int *scalareq_tilde_perform(t_int *w) { - t_float *in = (t_float *)(w[1]); - t_float f = *(t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in = (t_sample *)(w[1]); + t_sample f = *(t_float *)(w[2]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); while (n--) *out++ = (*in++ == f); return (w+5); @@ -103,14 +103,14 @@ static t_int *scalareq_tilde_perform(t_int *w) static t_int *scalareq_tilde_perf8(t_int *w) { - t_float *in = (t_float *)(w[1]); - t_float g = *(t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in = (t_sample *)(w[1]); + 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) { - float f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3]; - float f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7]; + 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); @@ -152,7 +152,7 @@ static t_int *scalareq_tilde_performSSE(t_int *w) { __m128 *in = (__m128 *)(w[1]); __m128 *out = (__m128 *)(w[3]); - t_float f = *(t_float *)(w[2]); + float f = *(float *)(w[2]); __m128 scalar = _mm_set1_ps(f); int n = (int)(w[4])>>4; const __m128 one = _mm_set1_ps(1.f); @@ -193,7 +193,8 @@ static void eq_tilde_dsp(t_eq_tilde *x, t_signal **sp) Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in1)&& Z_SIMD_CHKALIGN(in2)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(eq_tilde_performSSE, 4, in1, in2, out, n); @@ -215,7 +216,8 @@ static void scalareq_tilde_dsp(t_scalareq_tilde *x, t_signal **sp) if( Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out) && + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(scalareq_tilde_performSSE, 4, in, &x->x_g, out, n); diff --git a/src/0x3e0x7e.c b/src/0x3e0x7e.c index fd1e6be..03522ee 100644 --- a/src/0x3e0x7e.c +++ b/src/0x3e0x7e.c @@ -30,13 +30,13 @@ static t_class *gt_tilde_class, *scalargt_tilde_class; typedef struct _gt_tilde { t_object x_obj; - float x_f; + t_float x_f; } t_gt_tilde; typedef struct _scalargt_tilde { t_object x_obj; - float x_f; + t_float x_f; t_float x_g; /* inlet value */ } t_scalargt_tilde; @@ -65,9 +65,9 @@ static void *gt_tilde_new(t_symbol *s, int argc, t_atom *argv) static t_int *gt_tilde_perform(t_int *w) { - t_float *in1 = (t_float *)(w[1]); - t_float *in2 = (t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in1 = (t_sample *)(w[1]); + t_sample *in2 = (t_sample *)(w[2]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); while (n--) *out++ = *in1++ > *in2++; return (w+5); @@ -75,17 +75,17 @@ static t_int *gt_tilde_perform(t_int *w) static t_int *gt_tilde_perf8(t_int *w) { - t_float *in1 = (t_float *)(w[1]); - t_float *in2 = (t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in1 = (t_sample *)(w[1]); + 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) { - float f0 = in1[0], f1 = in1[1], f2 = in1[2], f3 = in1[3]; - float f4 = in1[4], f5 = in1[5], f6 = in1[6], f7 = in1[7]; + 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]; - float g0 = in2[0], g1 = in2[1], g2 = in2[2], g3 = in2[3]; - float g4 = in2[4], g5 = in2[5], g6 = in2[6], g7 = in2[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; @@ -95,9 +95,9 @@ static t_int *gt_tilde_perf8(t_int *w) static t_int *scalargt_tilde_perform(t_int *w) { - t_float *in = (t_float *)(w[1]); - t_float f = *(t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in = (t_sample *)(w[1]); + t_sample f = *(t_float *)(w[2]); + t_sample *out = (t_sample *)(w[3]); int n = (int)(w[4]); while (n--) *out++ = *in++ > f; return (w+5); @@ -105,14 +105,14 @@ static t_int *scalargt_tilde_perform(t_int *w) static t_int *scalargt_tilde_perf8(t_int *w) { - t_float *in = (t_float *)(w[1]); - t_float g = *(t_float *)(w[2]); - t_float *out = (t_float *)(w[3]); + t_sample *in = (t_sample *)(w[1]); + 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) { - float f0 = in[0], f1 = in[1], f2 = in[2], f3 = in[3]; - float f4 = in[4], f5 = in[5], f6 = in[6], f7 = in[7]; + 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; @@ -153,7 +153,7 @@ static t_int *scalargt_tilde_performSSE(t_int *w) { __m128 *in = (__m128 *)(w[1]); __m128 *out = (__m128 *)(w[3]); - t_float f = *(t_float *)(w[2]); + float f = *(t_float *)(w[2]); __m128 scalar = _mm_set1_ps(f); int n = (int)(w[4])>>4; const __m128 one = _mm_set1_ps(1.f); @@ -195,7 +195,8 @@ static void gt_tilde_dsp(t_gt_tilde *x, t_signal **sp) Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in1)&& Z_SIMD_CHKALIGN(in2)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(gt_tilde_performSSE, 4, in1, in2, out, n); @@ -217,7 +218,8 @@ static void scalargt_tilde_dsp(t_scalargt_tilde *x, t_signal **sp) if( Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(scalargt_tilde_performSSE, 4, in, &x->x_g, out, n); diff --git a/src/0x7c0x7c0x7e.c b/src/0x7c0x7c0x7e.c index d0b765f..457a857 100644 --- a/src/0x7c0x7c0x7e.c +++ b/src/0x7c0x7c0x7e.c @@ -28,13 +28,13 @@ static t_class *oror_tilde_class, *scalaroror_tilde_class; typedef struct _oror_tilde { t_object x_obj; - float x_f; + t_float x_f; } t_oror_tilde; typedef struct _scalaroror_tilde { t_object x_obj; - float x_f; + t_float x_f; t_float x_g; /* inlet value */ } t_scalaroror_tilde; @@ -209,7 +209,8 @@ static void oror_tilde_dsp(t_oror_tilde *x, t_signal **sp) Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in1)&& Z_SIMD_CHKALIGN(in2)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(oror_tilde_performSSE, 4, in1, in2, out, n); @@ -231,7 +232,8 @@ static void scalaroror_tilde_dsp(t_scalaroror_tilde *x, t_signal **sp) if( Z_SIMD_CHKBLOCKSIZE(n)&& Z_SIMD_CHKALIGN(in)&& - Z_SIMD_CHKALIGN(out) + Z_SIMD_CHKALIGN(out)&& + ZEXY_TYPE_EQUAL(t_sample, float) ) { dsp_add(scalaroror_tilde_performSSE, 4, in, &x->x_g, out, n); diff --git a/src/drip.c b/src/drip.c index 9ac771c..5be3d15 100644 --- a/src/drip.c +++ b/src/drip.c @@ -37,7 +37,7 @@ typedef struct _drip int bufsize; t_clock *x_clock; - float deltime; + t_float deltime; int flush; } t_drip; diff --git a/src/lpt.c b/src/lpt.c index 6ca46ad..42d986f 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -147,11 +147,11 @@ static void lpt_bang(t_lpt *x) if (x->device>0){ unsigned char b=0; ioctl (x->device, PPRCONTROL, &b); - outlet_float(x->x_obj.ob_outlet, (float)b); + outlet_float(x->x_obj.ob_outlet, (t_float)b); } else # endif if (x->port) { - outlet_float(x->x_obj.ob_outlet, (float)sys_inb(x->port+1)); + outlet_float(x->x_obj.ob_outlet, (t_float)sys_inb(x->port+1)); } #endif /* Z_WANT_LPT */ } diff --git a/src/pack~.c b/src/pack~.c index 79c7430..e195573 100644 --- a/src/pack~.c +++ b/src/pack~.c @@ -43,8 +43,8 @@ static t_int *sigpack_perform(t_int *w) SETFLOAT(&buf[i], f); i++; } -#ifndef __WIN32__ -#warning defer list-output to next block with a clock! +#ifdef __GNUC__ +# warning defer list-output to next block with a clock! #endif outlet_list(x->x_obj.ob_outlet, &s_list, x->vector_length, x->buffer); diff --git a/src/relay.c b/src/relay.c index e0609df..5447dbd 100644 --- a/src/relay.c +++ b/src/relay.c @@ -74,7 +74,7 @@ static void relay_list(t_relay *x, t_symbol *sel, int argc, t_atom *argv) int nelement; if (x->x_type == A_FLOAT) { - float f; + t_float f; if (!argc){ outlet_bang(x->x_rejectout); return; diff --git a/src/sfplay.c b/src/sfplay.c index 5a9e145..74805f2 100644 --- a/src/sfplay.c +++ b/src/sfplay.c @@ -251,7 +251,7 @@ static void sfplay_start(t_sfplay *x) #endif /* new offset postion ? (fom inlet offset) */ - if( ((float) of) != x->x_offset) + if( ((t_float) of) != x->x_offset) { x->skip=1; x->x_offset = of; diff --git a/src/sgn~.c b/src/sgn~.c index 2797916..501c1de 100644 --- a/src/sgn~.c +++ b/src/sgn~.c @@ -39,7 +39,8 @@ static t_int *sgnTilde_perform(t_int *w) int n = (int)(w[3]); t_sample x; while (n--) { - if ((x=*in++)>0.) *out++=1.; + x=*in++; + if (x>0.) *out++=1.; else if (x<0.) *out++=-1.; else *out++=0.; } diff --git a/src/zexy.c b/src/zexy.c index 94d6779..0451a9b 100644 --- a/src/zexy.c +++ b/src/zexy.c @@ -166,4 +166,4 @@ void verbose(int level, const char *fmt, ...){ post("zverbose(%d): %s", level, buf); } -#endif \ No newline at end of file +#endif -- cgit v1.2.1