Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1373
Modified Files: Tag: desiredata desire.c m_pd.h desire.h Log Message: removed gs_refcount
Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.24 retrieving revision 1.4.4.11.2.33.2.25 diff -C2 -d -r1.4.4.11.2.33.2.24 -r1.4.4.11.2.33.2.25 *** m_pd.h 3 Jan 2007 03:13:43 -0000 1.4.4.11.2.33.2.24 --- m_pd.h 3 Jan 2007 03:54:18 -0000 1.4.4.11.2.33.2.25 *************** *** 105,111 **** struct _array *gs_array; } gs_un; - int gs_pointless; - int gs_refcount; /* number of gpointers pointing here */ } t_gstub;
typedef struct _gpointer { --- 105,114 ---- struct _array *gs_array; } gs_un; } t_gstub; + #ifdef PD_PLUSPLUS_FACE + #define gs_refcount gs_un.gs_glist->refcount + #else + #define gs_refcount gs_un.gs_glist->gl_obj.refcount + #endif
typedef struct _gpointer { *************** *** 237,244 **** t_inlet *inlet; /* linked list of inlets */ short x,y; /* x&y location (within the toplevel) */ ! //short width; /* requested width in chars, 0 if auto */ ! short unused; /* substitute for width */ ! //unsigned int type:2; /* from defs below */ ! short garbage; /* replacing a bitfield by this may be a problem on MSVC (?) */ } t_text, t_object;
--- 240,244 ---- t_inlet *inlet; /* linked list of inlets */ short x,y; /* x&y location (within the toplevel) */ ! int refcount; /* there used to be a bitfield here, which may be a problem with ms-bitfields (?) */ } t_text, t_object;
*************** *** 327,330 **** --- 327,335 ---- EXTERN void atom_string(t_atom *a, char *buf, unsigned int bufsize);
+ /* goes with desiredata's CLASS_NEWATOM */ + EXTERN void atom_init(t_atom *a, size_t n); + EXTERN void atom_copy(t_atom *a, t_atom *b, size_t n); + EXTERN void atom_delete(t_atom *a, size_t n); + /* ------------------ binbufs --------------- */
*************** *** 447,451 **** #define CLASS_PATCHABLE 3 #define CLASS_NOINLET 8 ! #define CLASS_NEWATOM 16 #define CLASS_TYPEMASK 3
--- 452,456 ---- #define CLASS_PATCHABLE 3 #define CLASS_NOINLET 8 ! #define CLASS_NEWATOMS 16 #define CLASS_TYPEMASK 3
Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.21 retrieving revision 1.1.2.49.2.22 diff -C2 -d -r1.1.2.49.2.21 -r1.1.2.49.2.22 *** desire.h 31 Dec 2006 19:21:38 -0000 1.1.2.49.2.21 --- desire.h 3 Jan 2007 03:54:18 -0000 1.1.2.49.2.22 *************** *** 174,178 **** unsigned int isgraph:1; /* show as graph on parent */ unsigned int hidetext:1; /* hide object-name + args when doing graph on parent */ - long next_add; /* insertion point for next call to canvas_add (for future use!?) */ }; --- 174,177 ---- *************** *** 211,220 **** } t_template;
! /* this is not really a gui object, but it needs to be observable. */ #ifdef PD_PLUSPLUS_FACE ! struct _array : t_gobj { #else struct _array { ! t_gobj meuh; #endif int n; /* number of elements */ --- 210,219 ---- } t_template;
! /* this is not really a t_object, but it needs to be observable and have a refcount, so... */ #ifdef PD_PLUSPLUS_FACE ! struct _array : t_object { #else struct _array { ! t_gobj gl_obj; #endif int n; /* number of elements */
Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.103 retrieving revision 1.1.2.217.2.104 diff -C2 -d -r1.1.2.217.2.103 -r1.1.2.217.2.104 *** desire.c 3 Jan 2007 03:13:41 -0000 1.1.2.217.2.103 --- desire.c 3 Jan 2007 03:54:16 -0000 1.1.2.217.2.104 *************** *** 166,169 **** --- 166,172 ---- }
+ /* for future use */ + t_canvas *gobj_canvas (t_gobj *self) {return self->dix->canvas;} + // if !k then suppose all of the object might have changed. void gobj_changed (t_gobj *self, const char *k) {