diff options
Diffstat (limited to 'src/ambi_decode_cube.c')
| -rw-r--r-- | src/ambi_decode_cube.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/src/ambi_decode_cube.c b/src/ambi_decode_cube.c index 8e0d643..154eab7 100644 --- a/src/ambi_decode_cube.c +++ b/src/ambi_decode_cube.c @@ -3,19 +3,9 @@ iem_ambi written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2005 */ -#ifdef NT -#pragma warning( disable : 4244 ) -#pragma warning( disable : 4305 ) -#endif - - #include "m_pd.h" #include "iemlib.h" #include <math.h> -#include <stdio.h> -#include <string.h> - - /* -------------------------- ambi_decode_cube ------------------------------ */ /* @@ -338,13 +328,13 @@ static void ambi_decode_cube_pinv(t_ambi_decode_cube *x) n = x->x_mirrorsum_beg*x->x_n_ambi; real=x->x_prod; - SETFLOAT(at, (float)x->x_n_ambi); + SETFLOAT(at, (t_float)x->x_n_ambi); at++; - SETFLOAT(at, (float)x->x_mirrorsum_beg); + SETFLOAT(at, (t_float)x->x_mirrorsum_beg); at++; for(i=0; i<n; i++) { - SETFLOAT(at, (float)(*real)); + SETFLOAT(at, (t_float)(*real)); real++; at++; } @@ -356,13 +346,13 @@ static void ambi_decode_cube_pinv(t_ambi_decode_cube *x) double *dv=x->x_prod; // post("real"); - SETFLOAT(at, (float)x->x_n_ambi); + SETFLOAT(at, (t_float)x->x_n_ambi); at++; - SETFLOAT(at, (float)x->x_n_ls); + SETFLOAT(at, (t_float)x->x_n_ls); at++; for(i=0; i<n; i++) { - SETFLOAT(at, (float)(*dv)); + SETFLOAT(at, (t_float)(*dv)); dv++; at++; } @@ -759,8 +749,8 @@ static void *ambi_decode_cube_new(t_symbol *s, int argc, t_atom *argv) x->x_at = (t_atom *)getbytes((x->x_n_ls * x->x_n_ambi + 2) * sizeof(t_atom)); x->x_s_matrix = gensym("matrix"); /*change*/ - SETFLOAT(x->x_at, (float)x->x_n_ls); - SETFLOAT(x->x_at+1, (float)x->x_n_ambi); + SETFLOAT(x->x_at, (t_float)x->x_n_ls); + SETFLOAT(x->x_at+1, (t_float)x->x_n_ambi); x->x_sqrt3 = sqrt(3.0); x->x_sqrt5_2 = sqrt(5.0) / 2.0; x->x_sqrt6_4 = sqrt(6.0) / 4.0; |