[PD-cvs] pd/src desire.c,1.1.2.182,1.1.2.183

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
.


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.182
retrieving revision 1.1.2.183
diff -C2 -d -r1.1.2.182 -r1.1.2.183
*** desire.c	18 Sep 2006 00:12:59 -0000	1.1.2.182
--- desire.c	19 Sep 2006 16:05:49 -0000	1.1.2.183
***************
*** 4019,4023 ****
  
  static void template_conformarray(t_template *tfrom, t_template *tto, int *conformaction, t_array *a);
! static void template_conformcanvas(t_template *tfrom, t_template *tto, t_canvas *canvas,  int *conformaction);
  
  /* ---------------------- storage ------------------------- */
--- 4019,4023 ----
  
  static void template_conformarray(t_template *tfrom, t_template *tto, int *conformaction, t_array *a);
! static void template_conformcanvas(t_template *tfrom, t_template *tto, int *conformaction, t_canvas *canvas);
  
  /* ---------------------- storage ------------------------- */
***************
*** 4185,4196 ****
          template_conformwords(tfrom, tto, conformaction, scfrom->sc_vec, x->sc_vec);
          /* replace the old one with the new one in the list */
!         if (canvas->list == &scfrom->sc_gobj) {
!             canvas->list = &x->sc_gobj;
              x->sc_gobj.g_next = scfrom->sc_gobj.g_next;
          } else {
              t_gobj *y, *y2;
!             for (y = canvas->list; (y2 = y->g_next); y = y2) if (y2 == &scfrom->sc_gobj) {
                  x->sc_gobj.g_next = y2->g_next;
!                 y->g_next = &x->sc_gobj;
                  goto nobug;
              }
--- 4185,4196 ----
          template_conformwords(tfrom, tto, conformaction, scfrom->sc_vec, x->sc_vec);
          /* replace the old one with the new one in the list */
!         if (canvas->list == (t_gobj *)scfrom) {
!             canvas->list = (t_gobj *)x;
              x->sc_gobj.g_next = scfrom->sc_gobj.g_next;
          } else {
              t_gobj *y, *y2;
!             for (y = canvas->list; (y2 = y->g_next); y = y2) if (y2 == (t_gobj *)scfrom) {
                  x->sc_gobj.g_next = y2->g_next;
!                 y->g_next = (t_gobj *)x;
                  goto nobug;
              }
***************
*** 4198,4202 ****
          nobug: ;
          }
!         pd_free(&scfrom->sc_gobj.g_pd);
          scalartemplate = tto;
      } else {
--- 4198,4202 ----
          nobug: ;
          }
!         pd_free((t_pd *)scfrom);
          scalartemplate = tto;
      } else {
***************
*** 4207,4211 ****
      for (i = 0; i < scalartemplate->n; i++) {
          t_dataslot *ds = scalartemplate->vec + i;
!         if (ds->type == DT_LIST) template_conformcanvas(tfrom, tto, x->sc_vec[i].w_list, conformaction);
          if (ds->type == DT_ARRAY) template_conformarray(tfrom, tto, conformaction, x->sc_vec[i].w_array);
      }
--- 4207,4211 ----
      for (i = 0; i < scalartemplate->n; i++) {
          t_dataslot *ds = scalartemplate->vec + i;
!         if (ds->type == DT_LIST) template_conformcanvas(tfrom, tto, conformaction, x->sc_vec[i].w_list);
          if (ds->type == DT_ARRAY) template_conformarray(tfrom, tto, conformaction, x->sc_vec[i].w_array);
      }
***************
*** 4239,4244 ****
          for (j = 0; j < scalartemplate->n; j++) {
              t_dataslot *ds = scalartemplate->vec + j;
!             if (ds->type == DT_LIST)  template_conformcanvas(tfrom, tto, wp[j].w_list, conformaction);
!             if (ds->type == DT_ARRAY) template_conformarray(tfrom, tto, conformaction, wp[j].w_array);
          }
      }
--- 4239,4244 ----
          for (j = 0; j < scalartemplate->n; j++) {
              t_dataslot *ds = scalartemplate->vec + j;
!             if (ds->type == DT_LIST)  template_conformcanvas(tfrom, tto, conformaction, wp[j].w_list);
!             if (ds->type == DT_ARRAY) template_conformarray( tfrom, tto, conformaction, wp[j].w_array);
          }
      }
***************
*** 4249,4253 ****
     We don't handle redrawing here; this is to be filled in LATER... */
  t_array *garray_getarray(t_garray *x);
! static void template_conformcanvas(t_template *tfrom, t_template *tto, t_canvas *canvas, int *conformaction) {
      t_gobj *g;
      canvas_each(g,canvas) {
--- 4249,4253 ----
     We don't handle redrawing here; this is to be filled in LATER... */
  t_array *garray_getarray(t_garray *x);
! static void template_conformcanvas(t_template *tfrom, t_template *tto, int *conformaction, t_canvas *canvas) {
      t_gobj *g;
      canvas_each(g,canvas) {
***************
*** 7872,7876 ****
  EXTERN t_hash *class_table;
  void glob_update_class_list (t_pd *self, t_symbol *cb_recv, t_symbol *cb_sel) {
-     int n = pd_objectmaker->c_nmethod;
      hashkey k; hashvalue v;
      sys_gui("global class_list; set class_list {");
--- 7872,7875 ----