[PD-cvs] pd/src desire.c,1.1.2.217.2.203,1.1.2.217.2.204

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1076

Modified Files:
      Tag: desiredata
	desire.c 
Log Message:
canvas "connect" auto-offsets object indices in case of "push".


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.203
retrieving revision 1.1.2.217.2.204
diff -C2 -d -r1.1.2.217.2.203 -r1.1.2.217.2.204
*** desire.c	12 Aug 2007 02:40:00 -0000	1.1.2.217.2.203
--- desire.c	12 Aug 2007 21:07:59 -0000	1.1.2.217.2.204
***************
*** 730,734 ****
  static void canvas_resortoutlets(t_canvas *x);
  
! static void canvas_push(t_canvas *x) {pd_pushsym(x);}
  
  /* assuming that this only ever gets called on toplevel canvases (?) */
--- 730,734 ----
  static void canvas_resortoutlets(t_canvas *x);
  
! static void canvas_push(t_canvas *x, t_floatarg f) {pd_pushsym(x);}
  
  /* assuming that this only ever gets called on toplevel canvases (?) */
***************
*** 1206,1211 ****
  static int is_dummy (t_text *x) {return x->_class==dummy_class;}
  
  void canvas_connect(t_canvas *x, t_floatarg ffrom, t_floatarg foutlet, t_floatarg fto,t_floatarg finlet) {
!     int ifrom=(int)ffrom, outlet=(int)foutlet, ito=(int)fto, inlet=(int)finlet;
      t_gobj *gfrom=0, *gto=0;
      t_object *from=0, *to=0;
--- 1206,1215 ----
  static int is_dummy (t_text *x) {return x->_class==dummy_class;}
  
+ long canvas_base_o_index(void);
+ 
  void canvas_connect(t_canvas *x, t_floatarg ffrom, t_floatarg foutlet, t_floatarg fto,t_floatarg finlet) {
!     int base = canvas_base_o_index();
!     int ifrom=base+int(ffrom), outlet=(int)foutlet;
!     int   ito=base+int(fto),    inlet=(int)finlet;
      t_gobj *gfrom=0, *gto=0;
      t_object *from=0, *to=0;