[PD-cvs] externals/build/include g_all_guis.h,1.2,1.3 g_canvas.h,1.3,1.4 m_imp.h,1.3,1.4 m_pd.h,1.1,1.2 s_stuff.h,1.1,1.2

Wed Nov 5 12:26:11 CET 2003

Update of /cvsroot/pure-data/externals/build/include
In directory sc8-pr-cvs1:/tmp/cvs-serv23989

Modified Files:
	g_all_guis.h g_canvas.h m_imp.h m_pd.h s_stuff.h 
Log Message:
updated to 0.37 headers

Index: g_all_guis.h
===================================================================
RCS file: /cvsroot/pure-data/externals/build/include/g_all_guis.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** g_all_guis.h	19 Jun 2003 17:29:55 -0000	1.2
--- g_all_guis.h	5 Nov 2003 11:26:09 -0000	1.3
***************
*** 318,319 ****
--- 318,323 ----
  EXTERN void canvas_getargs(int *argcp, t_atom **argvp);

+ EXTERN void iem_inttosymargs(t_iem_init_symargs *symargp, int n);
+ EXTERN int iem_symargstoint(t_iem_init_symargs *symargp);
+ EXTERN void iem_inttofstyle(t_iem_fstyle_flags *fstylep, int n);
+ EXTERN int iem_fstyletoint(t_iem_fstyle_flags *fstylep);

Index: g_canvas.h
===================================================================
RCS file: /cvsroot/pure-data/externals/build/include/g_canvas.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** g_canvas.h	10 Jun 2003 20:34:58 -0000	1.3
--- g_canvas.h	5 Nov 2003 11:26:09 -0000	1.4
***************
*** 175,179 ****
      unsigned int gl_willvis:1;	    /* make me visible after loading */ 
      unsigned int gl_edit:1;  	    /* edit mode */
-     unsigned int gl_imatemplate:1;  /* someone needs me as template */
      unsigned int gl_isdeleting:1;   /* we're inside glist_delete -- hack! */
      unsigned int gl_stretch:1;	    /* stretch contents on resize */
--- 175,178 ----
***************
*** 260,267 ****
  typedef int (*t_clickfn)(t_gobj *x, struct _glist *glist,
      int xpix, int ypix, int shift, int alt, int dbl, int doit);
-     	/*  save to a binbuf */
- typedef void (*t_savefn)(t_gobj *x, t_binbuf *b);
-     	/*  open properties dialog */
- typedef void (*t_propertiesfn)(t_gobj *x, struct _glist *glist);
      	/* ... and later, resizing; getting/setting font or color... */

--- 259,262 ----
***************
*** 275,280 ****
      t_visfn w_visfn;
      t_clickfn w_clickfn;
-     t_savefn w_savefn;
-     t_propertiesfn w_propertiesfn;
  };

--- 270,273 ----
***************
*** 351,354 ****
--- 344,348 ----
  EXTERN void gobj_save(t_gobj *x, t_binbuf *b);
  EXTERN void gobj_properties(t_gobj *x, struct _glist *glist);
+ EXTERN void gobj_save(t_gobj *x, t_binbuf *b);

  /* -------------------- functions on glists --------------------- */

Index: m_imp.h
===================================================================
RCS file: /cvsroot/pure-data/externals/build/include/m_imp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** m_imp.h	10 Jun 2003 20:34:58 -0000	1.3
--- m_imp.h	5 Nov 2003 11:26:09 -0000	1.4
***************
*** 45,48 ****
--- 45,50 ----
      struct _widgetbehavior *c_wb; 	/* "gobjs" only */
      struct _parentwidgetbehavior *c_pwb;/* widget behavior in parent */
+     t_savefn c_savefn;	    	    	/* function to call when saving */
+     t_propertiesfn c_propertiesfn; 	/* function to start prop dialog */
      int c_floatsignalin; 	    	/* onset to float for signal input */
      char c_gobj;	    		/* true if is a gobj */

Index: m_pd.h
===================================================================
RCS file: /cvsroot/pure-data/externals/build/include/m_pd.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** m_pd.h	10 Jun 2003 20:34:58 -0000	1.1
--- m_pd.h	5 Nov 2003 11:26:09 -0000	1.2
***************
*** 13,16 ****
--- 13,19 ----
  #define PD_MINOR_VERSION 37   

