Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31584
Modified Files: Tag: desiredata m_pd.h Log Message: merging 0.40
Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.5 retrieving revision 1.4.4.11.2.33.2.6 diff -C2 -d -r1.4.4.11.2.33.2.5 -r1.4.4.11.2.33.2.6 *** m_pd.h 3 Dec 2006 00:10:31 -0000 1.4.4.11.2.33.2.5 --- m_pd.h 8 Dec 2006 05:43:07 -0000 1.4.4.11.2.33.2.6 *************** *** 10,16 ****
#define PD_MAJOR_VERSION 0 ! #define PD_MINOR_VERSION 39 ! #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 --- 10,16 ----
#define PD_MAJOR_VERSION 0 ! #define PD_MINOR_VERSION 40 #define PD_DEVEL_VERSION 1 /* T.Grill - mark for devel branch */ + #define PD_TEST_VERSION ""
/* old name for "MSW" flag -- we have to take it for the sake of many old *************** *** 24,33 **** #endif
! #if defined(MSW) && !defined (__GNUC__) /* #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 */ ! #endif /* MSW */
/* the external storage class is "extern" in GCC; in MS-C it's ugly. */ --- 24,33 ---- #endif
! #ifdef _MSC_VER /* #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 */ ! #endif /* _MSC_VER */
/* the external storage class is "extern" in GCC; in MS-C it's ugly. */ *************** *** 361,373 **** EXTERN t_atom *binbuf_getvec(t_binbuf *x); EXTERN void binbuf_eval(t_binbuf *x, t_pd *target, int argc, t_atom *argv); ! EXTERN int binbuf_read(t_binbuf *b, char *filename, char *dirname, ! int crflag); ! EXTERN int binbuf_read_via_path(t_binbuf *b, char *filename, char *dirname, ! int crflag); ! EXTERN int binbuf_write(t_binbuf *x, char *filename, char *dir, ! int crflag); EXTERN void binbuf_evalfile(t_symbol *name, t_symbol *dir); ! EXTERN t_symbol *binbuf_realizedollsym(t_symbol *s, int ac, t_atom *av, ! int tonew);
/* ------------------ clocks --------------- */ --- 361,370 ---- EXTERN t_atom *binbuf_getvec(t_binbuf *x); EXTERN void binbuf_eval(t_binbuf *x, t_pd *target, int argc, t_atom *argv); ! EXTERN int binbuf_read( t_binbuf *b, char *filename, char *dirname, int crflag); ! EXTERN int binbuf_read_via_canvas(t_binbuf *b, char *filename, t_canvas *canvas, int crflag); ! EXTERN int binbuf_read_via_path( t_binbuf *b, char *filename, char *dirname, int crflag); ! EXTERN int binbuf_write( t_binbuf *x, char *filename, char *dir, int crflag); EXTERN void binbuf_evalfile(t_symbol *name, t_symbol *dir); ! EXTERN t_symbol *binbuf_realizedollsym(t_symbol *s, int ac, t_atom *av, int tonew);
/* ------------------ clocks --------------- */ *************** *** 453,460 **** EXTERN t_symbol *canvas_getcurrentdir(void); EXTERN t_glist *canvas_getcurrent(void); ! EXTERN void canvas_makefilename(t_glist *c, char *file, ! char *result,int resultsize); EXTERN t_symbol *canvas_getdir(t_glist *x); EXTERN void canvas_dataproperties(t_glist *x, t_scalar *sc, t_binbuf *b);
/* ---------------- widget behaviors ---------------------- */ --- 450,458 ---- EXTERN t_symbol *canvas_getcurrentdir(void); EXTERN t_glist *canvas_getcurrent(void); ! EXTERN void canvas_makefilename(t_glist *c, char *file, char *result, int resultsize); EXTERN t_symbol *canvas_getdir(t_glist *x); EXTERN void canvas_dataproperties(t_glist *x, t_scalar *sc, t_binbuf *b); + EXTERN int canvas_open(t_canvas *x, const char *name, const char *ext, + char *dirresult, char **nameresult, unsigned int size, int bin);
/* ---------------- widget behaviors ---------------------- */ *************** *** 586,589 **** --- 584,588 ---- struct _signal *s_nextfree; /* next in freelist */ struct _signal *s_nextused; /* next in used list */ + int s_vecsize; /* allocated size of array in points */ } t_signal;