[PD-cvs] pd/src g_all_guis.h, 1.4.8.4, 1.4.8.5 g_canvas.h, 1.3.4.3.2.9, 1.3.4.3.2.10 m_imp.h, 1.3.4.1.2.7, 1.3.4.1.2.8 m_pd.h, 1.4.4.11.2.33, 1.4.4.11.2.34 s_stuff.h, 1.5.4.10.2.8, 1.5.4.10.2.9

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	g_all_guis.h g_canvas.h m_imp.h m_pd.h s_stuff.h 
Log Message:
DesireData moves on


Index: m_pd.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
retrieving revision 1.4.4.11.2.33
retrieving revision 1.4.4.11.2.34
diff -C2 -d -r1.4.4.11.2.33 -r1.4.4.11.2.34
*** m_pd.h	28 Nov 2006 03:53:32 -0000	1.4.4.11.2.33
--- m_pd.h	30 Nov 2006 01:30:03 -0000	1.4.4.11.2.34
***************
*** 79,89 ****
  #define t_canvas struct _glist  /* LATER lose this */
  
- #ifdef PD_PLUSPLUS_FACE
- struct t_pd {
- 	t_class *_class;
- };
- #else
  typedef t_class *t_pd;      /* pure datum: nothing but a class pointer */
- #endif
  
  typedef struct _symbol
--- 79,83 ----
***************
*** 162,255 ****
  } t_atom;
  
