From 4f8c7c28f8ece71d15ed28ae30f253725f1efa39 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sat, 20 Oct 2012 18:32:25 +0000 Subject: update code format to pd-style: astyle --style=ansi --align-pointer=name *.c svn path=/trunk/externals/moonlib/; revision=16427 --- mknob.c | 645 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 332 insertions(+), 313 deletions(-) (limited to 'mknob.c') diff --git a/mknob.c b/mknob.c index f96f028..ee924ee 100644 --- a/mknob.c +++ b/mknob.c @@ -53,54 +53,54 @@ static void mknob_update_knob(t_mknob *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); // float val=(x->x_val + 50.0)/100.0/MKNOB_TANGLE; - float val=(x->x_val + 50.0)/100.0/x->x_H; - float angle, - radius=x->x_gui.x_w/2.0, - miniradius=MKNOB_THICK; - int x0,y0,x1,y1,xc,yc,xp,yp,xpc,ypc; + float val=(x->x_val + 50.0)/100.0/x->x_H; + float angle, + radius=x->x_gui.x_w/2.0, + miniradius=MKNOB_THICK; + int x0,y0,x1,y1,xc,yc,xp,yp,xpc,ypc; x0=text_xpix(&x->x_gui.x_obj, glist); y0=text_ypix(&x->x_gui.x_obj, glist); - x1=x0+x->x_gui.x_w; - y1=y0+x->x_gui.x_w; - xc=(x0+x1)/2; - yc=(y0+y1)/2; - - if(x->x_gui.x_h<0) - angle=val*(M_PI*2)+M_PI/2.0; - else - angle=val*(M_PI*1.5)+3.0*M_PI/4.0; - - xp=xc+radius*cos(angle); - yp=yc+radius*sin(angle); - xpc=miniradius*cos(angle-M_PI/2); - ypc=miniradius*sin(angle-M_PI/2); - - sys_vgui(".x%lx.c coords %xKNOB %d %d %d %d %d %d\n", - canvas,x,xp,yp,xc+xpc,yc+ypc,xc-xpc,yc-ypc); + x1=x0+x->x_gui.x_w; + y1=y0+x->x_gui.x_w; + xc=(x0+x1)/2; + yc=(y0+y1)/2; + + if(x->x_gui.x_h<0) + angle=val*(M_PI*2)+M_PI/2.0; + else + angle=val*(M_PI*1.5)+3.0*M_PI/4.0; + + xp=xc+radius*cos(angle); + yp=yc+radius*sin(angle); + xpc=miniradius*cos(angle-M_PI/2); + ypc=miniradius*sin(angle-M_PI/2); + + sys_vgui(".x%lx.c coords %xKNOB %d %d %d %d %d %d\n", + canvas,x,xp,yp,xc+xpc,yc+ypc,xc-xpc,yc-ypc); } static void mknob_draw_update(t_mknob *x, t_glist *glist) { if (glist_isvisible(glist)) { - mknob_update_knob(x,glist); - - /*if(x->x_val == x->x_center) - { - if(!x->x_thick) - { - sys_vgui(".x%lx.c itemconfigure %xKNOB -width 7\n", canvas, x); - x->x_thick = 1; - } - } - else - { - if(x->x_thick) - { - sys_vgui(".x%lx.c itemconfigure %xKNOB -width 3\n", canvas, x); - x->x_thick = 0; - } - }*/ + mknob_update_knob(x,glist); + + /*if(x->x_val == x->x_center) + { + if(!x->x_thick) + { + sys_vgui(".x%lx.c itemconfigure %xKNOB -width 7\n", canvas, x); + x->x_thick = 1; + } + } + else + { + if(x->x_thick) + { + sys_vgui(".x%lx.c itemconfigure %xKNOB -width 3\n", canvas, x); + x->x_thick = 0; + } + }*/ } } @@ -109,31 +109,31 @@ static void mknob_draw_new(t_mknob *x, t_glist *glist) int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); int r = xpos + (x->x_val + 50)/100; - int xc=xpos+x->x_gui.x_w/2; - int yc=ypos+x->x_gui.x_w/2; + int xc=xpos+x->x_gui.x_w/2; + int yc=ypos+x->x_gui.x_w/2; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui(".x%lx.c create oval %d %d %d %d -fill #%6.6x -tags %xBASE\n", - canvas,xpos,ypos,xpos + x->x_gui.x_w, ypos + x->x_gui.x_w, - x->x_gui.x_bcol,x); - sys_vgui(".x%lx.c create polygon %d %d %d %d %d %d -fill #%6.6x -tags %xKNOB\n", - glist_getcanvas(glist), - xc,ypos,xc-4,yc,xc+4,yc,x->x_gui.x_fcol,x); - mknob_update_knob(x,glist); + sys_vgui(".x%lx.c create oval %d %d %d %d -fill #%6.6x -tags %xBASE\n", + canvas,xpos,ypos,xpos + x->x_gui.x_w, ypos + x->x_gui.x_w, + x->x_gui.x_bcol,x); + sys_vgui(".x%lx.c create polygon %d %d %d %d %d %d -fill #%6.6x -tags %xKNOB\n", + glist_getcanvas(glist), + xc,ypos,xc-4,yc,xc+4,yc,x->x_gui.x_fcol,x); + mknob_update_knob(x,glist); sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \ -font {{%s} %d bold} -fill #%6.6x -tags %xLABEL\n", - canvas, xpos+x->x_gui.x_ldx, - ypos+x->x_gui.x_ldy, - strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", - x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); + canvas, xpos+x->x_gui.x_ldx, + ypos+x->x_gui.x_ldy, + strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", + x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); /*if(!x->x_gui.x_fsf.x_snd_able) sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, - xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w, x, 0); + canvas, xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, + xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w, x, 0); if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, xpos+ x->x_gui.x_w/2-3, ypos, - xpos+ x->x_gui.x_w/2+4, ypos+1, x, 0);*/ + sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xIN%d\n", + canvas, xpos+ x->x_gui.x_w/2-3, ypos, + xpos+ x->x_gui.x_w/2+4, ypos+1, x, 0);*/ } static void mknob_draw_move(t_mknob *x, t_glist *glist) @@ -144,25 +144,25 @@ static void mknob_draw_move(t_mknob *x, t_glist *glist) t_canvas *canvas=glist_getcanvas(glist); sys_vgui(".x%lx.c coords %xBASE %d %d %d %d\n", - canvas, x, - xpos, ypos, - xpos + x->x_gui.x_w, ypos + x->x_gui.x_w); + canvas, x, + xpos, ypos, + xpos + x->x_gui.x_w, ypos + x->x_gui.x_w); mknob_update_knob(x,glist); sys_vgui(".x%lx.c coords %xLABEL %d %d\n", - canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); + canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); /*if(!x->x_gui.x_fsf.x_snd_able) sys_vgui(".x%lx.c coords %xOUT%d %d %d %d %d\n", - canvas, x, 0, - xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, - xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w); + canvas, x, 0, + xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, + xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w); if(!x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%lx.c coords %xIN%d %d %d %d %d\n", - canvas, x, 0, - xpos+ x->x_gui.x_w/2-3, ypos, - xpos+ x->x_gui.x_w/2+4, ypos+1);*/ + sys_vgui(".x%lx.c coords %xIN%d %d %d %d %d\n", + canvas, x, 0, + xpos+ x->x_gui.x_w/2-3, ypos, + xpos+ x->x_gui.x_w/2+4, ypos+1);*/ } -static void mknob_draw_erase(t_mknob* x,t_glist* glist) +static void mknob_draw_erase(t_mknob *x,t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); @@ -175,19 +175,19 @@ static void mknob_draw_erase(t_mknob* x,t_glist* glist) sys_vgui(".x%lx.c delete %xIN%d\n", canvas, x, 0);*/ } -static void mknob_draw_config(t_mknob* x,t_glist* glist) +static void mknob_draw_config(t_mknob *x,t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); sys_vgui(".x%lx.c itemconfigure %xLABEL -font {{%s} %d bold} -fill #%6.6x -text {%s} \n", - canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, - x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, - strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); + canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, + x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, + strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); sys_vgui(".x%lx.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); sys_vgui(".x%lx.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); } -static void mknob_draw_io(t_mknob* x,t_glist* glist, int old_snd_rcv_flags) +static void mknob_draw_io(t_mknob *x,t_glist *glist, int old_snd_rcv_flags) { int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); @@ -195,61 +195,61 @@ static void mknob_draw_io(t_mknob* x,t_glist* glist, int old_snd_rcv_flags) /*if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xOUT%d\n", - canvas, xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, - xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w, x, 0); + canvas, xpos+ x->x_gui.x_w/2-3, ypos + x->x_gui.x_w-1, + xpos+ x->x_gui.x_w/2+4, ypos + x->x_gui.x_w, x, 0); if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) sys_vgui(".x%lx.c delete %xOUT%d\n", canvas, x, 0); if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xIN%d\n", - canvas, xpos+ x->x_gui.x_w/2-3, ypos, - xpos+ x->x_gui.x_w/2+4, ypos+1, x, 0); + canvas, xpos+ x->x_gui.x_w/2-3, ypos, + xpos+ x->x_gui.x_w/2+4, ypos+1, x, 0); if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) - sys_vgui(".x%lx.c delete %xIN%d\n", canvas, x, 0);*/ + sys_vgui(".x%lx.c delete %xIN%d\n", canvas, x, 0);*/ } -static void mknob_draw_select(t_mknob* x,t_glist* glist) +static void mknob_draw_select(t_mknob *x,t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); if(x->x_gui.x_fsf.x_selected) { - //pd_bind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym); - sys_vgui(".x%lx.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); - sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + //pd_bind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym); + sys_vgui(".x%lx.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); + sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); } else { - //pd_unbind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym); - sys_vgui(".x%lx.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); - sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); + //pd_unbind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym); + sys_vgui(".x%lx.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); + sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); } } void mknob_draw(t_mknob *x, t_glist *glist, int mode) { if(mode == IEM_GUI_DRAW_MODE_UPDATE) - mknob_draw_update(x, glist); + mknob_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) - mknob_draw_move(x, glist); + mknob_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) - mknob_draw_new(x, glist); + mknob_draw_new(x, glist); else if(mode == IEM_GUI_DRAW_MODE_SELECT) - mknob_draw_select(x, glist); + mknob_draw_select(x, glist); else if(mode == IEM_GUI_DRAW_MODE_ERASE) - mknob_draw_erase(x, glist); + mknob_draw_erase(x, glist); else if(mode == IEM_GUI_DRAW_MODE_CONFIG) - mknob_draw_config(x, glist); + mknob_draw_config(x, glist); /*else if(mode >= IEM_GUI_DRAW_MODE_IO) - mknob_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO);*/ + mknob_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO);*/ } /* ------------------------ mknob widgetbehaviour----------------------------- */ static void mknob_getrect(t_gobj *z, t_glist *glist, - int *xp1, int *yp1, int *xp2, int *yp2) + int *xp1, int *yp1, int *xp2, int *yp2) { - t_mknob* x = (t_mknob*)z; + t_mknob *x = (t_mknob *)z; *xp1 = text_xpix(&x->x_gui.x_obj, glist); *yp1 = text_ypix(&x->x_gui.x_obj, glist); @@ -265,86 +265,86 @@ static void mknob_save(t_gobj *z, t_binbuf *b) iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiiffiisssiiiiiiiii", gensym("#X"),gensym("obj"), - (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), - x->x_gui.x_w, x->x_gui.x_h, - (float)x->x_min, (float)x->x_max, - x->x_lin0_log1, iem_symargstoint(&x->x_gui.x_isa), - srl[0], srl[1], srl[2], - x->x_gui.x_ldx, x->x_gui.x_ldy, - iem_fstyletoint(&x->x_gui.x_fsf), x->x_gui.x_fontsize, - bflcol[0], bflcol[1], bflcol[2], - x->x_val, x->x_steady); + (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, + atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)), + x->x_gui.x_w, x->x_gui.x_h, + (float)x->x_min, (float)x->x_max, + x->x_lin0_log1, iem_symargstoint(&x->x_gui.x_isa), + srl[0], srl[1], srl[2], + x->x_gui.x_ldx, x->x_gui.x_ldy, + iem_fstyletoint(&x->x_gui.x_fsf), x->x_gui.x_fontsize, + bflcol[0], bflcol[1], bflcol[2], + x->x_val, x->x_steady); binbuf_addv(b, ";"); } void mknob_check_wh(t_mknob *x, int w, int h) { int H; - - if(w < MKNOB_MINSIZE) w = MKNOB_MINSIZE; + + if(w < MKNOB_MINSIZE) w = MKNOB_MINSIZE; x->x_gui.x_w = w; - + if(h < -1) h=-1; if((h>0)&&(h<20)) h=20; x->x_gui.x_h = h; - - H=x->x_gui.x_h; - if(H<0) H=360; - if(H==0) H=270; - x->x_H=H; - + + H=x->x_gui.x_h; + if(H<0) H=360; + if(H==0) H=270; + x->x_H=H; + if(x->x_lin0_log1) - x->x_k = log(x->x_max/x->x_min)/(double)(x->x_H - 1); + x->x_k = log(x->x_max/x->x_min)/(double)(x->x_H - 1); else - x->x_k = (x->x_max - x->x_min)/(double)(x->x_H - 1); + x->x_k = (x->x_max - x->x_min)/(double)(x->x_H - 1); /*x->x_center = (x->x_gui.x_w-1)*50; if(x->x_val > (x->x_gui.x_w*100 - 100)) { - x->x_pos = x->x_gui.x_w*100 - 100; - x->x_val = x->x_pos; + x->x_pos = x->x_gui.x_w*100 - 100; + x->x_val = x->x_pos; } if(x->x_lin0_log1) - x->x_k = log(x->x_max/x->x_min)/(double)(x->x_gui.x_w - 1); + x->x_k = log(x->x_max/x->x_min)/(double)(x->x_gui.x_w - 1); else - x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_w - 1);*/ + x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_w - 1);*/ } void mknob_check_minmax(t_mknob *x, double min, double max) { int H; - - if(x->x_lin0_log1) + + if(x->x_lin0_log1) { - if((min == 0.0)&&(max == 0.0)) - max = 1.0; - if(max > 0.0) - { - if(min <= 0.0) - min = 0.01*max; - } - else - { - if(min > 0.0) - max = 0.01*min; - } + if((min == 0.0)&&(max == 0.0)) + max = 1.0; + if(max > 0.0) + { + if(min <= 0.0) + min = 0.01*max; + } + else + { + if(min > 0.0) + max = 0.01*min; + } } x->x_min = min; x->x_max = max; if(x->x_min > x->x_max) /* bugfix */ - x->x_gui.x_isa.x_reverse = 1; + x->x_gui.x_isa.x_reverse = 1; else x->x_gui.x_isa.x_reverse = 0; if(x->x_lin0_log1) - x->x_k = log(x->x_max/x->x_min)/(double)(x->x_H - 1); + x->x_k = log(x->x_max/x->x_min)/(double)(x->x_H - 1); else - x->x_k = (x->x_max - x->x_min)/(double)(x->x_H - 1); + x->x_k = (x->x_max - x->x_min)/(double)(x->x_H - 1); /*if(x->x_lin0_log1) - x->x_k = log(x->x_max/x->x_min)/(double)(MKNOB_TANGLE - 1); + x->x_k = log(x->x_max/x->x_min)/(double)(MKNOB_TANGLE - 1); else - x->x_k = (x->x_max - x->x_min)/(double)(MKNOB_TANGLE - 1);*/ + x->x_k = (x->x_max - x->x_min)/(double)(MKNOB_TANGLE - 1);*/ } static void mknob_properties(t_gobj *z, t_glist *owner) @@ -362,13 +362,13 @@ static void mknob_properties(t_gobj *z, t_glist *owner) %s %d %d \ %d %d \ %d %d %d\n", - x->x_gui.x_w, MKNOB_MINSIZE, x->x_gui.x_h, -1, - x->x_min, x->x_max, 0.0,/*no_schedule*/ - x->x_lin0_log1, x->x_gui.x_isa.x_loadinit, x->x_steady, -1,/*no multi, but iem-characteristic*/ - srl[0]->s_name, srl[1]->s_name, - srl[2]->s_name, x->x_gui.x_ldx, x->x_gui.x_ldy, - x->x_gui.x_fsf.x_font_style, x->x_gui.x_fontsize, - 0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol, 0xffffff & x->x_gui.x_lcol); + x->x_gui.x_w, MKNOB_MINSIZE, x->x_gui.x_h, -1, + x->x_min, x->x_max, 0.0,/*no_schedule*/ + x->x_lin0_log1, x->x_gui.x_isa.x_loadinit, x->x_steady, -1,/*no multi, but iem-characteristic*/ + srl[0]->s_name, srl[1]->s_name, + srl[2]->s_name, x->x_gui.x_ldx, x->x_gui.x_ldy, + x->x_gui.x_fsf.x_font_style, x->x_gui.x_fontsize, + 0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol, 0xffffff & x->x_gui.x_lcol); gfxstub_new(&x->x_gui.x_obj.ob_pd, x, buf); } @@ -378,22 +378,22 @@ static void mknob_set(t_mknob *x, t_floatarg f) /* bugfix */ if(x->x_gui.x_isa.x_reverse) /* bugfix */ { - if(f > x->x_min) - f = x->x_min; - if(f < x->x_max) - f = x->x_max; + if(f > x->x_min) + f = x->x_min; + if(f < x->x_max) + f = x->x_max; } else { - if(f > x->x_max) - f = x->x_max; - if(f < x->x_min) - f = x->x_min; + if(f > x->x_max) + f = x->x_max; + if(f < x->x_min) + f = x->x_min; } if(x->x_lin0_log1) - g = log(f/x->x_min)/x->x_k; + g = log(f/x->x_min)/x->x_k; else - g = (f - x->x_min) / x->x_k; + g = (f - x->x_min) / x->x_k; x->x_val = (int)(100.0*g + 0.49999); x->x_pos = x->x_val; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); @@ -404,11 +404,11 @@ static void mknob_bang(t_mknob *x) double out; if(x->x_lin0_log1) - out = x->x_min*exp(x->x_k*(double)(x->x_val)*0.01); + out = x->x_min*exp(x->x_k*(double)(x->x_val)*0.01); else - out = (double)(x->x_val)*0.01*x->x_k + x->x_min; + out = (double)(x->x_val)*0.01*x->x_k + x->x_min; if((out < 1.0e-10)&&(out > -1.0e-10)) - out = 0.0; + out = 0.0; outlet_float(x->x_gui.x_obj.ob_outlet, out); if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) pd_float(x->x_gui.x_snd->s_thing, out); @@ -428,9 +428,9 @@ static void mknob_dialog(t_mknob *x, t_symbol *s, int argc, t_atom *argv) if(lilo != 0) lilo = 1; x->x_lin0_log1 = lilo; if(steady) - x->x_steady = 1; + x->x_steady = 1; else - x->x_steady = 0; + x->x_steady = 0; sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); //x->x_gui.x_h = iemgui_clip_size(h); //x->x_gui.x_w = iemgui_clip_size(w); @@ -439,7 +439,7 @@ static void mknob_dialog(t_mknob *x, t_symbol *s, int argc, t_atom *argv) (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_MOVE); - canvas_fixlinesfor(x->x_gui.x_glist, (t_text*)x); + canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x); } static int xm0,ym0,xm,ym; @@ -447,31 +447,31 @@ static int xm0,ym0,xm,ym; static void mknob_motion(t_mknob *x, t_floatarg dx, t_floatarg dy) { int old = x->x_val; - float d=-dy; - - if (abs(dx)>abs(dy)) d=dx; + float d=-dy; + + if (abs(dx)>abs(dy)) d=dx; if(x->x_gui.x_fsf.x_finemoved) - x->x_pos += (int)d; + x->x_pos += (int)d; else - x->x_pos += 100*(int)d; + x->x_pos += 100*(int)d; x->x_val = x->x_pos; if(x->x_val > (100*x->x_H - 100)) { - x->x_val = 100*x->x_H - 100; - x->x_pos += 50; - x->x_pos -= x->x_pos%100; + x->x_val = 100*x->x_H - 100; + x->x_pos += 50; + x->x_pos -= x->x_pos%100; } if(x->x_val < 0) { - x->x_val = 0; - x->x_pos -= 50; - x->x_pos -= x->x_pos%100; + x->x_val = 0; + x->x_pos -= 50; + x->x_pos -= x->x_pos%100; } if(old != x->x_val) { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - mknob_bang(x); + (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + mknob_bang(x); } } @@ -480,23 +480,23 @@ static void mknob_motion_circular(t_mknob *x, t_floatarg dx, t_floatarg dy) int xc=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist)+x->x_gui.x_w/2; int yc=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist)+x->x_gui.x_w/2; int old = x->x_val; - float alpha; - - xm+=dx; - ym+=dy; - - alpha=atan2(xm-xc,ym-yc)*180.0/M_PI; - - x->x_pos=(int)(31500-alpha*100.0)%36000; - if(x->x_pos>31500) x->x_pos=0; - else if(x->x_pos>(27000-100)) x->x_pos=(27000-100); + float alpha; + + xm+=dx; + ym+=dy; + + alpha=atan2(xm-xc,ym-yc)*180.0/M_PI; + + x->x_pos=(int)(31500-alpha*100.0)%36000; + if(x->x_pos>31500) x->x_pos=0; + else if(x->x_pos>(27000-100)) x->x_pos=(27000-100); x->x_val=x->x_pos; - - if(old != x->x_val) + + if(old != x->x_val) { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - mknob_bang(x); + (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + mknob_bang(x); } } @@ -505,111 +505,127 @@ static void mknob_motion_fullcircular(t_mknob *x, t_floatarg dx, t_floatarg dy) int xc=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist)+x->x_gui.x_w/2; int yc=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist)+x->x_gui.x_w/2; int old = x->x_val; - float alpha; - - xm+=dx; - ym+=dy; - - alpha=atan2(xm-xc,ym-yc)*180.0/M_PI; - - x->x_pos=(int)(36000-alpha*100.0)%36000; - /*if(x->x_pos>31500) x->x_pos=0; - else if(x->x_pos>(27000-100)) x->x_pos=(27000-100);*/ - - if(x->x_pos>(36000-100)) x->x_pos=(36000-100); + float alpha; + + xm+=dx; + ym+=dy; + + alpha=atan2(xm-xc,ym-yc)*180.0/M_PI; + + x->x_pos=(int)(36000-alpha*100.0)%36000; + /*if(x->x_pos>31500) x->x_pos=0; + else if(x->x_pos>(27000-100)) x->x_pos=(27000-100);*/ + + if(x->x_pos>(36000-100)) x->x_pos=(36000-100); x->x_val=x->x_pos; - - if(old != x->x_val) + + if(old != x->x_val) { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - mknob_bang(x); + (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + mknob_bang(x); } } static void mknob_click(t_mknob *x, t_floatarg xpos, t_floatarg ypos, - t_floatarg shift, t_floatarg ctrl, t_floatarg alt) + t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { xm0=xm=xpos; ym0=ym=ypos; - //if(!x->x_steady) - //x->x_val = (int)(100.0 * (xpos - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist))); + //if(!x->x_steady) + //x->x_val = (int)(100.0 * (xpos - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist))); if(x->x_val > (100*x->x_H - 100)) - x->x_val = 100*x->x_H - 100; + x->x_val = 100*x->x_H - 100; if(x->x_val < 0) - x->x_val = 0; + x->x_val = 0; x->x_pos = x->x_val; (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); mknob_bang(x); - if(x->x_gui.x_h<0) - glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, - (t_glistmotionfn)mknob_motion_fullcircular, 0, xpos, ypos); - else if(x->x_gui.x_h==0) - glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, - (t_glistmotionfn)mknob_motion_circular, 0, xpos, ypos); - else - glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, - (t_glistmotionfn)mknob_motion, 0, xpos, ypos); + if(x->x_gui.x_h<0) + glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, + (t_glistmotionfn)mknob_motion_fullcircular, 0, xpos, ypos); + else if(x->x_gui.x_h==0) + glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, + (t_glistmotionfn)mknob_motion_circular, 0, xpos, ypos); + else + glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, + (t_glistmotionfn)mknob_motion, 0, xpos, ypos); } static int mknob_newclick(t_gobj *z, struct _glist *glist, - int xpix, int ypix, int shift, int alt, int dbl, int doit) + int xpix, int ypix, int shift, int alt, int dbl, int doit) { - t_mknob* x = (t_mknob *)z; + t_mknob *x = (t_mknob *)z; if(doit) { - mknob_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, - 0, (t_floatarg)alt); - if(shift) - x->x_gui.x_fsf.x_finemoved = 1; - else - x->x_gui.x_fsf.x_finemoved = 0; + mknob_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, + 0, (t_floatarg)alt); + if(shift) + x->x_gui.x_fsf.x_finemoved = 1; + else + x->x_gui.x_fsf.x_finemoved = 0; } return (1); } static void mknob_size(t_mknob *x, t_symbol *s, int ac, t_atom *av) { - int w=(int)atom_getintarg(0, ac, av), - h=x->x_gui.x_h; + int w=(int)atom_getintarg(0, ac, av), + h=x->x_gui.x_h; if(ac > 1) h=(int)atom_getintarg(1, ac, av); - - mknob_check_wh(x, w, h); + + mknob_check_wh(x, w, h); iemgui_size((void *)x, &x->x_gui); } static void mknob_delta(t_mknob *x, t_symbol *s, int ac, t_atom *av) -{iemgui_delta((void *)x, &x->x_gui, s, ac, av);} +{ + iemgui_delta((void *)x, &x->x_gui, s, ac, av); +} static void mknob_pos(t_mknob *x, t_symbol *s, int ac, t_atom *av) -{iemgui_pos((void *)x, &x->x_gui, s, ac, av);} +{ + iemgui_pos((void *)x, &x->x_gui, s, ac, av); +} static void mknob_range(t_mknob *x, t_symbol *s, int ac, t_atom *av) { mknob_check_minmax(x, (double)atom_getfloatarg(0, ac, av), - (double)atom_getfloatarg(1, ac, av)); + (double)atom_getfloatarg(1, ac, av)); } static void mknob_color(t_mknob *x, t_symbol *s, int ac, t_atom *av) -{iemgui_color((void *)x, &x->x_gui, s, ac, av);} +{ + iemgui_color((void *)x, &x->x_gui, s, ac, av); +} static void mknob_send(t_mknob *x, t_symbol *s) -{iemgui_send(x, &x->x_gui, s);} +{ + iemgui_send(x, &x->x_gui, s); +} static void mknob_receive(t_mknob *x, t_symbol *s) -{iemgui_receive(x, &x->x_gui, s);} +{ + iemgui_receive(x, &x->x_gui, s); +} static void mknob_label(t_mknob *x, t_symbol *s) -{iemgui_label((void *)x, &x->x_gui, s);} +{ + iemgui_label((void *)x, &x->x_gui, s); +} static void mknob_label_pos(t_mknob *x, t_symbol *s, int ac, t_atom *av) -{iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} +{ + iemgui_label_pos((void *)x, &x->x_gui, s, ac, av); +} static void mknob_label_font(t_mknob *x, t_symbol *s, int ac, t_atom *av) -{iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} +{ + iemgui_label_font((void *)x, &x->x_gui, s, ac, av); +} static void mknob_log(t_mknob *x) { @@ -639,16 +655,16 @@ static void mknob_float(t_mknob *x, t_floatarg f) mknob_set(x, f); if(x->x_lin0_log1) - out = x->x_min*exp(x->x_k*(double)(x->x_val)*0.01); + out = x->x_min*exp(x->x_k*(double)(x->x_val)*0.01); else - out = (double)(x->x_val)*0.01*x->x_k + x->x_min; + out = (double)(x->x_val)*0.01*x->x_k + x->x_min; if((out < 1.0e-10)&&(out > -1.0e-10)) - out = 0.0; + out = 0.0; if(x->x_gui.x_fsf.x_put_in2out) { - outlet_float(x->x_gui.x_obj.ob_outlet, out); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_float(x->x_gui.x_snd->s_thing, out); + outlet_float(x->x_gui.x_obj.ob_outlet, out); + if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) + pd_float(x->x_gui.x_snd->s_thing, out); } } @@ -656,8 +672,8 @@ static void mknob_loadbang(t_mknob *x) { if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - mknob_bang(x); + (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); + mknob_bang(x); } } @@ -680,7 +696,7 @@ static void mknob_loadbang(t_mknob *x) static void *mknob_new(t_symbol *s, int argc, t_atom *argv) { t_mknob *x = (t_mknob *)pd_new(mknob_class); - int bflcol[]={-262144, -1, -1}; + int bflcol[]= {-262144, -1, -1}; //t_symbol *srl[3]; int w=MKNOB_DEFAULTSIZE, h=MKNOB_DEFAULTH; int fs=8 ,lilo=0, ldx=-2, ldy=-6, f=0, v=0, steady=1; @@ -695,58 +711,58 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv) srl[2] = gensym("empty");*/ if(((argc == 17)||(argc == 18))&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1) - &&IS_A_FLOAT(argv,2)&&IS_A_FLOAT(argv,3) - &&IS_A_FLOAT(argv,4)&&IS_A_FLOAT(argv,5) - &&(IS_A_SYMBOL(argv,6)||IS_A_FLOAT(argv,6)) - &&(IS_A_SYMBOL(argv,7)||IS_A_FLOAT(argv,7)) - &&(IS_A_SYMBOL(argv,8)||IS_A_FLOAT(argv,8)) - &&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10) - &&IS_A_FLOAT(argv,11)&&IS_A_FLOAT(argv,12)&&IS_A_FLOAT(argv,13) - &&IS_A_FLOAT(argv,14)&&IS_A_FLOAT(argv,15)&&IS_A_FLOAT(argv,16)) + &&IS_A_FLOAT(argv,2)&&IS_A_FLOAT(argv,3) + &&IS_A_FLOAT(argv,4)&&IS_A_FLOAT(argv,5) + &&(IS_A_SYMBOL(argv,6)||IS_A_FLOAT(argv,6)) + &&(IS_A_SYMBOL(argv,7)||IS_A_FLOAT(argv,7)) + &&(IS_A_SYMBOL(argv,8)||IS_A_FLOAT(argv,8)) + &&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10) + &&IS_A_FLOAT(argv,11)&&IS_A_FLOAT(argv,12)&&IS_A_FLOAT(argv,13) + &&IS_A_FLOAT(argv,14)&&IS_A_FLOAT(argv,15)&&IS_A_FLOAT(argv,16)) { - w = (int)atom_getintarg(0, argc, argv); - h = (int)atom_getintarg(1, argc, argv); - min = (double)atom_getfloatarg(2, argc, argv); - max = (double)atom_getfloatarg(3, argc, argv); - lilo = (int)atom_getintarg(4, argc, argv); - iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); - iemgui_new_getnames(&x->x_gui, 6, argv); - ldx = (int)atom_getintarg(9, argc, argv); - ldy = (int)atom_getintarg(10, argc, argv); - iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); - fs = (int)atom_getintarg(12, argc, argv); - bflcol[0] = (int)atom_getintarg(13, argc, argv); - bflcol[1] = (int)atom_getintarg(14, argc, argv); - bflcol[2] = (int)atom_getintarg(15, argc, argv); - v = (int)atom_getintarg(16, argc, argv); - /*iinit = (int)atom_getintarg(5, argc, argv); - if(IS_A_SYMBOL(argv,6)) - srl[0] = atom_getsymbolarg(6, argc, argv); - else if(IS_A_FLOAT(argv,6)) - { - sprintf(str, "%d", (int)atom_getintarg(6, argc, argv)); - srl[0] = gensym(str); - } - if(IS_A_SYMBOL(argv,7)) - srl[1] = atom_getsymbolarg(7, argc, argv); - else if(IS_A_FLOAT(argv,7)) - { - sprintf(str, "%d", (int)atom_getintarg(7, argc, argv)); - srl[1] = gensym(str); - } - if(IS_A_SYMBOL(argv,8)) - srl[2] = atom_getsymbolarg(8, argc, argv); - else if(IS_A_FLOAT(argv,8)) - { - sprintf(str, "%d", (int)atom_getintarg(8, argc, argv)); - srl[2] = gensym(str); - }*/ - //ifstyle = (int)atom_getintarg(11, argc, argv); + w = (int)atom_getintarg(0, argc, argv); + h = (int)atom_getintarg(1, argc, argv); + min = (double)atom_getfloatarg(2, argc, argv); + max = (double)atom_getfloatarg(3, argc, argv); + lilo = (int)atom_getintarg(4, argc, argv); + iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); + iemgui_new_getnames(&x->x_gui, 6, argv); + ldx = (int)atom_getintarg(9, argc, argv); + ldy = (int)atom_getintarg(10, argc, argv); + iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); + fs = (int)atom_getintarg(12, argc, argv); + bflcol[0] = (int)atom_getintarg(13, argc, argv); + bflcol[1] = (int)atom_getintarg(14, argc, argv); + bflcol[2] = (int)atom_getintarg(15, argc, argv); + v = (int)atom_getintarg(16, argc, argv); + /*iinit = (int)atom_getintarg(5, argc, argv); + if(IS_A_SYMBOL(argv,6)) + srl[0] = atom_getsymbolarg(6, argc, argv); + else if(IS_A_FLOAT(argv,6)) + { + sprintf(str, "%d", (int)atom_getintarg(6, argc, argv)); + srl[0] = gensym(str); + } + if(IS_A_SYMBOL(argv,7)) + srl[1] = atom_getsymbolarg(7, argc, argv); + else if(IS_A_FLOAT(argv,7)) + { + sprintf(str, "%d", (int)atom_getintarg(7, argc, argv)); + srl[1] = gensym(str); + } + if(IS_A_SYMBOL(argv,8)) + srl[2] = atom_getsymbolarg(8, argc, argv); + else if(IS_A_FLOAT(argv,8)) + { + sprintf(str, "%d", (int)atom_getintarg(8, argc, argv)); + srl[2] = gensym(str); + }*/ + //ifstyle = (int)atom_getintarg(11, argc, argv); } else iemgui_new_getnames(&x->x_gui, 6, 0); if((argc == 18)&&IS_A_FLOAT(argv,17)) - steady = (int)atom_getintarg(17, argc, argv); + steady = (int)atom_getintarg(17, argc, argv); /*iinit &= IEM_INIT_ARGS_ALL; ifstyle &= IEM_FSTYLE_FLAGS_ALL; @@ -758,26 +774,29 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv) x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); //x->x_gui.x_isa = *init; if(x->x_gui.x_isa.x_loadinit) - x->x_val = v; + x->x_val = v; else - x->x_val = 0; + x->x_val = 0; x->x_pos = x->x_val; if(lilo != 0) lilo = 1; x->x_lin0_log1 = lilo; if(steady != 0) steady = 1; x->x_steady = steady; - if(!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; + if(!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; if(!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; //if(!strcmp(srl[0]->s_name, "empty")) fstyle->x_snd_able = 0; //if(!strcmp(srl[1]->s_name, "empty")) fstyle->x_rcv_able = 0; //x->x_gui.x_unique_num = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); - else { x->x_gui.x_fsf.x_font_style = 0; - /*if(fstyle->x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); - else if(fstyle->x_font_style == 2) strcpy(x->x_gui.x_font, "times"); - else { fstyle->x_font_style = 0;*/ - strcpy(x->x_gui.x_font, "courier"); } + else + { + x->x_gui.x_fsf.x_font_style = 0; + /*if(fstyle->x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); + else if(fstyle->x_font_style == 2) strcpy(x->x_gui.x_font, "times"); + else { fstyle->x_font_style = 0;*/ + strcpy(x->x_gui.x_font, "courier"); + } //x->x_gui.x_fsf = *fstyle; //iemgui_first_dollararg2sym(&x->x_gui, srl); //if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, srl[1]); @@ -788,7 +807,7 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv) x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; if(fs < 4) - fs = 4; + fs = 4; x->x_gui.x_fontsize = fs; //x->x_gui.x_h = iemgui_clip_size(h); //x->x_gui.x_w = iemgui_clip_size(w); @@ -805,9 +824,9 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv) static void mknob_free(t_mknob *x) { /*if(x->x_gui.x_fsf.x_selected) - pd_unbind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym);*/ + pd_unbind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym);*/ if(x->x_gui.x_fsf.x_rcv_able) - pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); + pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); gfxstub_deleteforkey(x); } @@ -821,7 +840,7 @@ void canvas_mknob(t_glist *gl, t_symbol *s, int argc, t_atom *argv) void mknob_setup(void) { mknob_class = class_new(gensym("mknob"), (t_newmethod)mknob_new, - (t_method)mknob_free, sizeof(t_mknob), 0, A_GIMME, 0); + (t_method)mknob_free, sizeof(t_mknob), 0, A_GIMME, 0); #ifndef GGEE_mknob_COMPATIBLE // class_addcreator((t_newmethod)mknob_new, gensym("mknob"), A_GIMME, 0); #endif @@ -829,9 +848,9 @@ void mknob_setup(void) class_addfloat(mknob_class,mknob_float); //class_addlist(mknob_class, mknob_list); class_addmethod(mknob_class, (t_method)mknob_click, gensym("click"), - A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); + A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); class_addmethod(mknob_class, (t_method)mknob_motion, gensym("motion"), - A_FLOAT, A_FLOAT, 0); + A_FLOAT, A_FLOAT, 0); class_addmethod(mknob_class, (t_method)mknob_dialog, gensym("dialog"), A_GIMME, 0); class_addmethod(mknob_class, (t_method)mknob_loadbang, gensym("loadbang"), 0); class_addmethod(mknob_class, (t_method)mknob_set, gensym("set"), A_FLOAT, 0); @@ -850,7 +869,7 @@ void mknob_setup(void) class_addmethod(mknob_class, (t_method)mknob_init, gensym("init"), A_FLOAT, 0); class_addmethod(mknob_class, (t_method)mknob_steady, gensym("steady"), A_FLOAT, 0); /*if(!iemgui_key_sym) - iemgui_key_sym = gensym("#keyname");*/ + iemgui_key_sym = gensym("#keyname");*/ mknob_widgetbehavior.w_getrectfn = mknob_getrect; mknob_widgetbehavior.w_displacefn = iemgui_displace; mknob_widgetbehavior.w_selectfn = iemgui_select; @@ -865,5 +884,5 @@ void mknob_setup(void) class_setsavefn(mknob_class, mknob_save); class_setpropertiesfn(mknob_class, mknob_properties); class_addmethod(canvas_class, (t_method)canvas_mknob, gensym("mknob"), - A_GIMME, A_NULL); + A_GIMME, A_NULL); } -- cgit v1.2.1