merged in version 0.37-1test6

svn path=/trunk/; revision=1329

1 files changed, 8 insertions, 33 deletions

diff --git a/pd/src/g_bang.c b/pd/src/g_bang.c
index 1b1d6f4a..6e4ee5ff 100644
--- a/pd/src/g_bang.c
+++ b/pd/src/g_bang.c
@@ -432,7 +432,6 @@ static void *bng_new(t_symbol *s, int argc, t_atom *argv)
 {
     t_bng *x = (t_bng *)pd_new(bng_class);
     int bflcol[]={-262144, -1, -1};
-    t_symbol *srl[3];
     int a=IEM_GUI_DEFAULTSIZE;
     int ldx=0, ldy=-6;
     int fs=8;
@@ -442,9 +441,6 @@ static void *bng_new(t_symbol *s, int argc, t_atom *argv)
 
     iem_inttosymargs(&x->x_gui.x_isa, 0);
     iem_inttofstyle(&x->x_gui.x_fsf, 0);
-    srl[0] = gensym("empty");
-    srl[1] = gensym("empty");
-    srl[2] = gensym("empty");
 
     if((argc == 14)&&IS_A_FLOAT(argv,0)
        &&IS_A_FLOAT(argv,1)&&IS_A_FLOAT(argv,2)
@@ -461,27 +457,7 @@ static void *bng_new(t_symbol *s, int argc, t_atom *argv)
 	fthold = (int)atom_getintarg(1, argc, argv);
 	ftbreak = (int)atom_getintarg(2, argc, argv);
 	iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(3, argc, argv));
-	if(IS_A_SYMBOL(argv,4))
-	    srl[0] = atom_getsymbolarg(4, argc, argv);
-	else if(IS_A_FLOAT(argv,4))
-	{
-	    sprintf(str, "%d", (int)atom_getintarg(4, argc, argv));
-	    srl[0] = gensym(str);
-	}
-	if(IS_A_SYMBOL(argv,5))
-	    srl[1] = atom_getsymbolarg(5, argc, argv);
-	else if(IS_A_FLOAT(argv,5))
-	{
-	    sprintf(str, "%d", (int)atom_getintarg(5, argc, argv));
-	    srl[1] = gensym(str);
-	}
-	if(IS_A_SYMBOL(argv,6))
-	    srl[2] = atom_getsymbolarg(6, argc, argv);
-	else if(IS_A_FLOAT(argv,6))
-	{
-	    sprintf(str, "%d", (int)atom_getintarg(6, argc, argv));
-	    srl[2] = gensym(str);
-	}
+	iemgui_new_getnames(&x->x_gui, 4, argv);
 	ldx = (int)atom_getintarg(7, argc, argv);
 	ldy = (int)atom_getintarg(8, argc, argv);
 	iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv));
@@ -490,6 +466,7 @@ static void *bng_new(t_symbol *s, int argc, t_atom *argv)
 	bflcol[1] = (int)atom_getintarg(12, argc, argv);
 	bflcol[2] = (int)atom_getintarg(13, argc, argv);
     }
+    else iemgui_new_getnames(&x->x_gui, 4, 0);
 
     x->x_gui.x_draw = (t_iemfunptr)bng_draw;
 
@@ -497,19 +474,17 @@ static void *bng_new(t_symbol *s, int argc, t_atom *argv)
     x->x_gui.x_fsf.x_rcv_able = 1;
     x->x_flashed = 0;
     x->x_gui.x_glist = (t_glist *)canvas_getcurrent();
-    if(!strcmp(srl[0]->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0;
-    if(!strcmp(srl[1]->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0;
-    x->x_gui.x_unique_num = 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(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;
 	strcpy(x->x_gui.x_font, "courier"); }
-    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]);
-    x->x_gui.x_snd = srl[0];
-    x->x_gui.x_rcv = srl[1];
-    x->x_gui.x_lab = srl[2];
+    if (x->x_gui.x_fsf.x_rcv_able)
+    	pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);
     x->x_gui.x_ldx = ldx;
     x->x_gui.x_ldy = ldy;