updated to 0.37 headers

svn path=/trunk/; revision=1166

5 files changed, 78 insertions, 24 deletions

diff --git a/externals/build/include/g_all_guis.h b/externals/build/include/g_all_guis.h
index 77cf710d..91bf1753 100644
--- a/externals/build/include/g_all_guis.h
+++ b/externals/build/include/g_all_guis.h
@@ -317,3 +317,7 @@ EXTERN int iemgui_dialog(t_iemgui *iemgui, t_symbol **srl, int argc, t_atom *arg
 EXTERN int canvas_getdollarzero(void);
 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);
diff --git a/externals/build/include/g_canvas.h b/externals/build/include/g_canvas.h
index afaecbf5..d3070849 100644
--- a/externals/build/include/g_canvas.h
+++ b/externals/build/include/g_canvas.h
@@ -174,7 +174,6 @@ struct _glist
     unsigned int gl_loading:1;	    /* am now loading from file */
     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 */
     unsigned int gl_isgraph:1;	    /* show as graph on parent */
@@ -259,10 +258,6 @@ typedef void (*t_visfn)(t_gobj *x, struct _glist *glist, int flag);
     	/* field a mouse click (when not in "edit" mode) */
 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... */
 
 struct _widgetbehavior
@@ -274,8 +269,6 @@ struct _widgetbehavior
     t_deletefn w_deletefn;
     t_visfn w_visfn;
     t_clickfn w_clickfn;
-    t_savefn w_savefn;
-    t_propertiesfn w_propertiesfn;
 };
 
 /* -------- behaviors for scalars defined by objects in template --------- */
@@ -350,6 +343,7 @@ EXTERN int gobj_click(t_gobj *x, struct _glist *glist,
     int xpix, int ypix, int shift, int alt, int dbl, int doit);
 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 --------------------- */
 EXTERN t_glist *glist_new( void);
diff --git a/externals/build/include/m_imp.h b/externals/build/include/m_imp.h
index b95f5d0e..f6724f9c 100644
--- a/externals/build/include/m_imp.h
+++ b/externals/build/include/m_imp.h
@@ -44,6 +44,8 @@ struct _class
     t_anymethod c_anymethod;
     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 */
     char c_patchable;	    	    	/* true if we have a t_object header */
diff --git a/externals/build/include/m_pd.h b/externals/build/include/m_pd.h
index b5f7f037..a4b033d9 100644
--- a/externals/build/include/m_pd.h
+++ b/externals/build/include/m_pd.h
@@ -12,6 +12,9 @@ extern "C" {
 #define PD_MAJOR_VERSION 0  /* ... use these two instead. */
 #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 */
 #if defined(NT) && !defined(MSW)
@@ -19,7 +22,7 @@ extern "C" {
 #endif
 
 #ifdef MSW
-// #pragma warning( disable : 4091 ) 
+/* #pragma warning( disable : 4091 ) */
 #pragma warning( disable : 4305 )  /* uncast const double to float */
 #pragma warning( disable : 4244 )  /* uncast float/int conversion etc. */
 #pragma warning( disable : 4101 )  /* unused automatic variables */
@@ -38,7 +41,7 @@ extern "C" {
 
     /* and depending on the compiler, hidden data structures are
     declared differently: */
-#if defined( __GNUC__) || defined( __BORLANDC__ )
+#if defined( __GNUC__) || defined( __BORLANDC__ ) || defined( __MWERKS__ )
 #define EXTERN_STRUCT struct
 #else
 #define EXTERN_STRUCT extern struct
@@ -52,12 +55,9 @@ extern "C" {
 #define MAXPDSTRING 1000	/* use this for anything you want */
 #define MAXPDARG 5    	    	/* max number of args we can typecheck today */
 
-    /* signed and unsigned integer types the size of a pointer:  */
-#ifdef __alpha__
+/* signed and unsigned integer types the size of a pointer:  */
+/* GG: long is the size of a pointer */
 typedef long t_int;
-#else
-typedef int t_int;
-#endif
 
 typedef float t_float;	/* a floating-point number at most the same size */
 typedef float t_floatarg;  /* floating-point type for function calls */
@@ -419,6 +419,15 @@ EXTERN void class_domainsignalin(t_class *c, int onset);
 #define CLASS_MAINSIGNALIN(c, type, field) \
     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))
 #define class_addpointer(x, y) class_addpointer((x), (t_method)(y))
@@ -457,6 +466,15 @@ EXTERN int open_via_path(const char *name, const char *ext, const char *dir,
 EXTERN int sched_geteventno(void);
 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 ----------------------------------- */
 
 typedef float t_sample;
@@ -561,6 +579,7 @@ EXTERN t_class *garray_class;
 EXTERN int garray_getfloatarray(t_garray *x, int *size, t_float **vec);
 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);
 EXTERN void garray_resize(t_garray *x, t_floatarg f);
@@ -577,9 +596,12 @@ EXTERN int value_setfloat(t_symbol *s, t_float f);
 EXTERN void sys_vgui(char *fmt, ...);
 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 --------------------*/
 
 /* the following reflects the new way classes are laid out, with the class
diff --git a/externals/build/include/s_stuff.h b/externals/build/include/s_stuff.h
index 6d27337f..98fd35ca 100644
--- a/externals/build/include/s_stuff.h
+++ b/externals/build/include/s_stuff.h
@@ -54,12 +54,18 @@ extern int sys_sleepgrain;
 void sys_open_audio(int naudioindev, int *audioindev,
     int nchindev, int *chindev,
     int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev,
-    int srate); /* IOhannes */
+    int srate, int advance, int enable);
 void sys_close_audio(void);
 
-void sys_open_midi(int nmidiin, int *midiinvec,
+    /* 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);
 void sys_reportidle(void);
@@ -90,6 +96,7 @@ EXTERN void sys_log_error(int type);
 #define ERR_DACSLEPT 2
 #define ERR_RESYNC 3
 #define ERR_DATALATE 4
+void sched_set_using_dacs(int flag);
 
 /* s_inter.c */
 
@@ -136,9 +143,19 @@ void sys_setvirtualalarm( void);
 #define API_DEFAULT API_PORTAUDIO
 #define API_DEFSTRING "portaudio"
 #endif
-#define DEFAULTAUDIODEV -1
+#define DEFAULTAUDIODEV 0
+
+#define MAXAUDIOINDEV 4
+#define MAXAUDIOOUTDEV 4
 
-#define DEFMIDIDEV -1
+#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,
     t_sample *soundout, int framesperbuf, int nbuffers,
@@ -147,6 +164,9 @@ void pa_close_audio(void);
 int pa_send_dacs(void);
 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,
     int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev,
@@ -154,18 +174,27 @@ int oss_open_audio(int naudioindev, int *audioindev, int nchindev,
 void oss_close_audio(void);
 int oss_send_dacs(void);
 void oss_reportidle(void);
-void oss_listdevs(void);
+void oss_getdevs(char *indevlist, int *nindevs,
+    char *outdevlist, int *noutdevs, int *canmulti, 
+    	int maxndev, int devdescsize);
 
-int alsa_open_audio(int wantinchans, int wantoutchans, int srate);
+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_listdevs(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);
 void jack_close_audio(void);
 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);
 
 void mmio_open_audio(int naudioindev, int *audioindev,
@@ -174,13 +203,16 @@ void mmio_open_audio(int naudioindev, int *audioindev,
 void mmio_close_audio( void);
 void mmio_reportidle(void);
 int mmio_send_dacs(void);
-void mmio_listdevs(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_sound_api(int whichapi);
+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);
-