[PD-cvs] pd/src desire.c, 1.1.2.217.2.216, 1.1.2.217.2.217 desire.h, 1.1.2.49.2.45, 1.1.2.49.2.46

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.c desire.h 
Log Message:
remove "loading" field


Index: desire.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v
retrieving revision 1.1.2.49.2.45
retrieving revision 1.1.2.49.2.46
diff -C2 -d -r1.1.2.49.2.45 -r1.1.2.49.2.46
*** desire.h	17 Aug 2007 08:23:42 -0000	1.1.2.49.2.45
--- desire.h	17 Aug 2007 16:19:27 -0000	1.1.2.49.2.46
***************
*** 167,171 ****
      t_canvasenvironment *env;  /* one of these per $0; env=0 for subpatches */
      unsigned int havewindow:1; /* this indicates whether we publish to the manager */
-     unsigned int loading:1;    /* am now loading from file      (should deprecate this: use PUSH) */
      unsigned int willvis:1;    /* make me visible after loading (should deprecate this: use PUSH) */
      unsigned int gop:1;
--- 167,170 ----

Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.216
retrieving revision 1.1.2.217.2.217
diff -C2 -d -r1.1.2.217.2.216 -r1.1.2.217.2.217
*** desire.c	17 Aug 2007 08:23:38 -0000	1.1.2.217.2.216
--- desire.c	17 Aug 2007 16:19:24 -0000	1.1.2.217.2.217
***************
*** 545,549 ****
      x->name = *s->name ? s : canvas_newfilename ? canvas_newfilename : s_Pd;
      if (x->name != s_Pd) pd_bind(x, canvas_makebindsym(x->name));
-     x->loading = 1;
      x->goprect = 0; /* no GOP rectangle unless it's turned on later */
      /* cancel "vis" flag if we're a subpatch of an abstraction inside another patch.
--- 545,548 ----
***************
*** 709,713 ****
  /* assuming that this only ever gets called on toplevel canvases (?) */
  static void canvas_pop(t_canvas *x, t_floatarg fvis) {
!     pd_popsym(x); x->loading = 0; canvas_resortinlets(x); canvas_resortoutlets(x);
      if (fvis) canvas_vis(x, 1);
  }
--- 708,712 ----
  /* assuming that this only ever gets called on toplevel canvases (?) */
  static void canvas_pop(t_canvas *x, t_floatarg fvis) {
!     pd_popsym(x); canvas_resortinlets(x); canvas_resortoutlets(x);
      if (fvis) canvas_vis(x, 1);
  }
***************
*** 715,719 ****
  extern "C" void canvas_popabstraction(t_canvas *x) {
      pd_set_newest(x);
!     pd_popsym(x); x->loading = 0; canvas_resortinlets(x); canvas_resortoutlets(x);
  }
  
--- 714,718 ----
  extern "C" void canvas_popabstraction(t_canvas *x) {
      pd_set_newest(x);
!     pd_popsym(x); canvas_resortinlets(x); canvas_resortoutlets(x);
  }