aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext/source/flstk.h
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2007-03-13 23:41:23 +0000
committerThomas Grill <xovo@users.sourceforge.net>2007-03-13 23:41:23 +0000
commit942e21c0517370cb8163562d9b5b9990d6e84863 (patch)
treeefa7e19061e86b62fdbafabd13c4f827580909d2 /externals/grill/flext/source/flstk.h
parent3bc26233a8df24bd6d15c031d1a6cdd0f6f23535 (diff)
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
Diffstat (limited to 'externals/grill/flext/source/flstk.h')
-rw-r--r--externals/grill/flext/source/flstk.h14
1 files changed, 11 insertions, 3 deletions
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 <Stk.h>
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;
}