diff --git a/src/g_canvas.c b/src/g_canvas.c index 1d3044ffb86b611190ac2ee0c170c9da036e1c45..6ed6165cb9520fdc71290c465fe661e09009e9e0 100644 --- a/src/g_canvas.c +++ b/src/g_canvas.c @@ -1255,8 +1255,8 @@ static void canvas_dodsp(t_canvas *x, int toplevel, t_signal **sp) /* find all the "dsp" boxes and add them to the graph */ ob = &x->gl_magic_glass->x_obj; - if (ob && x->gl_magic_glass->x_connectedObj != NULL) { - fprintf(stderr,"adding cord inspector to dsp\n"); + if (ob && x->gl_magic_glass->x_connectedObj) { + //fprintf(stderr,"adding cord inspector to dsp\n"); ugen_add(dc, ob); // this t_canvas could be an array, hence no gl_magic_glass } diff --git a/src/g_magicglass.c b/src/g_magicglass.c index 37dcaf6f631a4403d329c8055bd3550f1a788a2b..3c79a5a1c38302efcd837d87f50e47b8db65f995 100644 --- a/src/g_magicglass.c +++ b/src/g_magicglass.c @@ -42,7 +42,7 @@ void magicGlass_bind(t_magicGlass *x, t_object *obj, int outno) //fprintf(stderr,"magicglass_bind\n"); if (x->x_connectedObj != obj) { - if (x->x_connectedObj != NULL) + if (x->x_connectedObj) { obj_disconnect(x->x_connectedObj, x->x_connectedOutno, @@ -60,7 +60,7 @@ void magicGlass_bind(t_magicGlass *x, t_object *obj, int outno) void magicGlass_unbind(t_magicGlass *x) { //fprintf(stderr,"magicglass_unbind\n"); - if (x->x_connectedObj != NULL) + if (x->x_connectedObj) { obj_disconnect(x->x_connectedObj, x->x_connectedOutno, @@ -352,9 +352,9 @@ void magicGlass_setDsp(t_magicGlass *x, int i) t_int *magicGlass_perform(t_int *w) { t_magicGlass *x = (t_magicGlass *)(w[1]); - if (x->x_dspOn && x->x_connectedObj != NULL) + if (x->x_dspOn && x->x_connectedObj) { - fprintf(stderr,"magicglass_perform\n"); + //fprintf(stderr,"magicglass_perform\n"); float *in = (float *)(w[2]); int N = (int)(w[3]); int i; diff --git a/src/m_pd.h b/src/m_pd.h index 1d32559f4fde7e6bce5ee4a74898f76bb0a710ed..fad2133d47102b92598df8bab2e7ee5135bddb5f 100644 --- a/src/m_pd.h +++ b/src/m_pd.h @@ -11,7 +11,7 @@ extern "C" { #define PD_MAJOR_VERSION 0 #define PD_MINOR_VERSION 42 #define PD_BUGFIX_VERSION 5 -#define PD_TEST_VERSION "extended-l2ork-20110201" +#define PD_TEST_VERSION "extended-l2ork-20110210" /* old name for "MSW" flag -- we have to take it for the sake of many old "nmakefiles" for externs, which will define NT and not MSW */