- #ifdef DESIRE
- EXTERN_STRUCT _hash;
- #define t_hash struct _hash
- typedef void *hashkey;
- typedef void *hashvalue;
- typedef void (*hash_iter)(void *data, hashkey k, hashvalue v);
- t_hash *  hash_new(long capa);
- void hash_free(t_hash *self);
- long hash_size(t_hash *self);
- void hash_start(t_hash *self);
- int  hash_next(t_hash *self, hashkey *kp, hashvalue *vp);
- #define hash_foreach(k,v,h) for (hash_start(h); hash_next(h,&k,&v); )
- 
- hashvalue hash_get(t_hash *self, hashkey k);
- void      hash_set(t_hash *self, hashkey k, hashvalue v);
- hashvalue hash_delete(t_hash *self, hashkey k);
- 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 */
- /* actual observable */
- 	int nobs;           /* number of spies */
- 	struct _gobj **obs; /* I spy with my little I */
- /* miscellaneous */
- 	/* the dirty stuff should be a hashtable in t_manager. this is a hack
- 	until pd has hashtables other than the big global one. having the dirties
- 	here sort of defeats the purpose of the observer pattern *and* will cause
- 	trouble with multiple-clients. */
- 	int dirtyc;
- 	t_atom dirtyv[3];
- 	t_hash *visual;
- } t_appendix;
- t_appendix *appendix_new (struct _gobj *master);
- void appendix_free(struct _gobj *self);
- #endif
- 
- #ifdef PD_PLUSPLUS_FACE
- #define g_pd _class
- typedef struct _gobj : t_pd {
- #else
  typedef struct _gobj        /* a graphical object */
  {
      t_pd g_pd;              /* pure datum header (class) */
! #endif
! #ifdef DESIRE
! /* g_next is moved out to keep ABI compat */
!     t_appendix *g_adix;     /* voyeurism (observable/observer/etc) */
! #define g_next g_adix->next
! #else
!     struct _gobj *g_next;   /* next in list */
! #endif
  } t_gobj;
  
- #ifdef PD_PLUSPLUS_FACE
- typedef struct _outconnect : _gobj {
-     struct _outconnect *oc_next;
-     t_pd *oc_to;
- } t_outconnect;
- #else
  EXTERN_STRUCT _outconnect;
  #define t_outconnect struct _outconnect
- #endif
  
- #ifdef PD_PLUSPLUS_FACE
- typedef struct _scalar : t_gobj {
- #else
  typedef struct _scalar      /* a graphical object holding data */
  {
      t_gobj sc_gobj;         /* header for graphical object */
- #endif
      t_symbol *sc_template;  /* template name (LATER replace with pointer) */
      t_word sc_vec[1];       /* indeterminate-length array of words */
  } t_scalar;
  
- #ifdef PD_PLUSPLUS_FACE
- typedef struct t_text : t_gobj {
- #else
  typedef struct _text        /* patchable object - graphical, with text */
  {
      t_gobj te_g;                /* header for graphical object */
- #endif
      t_binbuf *te_binbuf;        /* holder for the text */
      t_outlet *te_outlet;        /* linked list of outlets */
--- 156,178 ----
  } t_atom;
  
  typedef struct _gobj        /* a graphical object */
  {
      t_pd g_pd;              /* pure datum header (class) */
!     struct _gobj *g_next;
  } t_gobj;
  
  EXTERN_STRUCT _outconnect;
  #define t_outconnect struct _outconnect
  
  typedef struct _scalar      /* a graphical object holding data */
  {
      t_gobj sc_gobj;         /* header for graphical object */
      t_symbol *sc_template;  /* template name (LATER replace with pointer) */
      t_word sc_vec[1];       /* indeterminate-length array of words */
  } t_scalar;
  
  typedef struct _text        /* patchable object - graphical, with text */
  {
      t_gobj te_g;                /* header for graphical object */
      t_binbuf *te_binbuf;        /* holder for the text */
      t_outlet *te_outlet;        /* linked list of outlets */
***************
*** 270,280 ****
  #define ob_inlet te_inlet
  #define ob_binbuf te_binbuf
- #ifdef PD_PLUSPLUS_FACE
- #define te_pd g_pd
- #define ob_pd g_pd
- #else
  #define te_pd te_g.g_pd
  #define ob_pd te_g.g_pd
- #endif
  #define ob_g te_g
  
--- 193,198 ----
***************
*** 409,425 ****
  EXTERN void pd_anything(t_pd *x, t_symbol *s, int argc, t_atom *argv);
  
- #ifdef PD_PLUSPLUS_FACE
- #define pd_class(x) ((x)->_class)
- #else
  #define pd_class(x) (*(x))
- #endif
- 
- #ifdef DESIRE
- EXTERN void gobj_subscribe   (t_gobj *self, t_gobj *observer);
- EXTERN void gobj_unsubscribe (t_gobj *self, t_gobj *observer);
- EXTERN void gobj_changed     (t_gobj *self, const char *k);
- EXTERN void gobj_changed2    (t_gobj *self, int argc, t_atom *argv);
- EXTERN void gobj_changed3    (t_gobj *self, t_gobj *origin, int argc, t_atom *argv);
- #endif
  
  /* ----------------- pointers ---------------- */
--- 327,331 ----
***************
*** 473,480 ****
  /* ---------------- widget behaviors ---------------------- */
  
- #ifndef DESIRE
  EXTERN_STRUCT _widgetbehavior;
  #define t_widgetbehavior struct _widgetbehavior
- #endif
  
  EXTERN_STRUCT _parentwidgetbehavior;
--- 379,384 ----
***************
*** 514,520 ****
  EXTERN void class_addanything(t_class *c, t_method fn);
  EXTERN void class_sethelpsymbol(t_class *c, t_symbol *s);
- #ifndef DESIRE
  EXTERN void class_setwidget(t_class *c, t_widgetbehavior *w);
- #endif
  EXTERN void class_setparentwidget(t_class *c, t_parentwidgetbehavior *w);
  EXTERN t_parentwidgetbehavior *class_parentwidget(t_class *c);
--- 418,422 ----
***************
*** 527,535 ****
      class_domainsignalin(c, (char *)(&((type *)0)->field) - (char *)0)
  
- #ifdef DESIRE
- typedef void (*t_notice)(struct _gobj *x, struct _gobj *origin, int argc, t_atom *argv);
- EXTERN void class_setnotice(t_class *c, t_notice notice);
- #endif
- 
  /* prototype for functions to save Pd's to a binbuf */
  typedef void (*t_savefn)(t_gobj *x, t_binbuf *b);
--- 429,432 ----
***************
*** 537,546 ****
  EXTERN t_savefn class_getsavefn(t_class *c);
  
- #ifndef DESIRE
  /* prototype for functions to open properties dialogs */
  typedef void (*t_propertiesfn)(t_gobj *x, struct _glist *glist);
  EXTERN void class_setpropertiesfn(t_class *c, t_propertiesfn f);
  EXTERN t_propertiesfn class_getpropertiesfn(t_class *c);
- #endif
  
  #ifndef PD_CLASS_DEF
--- 434,441 ----

Index: m_imp.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_imp.h,v
retrieving revision 1.3.4.1.2.7
retrieving revision 1.3.4.1.2.8
diff -C2 -d -r1.3.4.1.2.7 -r1.3.4.1.2.8
*** m_imp.h	13 Oct 2006 23:41:48 -0000	1.3.4.1.2.7
--- m_imp.h	30 Nov 2006 01:30:03 -0000	1.3.4.1.2.8
***************
*** 11,17 ****
  /* LATER consider whether to use 'char' for method arg types to save space */
  #ifndef __m_imp_h_
- #ifdef DESIRE
- #include "desire.h"
- #else
  
  /* the structure for a method handler ala Max */
--- 11,14 ----
***************
*** 82,86 ****
  EXTERN void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv);
  EXTERN void glob_quit(void *dummy);
- #endif /* DESIRE */
  #define __m_imp_h_
  #endif /* __m_imp_h_ */
--- 79,82 ----

Index: g_all_guis.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v
retrieving revision 1.4.8.4
retrieving revision 1.4.8.5
diff -C2 -d -r1.4.8.4 -r1.4.8.5
*** g_all_guis.h	30 Nov 2005 13:36:57 -0000	1.4.8.4
--- g_all_guis.h	30 Nov 2006 01:30:03 -0000	1.4.8.5
***************
*** 6,10 ****
  #ifndef __G_ALL_GUIS_H
  #define __G_ALL_GUIS_H
- #ifndef DESIRE
  
  #define IEM_GUI_COLNR_WHITE          0
--- 6,9 ----
***************
*** 336,339 ****
  EXTERN int iem_fstyletoint(t_iem_fstyle_flags *fstylep);
  
- #endif /* DESIRE */
  #endif /* __G_ALL_GUIS_H */
--- 335,337 ----

Index: g_canvas.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_canvas.h,v
retrieving revision 1.3.4.3.2.9
retrieving revision 1.3.4.3.2.10
diff -C2 -d -r1.3.4.3.2.9 -r1.3.4.3.2.10
*** g_canvas.h	17 Sep 2005 22:35:07 -0000	1.3.4.3.2.9
--- g_canvas.h	30 Nov 2006 01:30:03 -0000	1.3.4.3.2.10
***************
*** 40,44 ****
  #ifndef __G_CANVAS_H
  #define __G_CANVAS_H
- #ifndef DESIRE
  
  #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus)
--- 40,43 ----
***************
*** 64,68 ****
  typedef void (*t_glistmotionfn)(void *z, t_floatarg dx, t_floatarg dy);
  typedef void (*t_glistkeyfn)(void *z, t_floatarg key);
- #endif /*DESIRE*/
  
  
--- 63,66 ----
***************
*** 70,75 ****
  #define t_rtext struct _rtext
  
- #ifndef DESIRE
- 
  EXTERN_STRUCT _gtemplate;
  #define t_gtemplate struct _gtemplate
--- 68,71 ----
***************
*** 438,442 ****
  EXTERN int text_ypix(t_text *x, t_glist *glist);
  EXTERN int text_shouldvis(t_text *x, t_glist *glist);
- #endif /*DESIRE */
  
  /* -------------------- functions on rtexts ------------------------- */
--- 434,437 ----
***************
*** 467,471 ****
  
  /* -------------------- functions on canvases ------------------------ */
- #ifndef DESIRE
  EXTERN t_class *canvas_class;
  
--- 462,465 ----
***************
*** 641,645 ****
  #endif
  
- #endif /* DESIRE */
  #endif /* __G_CANVAS_H */
  
--- 635,638 ----

Index: s_stuff.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v
retrieving revision 1.5.4.10.2.8
retrieving revision 1.5.4.10.2.9
diff -C2 -d -r1.5.4.10.2.8 -r1.5.4.10.2.9
*** s_stuff.h	25 Nov 2006 08:06:19 -0000	1.5.4.10.2.8
--- s_stuff.h	30 Nov 2006 01:30:03 -0000	1.5.4.10.2.9
***************
*** 191,197 ****
  #endif
  
- #ifdef DESIRE
- #define API_NONE 0
- #endif
  #define API_ALSA 1
  #define API_OSS 2
--- 191,194 ----
***************
*** 202,229 ****
  #define API_ASIO 7
  
- #ifdef DESIRE
- 
- #if defined(USEAPI_OSS)
- #define API_DEFAULT API_OSS
- #define API_DEFSTRING "oss"
- #elif defined(USEAPI_ALSA)
- #define API_DEFAULT API_ALSA
- #define API_DEFSTRING "alsa"
- #elif defined(USEAPI_JACK)
- #define API_DEFAULT API_JACK
- #define API_DEFSTRING "jack"
- #elif defined(USEAPI_MMIO)
- #define API_DEFAULT API_MMIO
- #define API_DEFSTRING "mmio"
- #elif defined(USEAPI_PORTAUDIO)
- #define API_DEFAULT API_PORTAUDIO
- #define API_DEFSTRING "portaudio"
- #else
- #define API_DEFAULT 0
- #define API_DEFSTRING "none"
- #endif
- 
- #else /* regular devel_0_39 */
- 
  #ifdef __linux__
  #if defined(USEAPI_OSS)
--- 199,202 ----
***************
*** 269,274 ****
  #endif
  
- #endif /* DESIRE */
- 
  #define DEFAULTAUDIODEV 0
  
--- 242,245 ----