drawing second inlet

svn path=/trunk/externals/ggee/; revision=300

2 files changed, 6 insertions, 7 deletions

diff --git a/gui/envgen.c b/gui/envgen.c
index aa644d0..1632cd5 100755
--- a/gui/envgen.c
+++ b/gui/envgen.c
@@ -277,7 +277,7 @@ void envgen_setup(void)
 

     class_addbang(envgen_class,envgen_bang);

     class_addlist(envgen_class,envgen_list);

-    class_addmethod(envgen_class,(t_method)envgen_sustain,gensym("sustain"),A_FLOAT);

+    class_addmethod(envgen_class,(t_method)envgen_sustain,gensym("sustain"),A_FLOAT,A_NULL);

 

     class_addmethod(envgen_class, (t_method)envgen_click, gensym("click"),

     	A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);

diff --git a/gui/w_envgen.h b/gui/w_envgen.h
index 100cc27..de8a907 100755
--- a/gui/w_envgen.h
+++ b/gui/w_envgen.h
@@ -19,12 +19,12 @@
 

 static void draw_inlets(t_envgen *x, t_glist *glist, int firsttime, int nin, int nout)

 {

-     int n = nin;

+     int n = nout;

      int nplus, i;

      nplus = (n == 1 ? 1 : n-1);

      for (i = 0; i < n; i++)

      {

-	  int onset = x->x_obj.te_xpix + (x->w.width - IOWIDTH) * i / nplus - BORDER;

+	  int onset = x->x_obj.te_xpix + (x->w.width-2*BORDER) * i / nplus;

 	  if (firsttime)

 	       sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xo%d\n",

 			glist_getcanvas(glist),

@@ -37,7 +37,7 @@ static void draw_inlets(t_envgen *x, t_glist *glist, int firsttime, int nin, int
 			onset, x->x_obj.te_ypix + x->w.height - 1 + 2*BORDER,

 			onset + IOWIDTH, x->x_obj.te_ypix + x->w.height + 2*BORDER);

      }

-     n = nout; 

+     n = nin; 

      nplus = (n == 1 ? 1 : n-1);

      for (i = 0; i < n; i++)

      {

@@ -227,7 +227,7 @@ int i;
      //     post("sending %s",buf); 

      sys_vgui("%s",buf);

      envgen_update_doodles(x,glist);

-     draw_inlets(x, glist, 0,1,1);

+     draw_inlets(x, glist, 0,1,2);

 }

 

 

@@ -238,7 +238,7 @@ void envgen_drawme(t_envgen *x, t_glist *glist, int firsttime)
      if (firsttime) envgen_create(x,glist);

      else envgen_update(x,glist);

 

-     draw_inlets(x, glist, firsttime, 1,1);

+     draw_inlets(x, glist, firsttime, 1,2);

 }

 

 

@@ -287,7 +287,6 @@ static void envgen_displace(t_gobj *z, t_glist *glist,
     int dx, int dy)

 {

     t_envgen *x = (t_envgen *)z;

-    post("displace");

     x->x_obj.te_xpix += dx;

     x->x_obj.te_ypix += dy;