diff options
Diffstat (limited to 'src/tab_div.c')
| -rw-r--r-- | src/tab_div.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/tab_div.c b/src/tab_div.c index 6624dbf..c5bfd89 100644 --- a/src/tab_div.c +++ b/src/tab_div.c @@ -1,13 +1,14 @@ /* For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. -iem_tab written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 */ +iem_tab written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 */ #include "m_pd.h" #include "iemlib.h" #include "iem_tab.h" /* -------------------------- tab_div ------------------------------ */ +/* x_beg_mem_dst[i] = x_beg_mem_src1[i]/x_offset_src2[i] */ typedef struct _tab_div { @@ -18,9 +19,9 @@ typedef struct _tab_div int x_offset_src1; int x_offset_src2; int x_offset_dst; - t_float *x_beg_mem_src1; - t_float *x_beg_mem_src2; - t_float *x_beg_mem_dst; + iemarray_t *x_beg_mem_src1; + iemarray_t *x_beg_mem_src2; + iemarray_t *x_beg_mem_dst; t_symbol *x_sym_scr1; t_symbol *x_sym_scr2; t_symbol *x_sym_dst; @@ -47,7 +48,7 @@ static void tab_div_bang(t_tab_div *x) { int i, n; int ok_src1, ok_src2, ok_dst; - t_float *vec_src1, *vec_src2, *vec_dst; + iemarray_t *vec_src1, *vec_src2, *vec_dst; ok_src1 = iem_tab_check_arrays(gensym("tab_div"), x->x_sym_scr1, &x->x_beg_mem_src1, &x->x_size_src1, 0); ok_src2 = iem_tab_check_arrays(gensym("tab_div"), x->x_sym_scr2, &x->x_beg_mem_src2, &x->x_size_src2, 0); @@ -71,10 +72,10 @@ static void tab_div_bang(t_tab_div *x) for(i=0; i<n; i++) { - if(vec_src2[i] == 0.0f) - vec_dst[i] = 0.0f; + if(iemarray_getfloat(vec_src2, i) == 0.0f) + iemarray_setfloat(vec_dst, i, 0.0f); else - vec_dst[i] = vec_src1[i] / vec_src2[i]; + iemarray_setfloat(vec_dst, i, iemarray_getfloat(vec_src1, i) / iemarray_getfloat(vec_src2, i)); } outlet_bang(x->x_obj.ob_outlet); a = (t_garray *)pd_findbyclass(x->x_sym_dst, garray_class); @@ -88,7 +89,7 @@ static void tab_div_list(t_tab_div *x, t_symbol *s, int argc, t_atom *argv) int beg_src1, beg_src2, beg_dst; int i, n; int ok_src1, ok_src2, ok_dst; - t_float *vec_src1, *vec_src2, *vec_dst; + iemarray_t *vec_src1, *vec_src2, *vec_dst; if((argc >= 4) && IS_A_FLOAT(argv,0) && @@ -124,10 +125,10 @@ static void tab_div_list(t_tab_div *x, t_symbol *s, int argc, t_atom *argv) for(i=0; i<n; i++) { - if(vec_src2[i] == 0.0f) - vec_dst[i] = 0.0f; + if(iemarray_getfloat(vec_src2, i) == 0.0f) + iemarray_setfloat(vec_dst, i, 0.0f); else - vec_dst[i] = vec_src1[i] / vec_src2[i]; + iemarray_setfloat(vec_dst, i, iemarray_getfloat(vec_src1, i) / iemarray_getfloat(vec_src2, i)); } outlet_bang(x->x_obj.ob_outlet); a = (t_garray *)pd_findbyclass(x->x_sym_dst, garray_class); @@ -150,7 +151,6 @@ static void *tab_div_new(t_symbol *s, int argc, t_atom *argv) { t_tab_div *x = (t_tab_div *)pd_new(tab_div_class); t_symbol *src1, *src2, *dst; - t_float time; if((argc >= 3) && IS_A_SYMBOL(argv,0) && |