Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31119
Modified Files: Tag: desiredata desire.c m_pd.h Log Message: removed appendix's master field
Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.43 retrieving revision 1.4.4.11.2.33.2.44 diff -C2 -d -r1.4.4.11.2.33.2.43 -r1.4.4.11.2.33.2.44 *** m_pd.h 16 Jan 2007 01:36:52 -0000 1.4.4.11.2.33.2.43 --- m_pd.h 16 Jan 2007 01:57:43 -0000 1.4.4.11.2.33.2.44 *************** *** 175,188 **** int hash_exists(t_hash *self, hashkey k); /* check if a key exists */
! /* _gobj_appendix (by matju) is made of the things that logically ought to be ! in _gobj but have been put in a separate memory space because this allows ! most externals to work unmodified on both DesireData and non-DesireData systems. The equivalent in the Tcl side is really part of every view object. - Note: The observer func ptr has been moved to the t_class. - Note: names of fields are stored in each t_class. - Note: as of 2005-10-18, this is no longer a delayed observer pattern as in Java, so no need for dirty-flags. */ ! typedef struct _gobj_appendix { ! struct _gobj *master; /* this is the thing that this appendix is an appendage of */ struct _gobj *next; /* big hack. this is the donut hole as cut from _gobj */ t_canvas *canvas; /* the holder of this object */ --- 175,184 ---- int hash_exists(t_hash *self, hashkey k); /* check if a key exists */
! /* t_appendix is made of the things that logically ought to be in t_gobj but have been put in a ! separate memory space because this allows most externals to work unmodified on both DesireData ! and non-DesireData systems. The equivalent in the Tcl side is really part of every view object. */ ! typedef struct t_appendix { struct _gobj *next; /* big hack. this is the donut hole as cut from _gobj */ t_canvas *canvas; /* the holder of this object */ *************** *** 192,196 **** /* miscellaneous */ t_hash *visual; ! } t_appendix; t_appendix *appendix_new (struct _gobj *master); void appendix_free(struct _gobj *self); --- 188,192 ---- /* miscellaneous */ t_hash *visual; ! }; t_appendix *appendix_new (struct _gobj *master); void appendix_free(struct _gobj *self); *************** *** 208,212 **** /* this is incompatible with externs compiled for regular pd that use g_next directly; those are gui/state, clone, dyn, dynext, toxy, cyclone */ ! t_appendix *dix; /* voyeurism (observable/observer/etc) */ #define g_adix dix #define g_next dix->next --- 204,208 ---- /* this is incompatible with externs compiled for regular pd that use g_next directly; those are gui/state, clone, dyn, dynext, toxy, cyclone */ ! t_appendix *dix; #define g_adix dix #define g_next dix->next
Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.134 retrieving revision 1.1.2.217.2.135 diff -C2 -d -r1.1.2.217.2.134 -r1.1.2.217.2.135 *** desire.c 16 Jan 2007 01:36:52 -0000 1.1.2.217.2.134 --- desire.c 16 Jan 2007 01:57:40 -0000 1.1.2.217.2.135 *************** *** 99,103 **** //fprintf(stderr,"appendix_new %p\n",master); t_appendix *self = (t_appendix *)malloc(sizeof(t_appendix)); - self->master = master; self->next = 0; self->canvas = 0; --- 99,102 ----