Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24244/source
Modified Files: flsndobj.h flstk.h Log Message: fix build system for STK and SndObj support (currently unix only) fixed SndObjs include files changed eol-style no stripping of local symbols small changes to flext build system update docs
Index: flsndobj.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsndobj.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** flsndobj.h 27 Sep 2006 07:52:28 -0000 1.10 --- flsndobj.h 13 Mar 2007 23:41:23 -0000 1.11 *************** *** 3,7 **** flext - C++ layer for Max/MSP and pd (pure data) externals
! Copyright (c) 2001-2006 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- flext - C++ layer for Max/MSP and pd (pure data) externals
! Copyright (c) 2001-2007 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 14,22 **** #include "flext.h"
#ifndef FLEXT_THREADS #define NOPTHREAD #endif ! #include <SndObj/SndObj.h> ! #include <SndObj/SndIO.h> #undef NOPTHREAD
--- 14,27 ---- #include "flext.h"
+ // PI is defined in the Max/MSP SDK, but clashes with SndObj.h + #ifdef PI + #undef PI + #endif + #ifndef FLEXT_THREADS #define NOPTHREAD #endif ! #include <SndObj.h> ! #include <SndIO.h> #undef NOPTHREAD
Index: flstk.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstk.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** flstk.h 12 Sep 2005 10:27:40 -0000 1.8 --- flstk.h 13 Mar 2007 23:41:23 -0000 1.9 *************** *** 3,7 **** flext - C++ layer for Max/MSP and pd (pure data) externals
! Copyright (c) 2001-2005 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- flext - C++ layer for Max/MSP and pd (pure data) externals
! Copyright (c) 2001-2007 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 13,16 **** --- 13,22 ----
#include "flext.h" + + // PI is defined in the Max/MSP SDK, but clashes with Stk.h + #ifdef PI + #undef PI + #endif + #include <Stk.h>
*************** *** 41,45 **** inline MY_FLOAT lastOut() const { return (MY_FLOAT)buf[index]; }
! inline MY_FLOAT tick() { if(++index >= vecsz) index = 0; return lastOut(); --- 47,52 ---- inline MY_FLOAT lastOut() const { return (MY_FLOAT)buf[index]; }
! inline MY_FLOAT tick() ! { if(++index >= vecsz) index = 0; return lastOut(); *************** *** 62,66 **** Output(t_sample *b,int vecsz);
! inline void tick(MY_FLOAT s) { buf[index] = (t_sample)s; if(++index >= vecsz) index = 0; --- 69,74 ---- Output(t_sample *b,int vecsz);
! inline void tick(MY_FLOAT s) ! { buf[index] = (t_sample)s; if(++index >= vecsz) index = 0;