+ #define PD_DEVEL_VERSION 1  /* T.Grill - mark for devel branch */
+ 
+ 
  /* old name for "MSW" flag -- we have to take it for the sake of many old
  "nmakefiles" for externs, which will define NT and not MSW */
***************
*** 20,24 ****

  #ifdef MSW
! // #pragma warning( disable : 4091 ) 
  #pragma warning( disable : 4305 )  /* uncast const double to float */
  #pragma warning( disable : 4244 )  /* uncast float/int conversion etc. */
--- 23,27 ----

  #ifdef MSW
! /* #pragma warning( disable : 4091 ) */
  #pragma warning( disable : 4305 )  /* uncast const double to float */
  #pragma warning( disable : 4244 )  /* uncast float/int conversion etc. */
***************
*** 39,43 ****
      /* and depending on the compiler, hidden data structures are
      declared differently: */
! #if defined( __GNUC__) || defined( __BORLANDC__ )
  #define EXTERN_STRUCT struct
  #else
--- 42,46 ----
      /* and depending on the compiler, hidden data structures are
      declared differently: */
! #if defined( __GNUC__) || defined( __BORLANDC__ ) || defined( __MWERKS__ )
  #define EXTERN_STRUCT struct
  #else
***************
*** 53,62 ****
  #define MAXPDARG 5    	    	/* max number of args we can typecheck today */

!     /* signed and unsigned integer types the size of a pointer:  */
! #ifdef __alpha__
  typedef long t_int;
- #else
- typedef int t_int;
- #endif

  typedef float t_float;	/* a floating-point number at most the same size */
--- 56,62 ----
  #define MAXPDARG 5    	    	/* max number of args we can typecheck today */

! /* signed and unsigned integer types the size of a pointer:  */
! /* GG: long is the size of a pointer */
  typedef long t_int;

  typedef float t_float;	/* a floating-point number at most the same size */
***************
*** 420,423 ****
--- 420,432 ----
      class_domainsignalin(c, (char *)(&((type *)0)->field) - (char *)0)

+     	 /* prototype for functions to save Pd's to a binbuf */
+ typedef void (*t_savefn)(t_gobj *x, t_binbuf *b);
+ EXTERN void class_setsavefn(t_class *c, t_savefn f);
+ EXTERN t_savefn class_getsavefn(t_class *c);
+     	/* 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);
+ 
  #ifndef PD_CLASS_DEF
  #define class_addbang(x, y) class_addbang((x), (t_method)(y))
***************
*** 458,461 ****
--- 467,479 ----
  EXTERN double sys_getrealtime(void);

+ 
+ /* ------------  threading ------------------- */
+ /* T.Grill - see m_sched.c */
+  
+ EXTERN void sys_lock(void);
+ EXTERN void sys_unlock(void);
+ EXTERN int sys_trylock(void);
+ 
+ 
  /* --------------- signals ----------------------------------- */

***************
*** 562,565 ****
--- 580,584 ----
  EXTERN float garray_get(t_garray *x, t_symbol *s, t_int indx);
  EXTERN void garray_redraw(t_garray *x);
+ EXTERN double garray_updatetime(t_garray *x); /* T.Grill - get last update time (clock_getlogicaltime) */
  EXTERN int garray_npoints(t_garray *x);
  EXTERN char *garray_vec(t_garray *x);
***************
*** 578,583 ****
--- 597,605 ----
  EXTERN void sys_gui(char *s);

+     /* dialog window creation and destruction */
  EXTERN void gfxstub_new(t_pd *owner, void *key, const char *cmd);
  EXTERN void gfxstub_deleteforkey(void *key);
+ 
+ extern t_class *glob_pdobject;	/* object to send "pd" messages */

  /*-------------  Max 0.26 compatibility --------------------*/

Index: s_stuff.h
===================================================================
RCS file: /cvsroot/pure-data/externals/build/include/s_stuff.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** s_stuff.h	10 Jun 2003 20:34:58 -0000	1.1
--- s_stuff.h	5 Nov 2003 11:26:09 -0000	1.2
***************
*** 55,64 ****
      int nchindev, int *chindev,
      int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev,
!     int srate); /* IOhannes */
  void sys_close_audio(void);

! void sys_open_midi(int nmidiin, int *midiinvec,
      int nmidiout, int *midioutvec);
  void sys_close_midi(void);

  int sys_send_dacs(void);
