[PD-cvs] pd/src desire.c,1.1.2.184,1.1.2.185

Mathieu Bouchard matju at users.sourceforge.net
Sat Oct 14 13:07:21 CEST 2006


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

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
fixed #X coords saving.
partially fixed #V saving.
partially fixed crash when loading #V when newest object not available.
fixed observer when loading #V.


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.184
retrieving revision 1.1.2.185
diff -C2 -d -r1.1.2.184 -r1.1.2.185
*** desire.c	22 Sep 2006 00:41:20 -0000	1.1.2.184
--- desire.c	14 Oct 2006 11:07:17 -0000	1.1.2.185
***************
*** 92,96 ****
  void appendix_save (t_gobj *master, t_binbuf *b) {
  	t_hash *h = master->g_adix->visual;
! 	/* fprintf(stderr,"appendix_save %p size=%d\n",master,hash_size(h)); */
  	if (hash_size(h)) {
  	    hashkey k;
--- 92,96 ----
  void appendix_save (t_gobj *master, t_binbuf *b) {
  	t_hash *h = master->g_adix->visual;
! 	fprintf(stderr,"appendix_save %p size=%d\n",master,hash_size(h));
  	if (hash_size(h)) {
  	    hashkey k;
***************
*** 539,543 ****
  
  static void canvas_coords(t_canvas *x, t_symbol *s, int argc, t_atom *argv) {
!     pd_scanargs(argc,argv,"ffffii;",&x->x1,&x->y1,&x->x2,&x->y2,&x->pixwidth,&x->pixheight);
      if (argc <= 7) canvas_setgraph(x, atom_getintarg(6, argc, argv), 1);
      else {
--- 539,544 ----
  
  static void canvas_coords(t_canvas *x, t_symbol *s, int argc, t_atom *argv) {
!     printf("scanargs = %d\n",
! 	    pd_scanargs(argc,argv,"ffffii*",&x->x1,&x->y1,&x->x2,&x->y2,&x->pixwidth,&x->pixheight));
      if (argc <= 7) canvas_setgraph(x, atom_getintarg(6, argc, argv), 1);
      else {
***************
*** 546,549 ****
--- 547,551 ----
          x->ymargin =       atom_getintarg(8, argc, argv);
      }
+     gobj_changed(x,0);
  }
  
***************
*** 6462,6466 ****
      }
      binbuf_addv(b, ";");
-     appendix_save(z,b);
  }
  
--- 6464,6467 ----
***************
*** 6809,6812 ****
--- 6810,6815 ----
  		c->c_savefn(self,b);
  	}
+ 	appendix_save(self,b);
+ 
  	binbuf_gettext(b,&s,&n);
  	if (s[n-1]=='\n') n--;
***************
*** 7819,7824 ****
  
  static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) {
! 	//t_hash *h = self->g_adix->visual;
! 	t_hash *h = ((t_gobj *)newest)->g_adix->visual;
  	int i=0,j=0;
  	//printf("visualloader_anything start newest=%p\n",newest);
--- 7822,7826 ----
  
  static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) {
! 	t_hash *h;
  	int i=0,j=0;
  	//printf("visualloader_anything start newest=%p\n",newest);
***************
*** 7833,7836 ****
--- 7835,7839 ----
  		//printf("#V reading '%s':\n",s->s_name);
  		if (!newest) {pd_error(self,"#V: there is no newest object\n"); return;}
+ 		h = ((t_gobj *)newest)->g_adix->visual;
  		if (hash_exists(h,s)) {
  			//printf("'%s' exists, deleting\n",s->s_name);
***************
*** 7842,7845 ****
--- 7845,7849 ----
  	}
  	//printf("visualloader_anything end\n");
+ 	gobj_changed(self,0);
  }
  





More information about the Pd-cvs mailing list