From 942e21c0517370cb8163562d9b5b9990d6e84863 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Tue, 13 Mar 2007 23:41:23 +0000 Subject: 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 svn path=/trunk/; revision=7483 --- externals/grill/flext/source/flstk.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'externals/grill/flext/source/flstk.h') diff --git a/externals/grill/flext/source/flstk.h b/externals/grill/flext/source/flstk.h index 4a9b7ece..c3376cb5 100644 --- a/externals/grill/flext/source/flstk.h +++ b/externals/grill/flext/source/flstk.h @@ -2,7 +2,7 @@ flext - C++ layer for Max/MSP and pd (pure data) externals -Copyright (c) 2001-2005 Thomas Grill (gr@grrrr.org) +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. @@ -12,6 +12,12 @@ WARRANTIES, see the file, "license.txt," in this distribution. #define __FLSTK_H #include "flext.h" + +// PI is defined in the Max/MSP SDK, but clashes with Stk.h +#ifdef PI +#undef PI +#endif + #include class FLEXT_SHARE flext_stk: @@ -40,7 +46,8 @@ protected: inline MY_FLOAT lastOut() const { return (MY_FLOAT)buf[index]; } - inline MY_FLOAT tick() { + inline MY_FLOAT tick() + { if(++index >= vecsz) index = 0; return lastOut(); } @@ -61,7 +68,8 @@ protected: public: Output(t_sample *b,int vecsz); - inline void tick(MY_FLOAT s) { + inline void tick(MY_FLOAT s) + { buf[index] = (t_sample)s; if(++index >= vecsz) index = 0; } -- cgit v1.2.1