Merge branchesHEADsvn2git-headmaster

- abstractions/tb
- externals/tb

4 files changed, 230 insertions, 0 deletions

diff --git a/StringFlt~/SConstruct b/StringFlt~/SConstruct
new file mode 100644
index 0000000..4782920
--- /dev/null
+++ b/StringFlt~/SConstruct
@@ -0,0 +1,110 @@
+# scons script for flext build system
+# Copyright (C) 2005  Tim Blechmann
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+
+env = Environment(CCFLAGS = '-DFLEXT_SYS_PD -DFLEXT_THREADS -DFLEXT_SHARED')
+
+env.SConsignFile()
+env.CacheDir('./obj')
+
+opt = Options(['options.cache', 'custom.py'])
+opt.AddOptions(
+	BoolOption('debug', 'Build with debugging symbols', False),
+	('optimize', 'Optimize for specific architecture', None),
+	BoolOption('simd', 'build with simd instructions', False),
+	('prefix', 'install prefix', '/usr/local'),
+	('flext_path', 'flext path', None),
+	('pd_path', 'pd path', None),
+	)
+
+opt.Update(env)
+
+opt.Save('options.cache',env)
+Help(opt.GenerateHelpText(env))
+
+
+if env.Dictionary().has_key('flext_path'):
+	env.Append(CPPPATH=[env['flext_path']])
+else:
+	env.Append(CPPPATH=['../../grill/flext/source'])
+
+
+if env.Dictionary().has_key('pd_path'):
+	env.Append(CPPPATH=[env['pd_path']])
+
+if env.Dictionary().has_key('optimize'):
+	if env['optimize']:
+		env.Append(CCFLAGS=' -O3 '+env['optimize'])
+
+if env.Dictionary().has_key('simd') and env['simd']:
+	env.Append(CCFLAGS=' -mfpmath=sse -msse -mmmx -msse2')
+			   
+if env.Dictionary().has_key('debug') and env['debug']:
+	env.Append(CCFLAGS=' -g')
+	env.Append(LIBS = 'flext-pd_d')
+else:
+	env.Append(LIBS = 'flext-pd')
+	env.Append(CPPDEFINES="NDEBUG")
+
+######################################################################
+#
+# read package.txt
+#
+
+packagefile = open('./package.txt', 'r')
+
+desc = {}
+line = packagefile.readline()
+while line != "":
+	line = line.strip()
+	if len(line) > 0 and line[0] != '#' :
+		var, data = line.split('=')
+
+		while data [-1] == '\\':
+			nextline = packagefile.readline()
+			nextline = nextline.strip()
+			data = data + " " + nextline
+
+		data = data.replace("\\", "")
+		desc[var] = data
+
+	
+	line = packagefile.readline()
+packagefile.close()
+
+
+name = desc["NAME"]
+if not desc.has_key("SRCDIR"):
+	desc["SRCDIR"] = "."
+
+sources = map (lambda x: desc["SRCDIR"] + '/' + x,
+			   desc["SRCS"].split())
+
+if desc.has_key("INCPATH"):
+	env.Append(CPPPATH=desc["INCPATH"].strip().replace("-I", "").split())
+
+######################################################################
+#
+# build
+#
+
+external = env.SharedLibrary(name, sources, SHLIBPREFIX='', SHLIBSUFFIX='.pd_linux')
+
+prefix = env['prefix']
+env.Install(prefix+'/lib/pd/extra',external)
+env.Alias('install', prefix+'/lib/pd/extra')
diff --git a/StringFlt~/StringFlt~-help.pd b/StringFlt~/StringFlt~-help.pd
new file mode 100644
index 0000000..0cf163a
--- /dev/null
+++ b/StringFlt~/StringFlt~-help.pd
@@ -0,0 +1,19 @@
+#N canvas 453 122 450 300 10;
+#X obj 97 80 noise~;
+#X obj 100 180 dac~;
+#X obj 99 110 *~ 0.01;
+#X floatatom 163 74 5 0 0 0 - - -;
+#X obj 101 142 StringFlt~;
+#X obj 195 204 env~;
+#X floatatom 195 234 5 0 0 0 - - -;
+#X obj 216 132 env~;
+#X floatatom 216 162 5 0 0 0 - - -;
+#X connect 0 0 2 0;
+#X connect 2 0 4 0;
+#X connect 2 0 7 0;
+#X connect 3 0 2 1;
+#X connect 4 0 1 0;
+#X connect 4 0 1 1;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 7 0 8 0;
diff --git a/StringFlt~/StringFlt~.cpp b/StringFlt~/StringFlt~.cpp
new file mode 100644
index 0000000..74da6f7
--- /dev/null
+++ b/StringFlt~/StringFlt~.cpp
@@ -0,0 +1,99 @@
+// 
+//  
+//  direct port of sndobj's StringFlt
+//  Copyright (C) 2005  Tim Blechmann
+//  
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//  
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//  
+//  You should have received a copy of the GNU General Public License
+//  along with this program; see the file COPYING.  If not, write to
+//  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+//  Boston, MA 02111-1307, USA.
+
+
+
+#define FLEXT_ATTRIBUTES 1
+
+#include <flsndobj.h>
+ 
+#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 500)
+#error You need at least flext version 0.5
+#endif
+
+
+class FlextStringFlt:
+	public flext_sndobj
+{
+	FLEXT_HEADER(FlextStringFlt,flext_sndobj);
+
+public:
+	FlextStringFlt(int argc, t_atom* argv);
+
+	virtual bool NewObjs();
+	virtual void FreeObjs();
+	virtual void ProcessObjs();
+
+	StringFlt* string;
+
+	float fdbgain;
+
+	float freq;
+	
+private:
+	
+	FLEXT_ATTRVAR_F(fdbgain);
+	FLEXT_ATTRVAR_F(freq);
+};
+
+FLEXT_LIB_DSP_V("StringFlt~",FlextStringFlt)
+
+
+FlextStringFlt::FlextStringFlt(int argc, t_atom* argv)
+{
+	AtomList l(argc, argv);
+	
+	FLEXT_ADDATTR_VAR1("fdbgain", fdbgain);
+	FLEXT_ADDATTR_VAR1("frequency", freq);
+
+	AddInSignal(1);
+	AddOutSignal(1);
+}
+
+
+bool FlextStringFlt::NewObjs()
+{
+	string = new StringFlt(freq, fdbgain, &InObj(0), 
+		0, Blocksize(), Samplerate());
+	
+	return true;
+}
+
+void FlextStringFlt::FreeObjs()
+{
+	delete string;
+}
+
+void FlextStringFlt::ProcessObjs()
+{
+	string->SetFreq(freq);
+	string->SetFdbgain(fdbgain);
+
+	string->DoProcess();
+
+	*string >> OutObj(0);
+}
+
+static void setup()
+{
+	FLEXT_DSP_SETUP(FlextStringFlt);
+}
+
+FLEXT_LIB_SETUP(StringFlt_tilde,setup)
diff --git a/StringFlt~/package.txt b/StringFlt~/package.txt
new file mode 100644
index 0000000..745e3db
--- /dev/null
+++ b/StringFlt~/package.txt
@@ -0,0 +1,2 @@
+NAME=StringFlt~

+SRCS=StringFlt~.cpp