--- 55,70 ----
      int nchindev, int *chindev,
      int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev,
!     int srate, int advance, int enable);
  void sys_close_audio(void);

!     /* s_midi.c */
! void sys_open_midi(int nmidiin, int *midiinvec, int nmidiout, int *midioutvec);
! 
!     /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */
! void sys_do_open_midi(int nmidiin, int *midiinvec,
      int nmidiout, int *midioutvec);
  void sys_close_midi(void);
+ void midi_getdevs(char *indevlist, int *nindevs,
+     char *outdevlist, int *noutdevs, int maxndev, int devdescsize);

  int sys_send_dacs(void);
***************
*** 91,94 ****
--- 97,101 ----
  #define ERR_RESYNC 3
  #define ERR_DATALATE 4
+ void sched_set_using_dacs(int flag);

  /* s_inter.c */
***************
*** 137,143 ****
  #define API_DEFSTRING "portaudio"
  #endif
! #define DEFAULTAUDIODEV -1

! #define DEFMIDIDEV -1

  int pa_open_audio(int inchans, int outchans, int rate, t_sample *soundin,
--- 144,160 ----
  #define API_DEFSTRING "portaudio"
  #endif
! #define DEFAULTAUDIODEV 0

! #define MAXAUDIOINDEV 4
! #define MAXAUDIOOUTDEV 4
! 
! #define DEFMIDIDEV 0
! 
! #define DEFAULTSRATE 44100
! #ifdef MSW
! #define DEFAULTADVANCE 70
! #else
! #define DEFAULTADVANCE 50
! #endif

  int pa_open_audio(int inchans, int outchans, int rate, t_sample *soundin,
***************
*** 148,151 ****
--- 165,171 ----
  void sys_reportidle(void);
  void pa_listdevs(void);
+ void pa_getdevs(char *indevlist, int *nindevs,
+     char *outdevlist, int *noutdevs, int *canmulti, 
+     	int maxndev, int devdescsize);

  int oss_open_audio(int naudioindev, int *audioindev, int nchindev,
***************
*** 155,165 ****
  int oss_send_dacs(void);
  void oss_reportidle(void);
! void oss_listdevs(void);

! int alsa_open_audio(int wantinchans, int wantoutchans, int srate);
  void alsa_close_audio(void);
  int alsa_send_dacs(void);
  void alsa_reportidle(void);
! void alsa_listdevs(void);

  int jack_open_audio(int wantinchans, int wantoutchans, int srate);
--- 175,191 ----
  int oss_send_dacs(void);
  void oss_reportidle(void);
! void oss_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int *canmulti, 
!     	int maxndev, int devdescsize);

! int alsa_open_audio(int naudioindev, int *audioindev, int nchindev,
!     int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev,
!     int *choutdev, int rate);
  void alsa_close_audio(void);
  int alsa_send_dacs(void);
  void alsa_reportidle(void);
! void alsa_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int *canmulti, 
!     	int maxndev, int devdescsize);

  int jack_open_audio(int wantinchans, int wantoutchans, int srate);
***************
*** 167,170 ****
--- 193,199 ----
  int jack_send_dacs(void);
  void jack_reportidle(void);
+ void jack_getdevs(char *indevlist, int *nindevs,
+     char *outdevlist, int *noutdevs, int *canmulti, 
+     	int maxndev, int devdescsize);
  void jack_listdevs(void);

***************
*** 175,186 ****
  void mmio_reportidle(void);
  int mmio_send_dacs(void);
! void mmio_listdevs(void);

  void sys_listmididevs(void);
! void sys_set_sound_api(int whichapi);
  extern int sys_audioapi;

  /* API dependent audio flags and settings */
  void oss_set32bit( void);
  void linux_alsa_devname(char *devname);
- 
--- 204,218 ----
  void mmio_reportidle(void);
  int mmio_send_dacs(void);
! void mmio_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int *canmulti, 
!     	int maxndev, int devdescsize);

  void sys_listmididevs(void);
! void sys_set_audio_api(int whichapi);
! void sys_get_audio_apis(char *buf);
  extern int sys_audioapi;
+ void sys_set_audio_state(int onoff);

  /* API dependent audio flags and settings */
  void oss_set32bit( void);
  void linux_alsa_devname(char *devname);