diff options
20 files changed, 24 insertions, 13 deletions
diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw Binary files differindex e3b996b4..a2cad0cb 100644 --- a/externals/grill/flext/flext.cw +++ b/externals/grill/flext/flext.cw diff --git a/externals/grill/flext/readme.txt b/externals/grill/flext/readme.txt index 1e566d19..7696ef6f 100644 --- a/externals/grill/flext/readme.txt +++ b/externals/grill/flext/readme.txt @@ -40,6 +40,9 @@ Package files: > if you choose to compile with STK support you will need the respective package and build a library > download from: http://ccrma-www.stanford.edu/software/stk/ +> For linking it may preferable to use a library of all the STK objects. +> Under linux you can create one from the STK directory with: +> "g++ -c -pipe -I include -D __LINUX_OSS__ src/*.cpp && ar r libstk.a *.o && rm -f *.o" ---------------------------------------------------------------------------- diff --git a/externals/grill/flext/source/flitem.cpp b/externals/grill/flext/source/flitem.cpp index 271745df..ddcf570b 100755 --- a/externals/grill/flext/source/flitem.cpp +++ b/externals/grill/flext/source/flitem.cpp @@ -143,7 +143,7 @@ public: enum { HASHBITS=7, HASHSIZE=1<<HASHBITS }; _itemarr(flext_obj::t_classid c,int i); - ~_itemarr(); // will never be called + ~_itemarr(); static int Hash(flext_obj::t_classid c,int ix); @@ -163,6 +163,12 @@ _itemarr::_itemarr(flext_obj::t_classid c,int i): nxt(NULL) {} +_itemarr::~_itemarr() +{ + delete arr; + if(nxt) delete nxt; +} + void _itemarr::Add(_itemarr *a) { if(nxt) nxt->Add(a); diff --git a/externals/grill/flext/tutorial/adv1/adv1.cw b/externals/grill/flext/tutorial/adv1/adv1.cw Binary files differindex 7c6c1e33..08e0dff0 100755 --- a/externals/grill/flext/tutorial/adv1/adv1.cw +++ b/externals/grill/flext/tutorial/adv1/adv1.cw diff --git a/externals/grill/flext/tutorial/adv2/adv2.cw b/externals/grill/flext/tutorial/adv2/adv2.cw Binary files differindex 0e555e20..0050c301 100755 --- a/externals/grill/flext/tutorial/adv2/adv2.cw +++ b/externals/grill/flext/tutorial/adv2/adv2.cw diff --git a/externals/grill/flext/tutorial/adv3/adv3.cw b/externals/grill/flext/tutorial/adv3/adv3.cw Binary files differindex ed5e1110..9a417948 100755 --- a/externals/grill/flext/tutorial/adv3/adv3.cw +++ b/externals/grill/flext/tutorial/adv3/adv3.cw diff --git a/externals/grill/flext/tutorial/attr1/attr1.cw b/externals/grill/flext/tutorial/attr1/attr1.cw Binary files differindex cf880938..4ed59172 100755 --- a/externals/grill/flext/tutorial/attr1/attr1.cw +++ b/externals/grill/flext/tutorial/attr1/attr1.cw diff --git a/externals/grill/flext/tutorial/attr2/attr2.cw b/externals/grill/flext/tutorial/attr2/attr2.cw Binary files differindex 05cd19b0..f0b7c6a0 100755 --- a/externals/grill/flext/tutorial/attr2/attr2.cw +++ b/externals/grill/flext/tutorial/attr2/attr2.cw diff --git a/externals/grill/flext/tutorial/attr3/attr3.cw b/externals/grill/flext/tutorial/attr3/attr3.cw Binary files differindex 5fe6b36a..c5e46da7 100755 --- a/externals/grill/flext/tutorial/attr3/attr3.cw +++ b/externals/grill/flext/tutorial/attr3/attr3.cw diff --git a/externals/grill/flext/tutorial/config-pd-linux.txt b/externals/grill/flext/tutorial/config-pd-linux.txt index 3569347c..5303705d 100644 --- a/externals/grill/flext/tutorial/config-pd-linux.txt +++ b/externals/grill/flext/tutorial/config-pd-linux.txt @@ -22,7 +22,7 @@ SNDOBJ=/usr/local/include/SndObj # where is the STK include directory? # (leave blank or comment out to disable STK support) # if defined, you must have a libstk.a library in the lib path -# STK=/usr/src/stk-4.1.1/include +STK=/usr/src/stk-4.1.1/include # where should the examples be built? (relative path) OUTPATH=./pd-linux diff --git a/externals/grill/flext/tutorial/lib1/lib1.cw b/externals/grill/flext/tutorial/lib1/lib1.cw Binary files differindex 3ed47c99..8310c18d 100755 --- a/externals/grill/flext/tutorial/lib1/lib1.cw +++ b/externals/grill/flext/tutorial/lib1/lib1.cw diff --git a/externals/grill/flext/tutorial/pd/ex-attr3.pd b/externals/grill/flext/tutorial/pd/ex-attr3.pd index 48a89137..de7b47a0 100644 --- a/externals/grill/flext/tutorial/pd/ex-attr3.pd +++ b/externals/grill/flext/tutorial/pd/ex-attr3.pd @@ -1,20 +1,20 @@ #N canvas 175 139 607 457 12; -#X obj 16 7 cnv 15 550 40 empty empty attr3 10 22 32 24 -260818 -1 -0; +#X obj 16 7 cnv 15 550 40 empty empty attr3 10 22 0 24 -260818 -1 0 +; #X text 174 28 http://www.parasitaere-kapazitaeten.net; -#X obj 293 364 bng 15 250 50 0 empty empty empty 0 -6 32 8 -262144 --1 -1; -#X obj 196 361 nbx 5 18 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 -12 -228992 -1 -1 2 256; +#X obj 293 364 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 196 361 nbx 5 18 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 12 +-228992 -1 -1 2 256; #X msg 296 126 1 10; #X msg 419 127 1; #X msg 459 127 -1; #X msg 498 127 2; -#X obj 36 128 bng 25 250 50 0 empty empty empty 0 -6 32 8 -258699 -1 +#X obj 36 128 bng 25 250 50 0 empty empty empty 0 -6 0 8 -258699 -1 -1; #X msg 344 126 7 2; -#X obj 173 119 nbx 5 18 -1e+37 1e+37 0 0 empty empty empty 0 -6 32 -12 -228992 -1 -1 17 256; +#X obj 173 119 nbx 5 18 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 12 +-228992 -1 -1 20 256; #X msg 174 142 set \$1; #X text 20 107 trigger; #X text 163 100 set counter; @@ -26,10 +26,10 @@ #X obj 197 327 attr3 @bounds 2 5 @step 1; #X msg 32 195 getattributes; #X obj 392 363 print; -#X text 447 362 attributes; +#X text 385 381 attributes; #X msg 32 237 getcount; #X msg 388 232 getstep; -#X text 167 196 list all attributes; +#X text 22 178 list all attributes; #X msg 32 266 count 3; #X text 117 238 get count; #X text 112 266 set count; diff --git a/externals/grill/flext/tutorial/readme.txt b/externals/grill/flext/tutorial/readme.txt index 98221ae7..3be656e7 100644 --- a/externals/grill/flext/tutorial/readme.txt +++ b/externals/grill/flext/tutorial/readme.txt @@ -29,6 +29,8 @@ download from: http://www.may.ie/academic/music/musictec/SndObj/main.html if you choose to compile with STK support you will need the respective package and build a library download from: http://ccrma-www.stanford.edu/software/stk/ +Under linux you can create such a library from the STK directory with: +"g++ -c -pipe -I include -D __LINUX_OSS__ src/*.cpp && ar r libstk.a *.o && rm -f *.o" ---------------------------------------------------------------------------- diff --git a/externals/grill/flext/tutorial/signal1/signal1.cw b/externals/grill/flext/tutorial/signal1/signal1.cw Binary files differindex 9e0d4f91..32e82771 100644 --- a/externals/grill/flext/tutorial/signal1/signal1.cw +++ b/externals/grill/flext/tutorial/signal1/signal1.cw diff --git a/externals/grill/flext/tutorial/signal2/signal2.cw b/externals/grill/flext/tutorial/signal2/signal2.cw Binary files differindex 848b3430..260893e2 100644 --- a/externals/grill/flext/tutorial/signal2/signal2.cw +++ b/externals/grill/flext/tutorial/signal2/signal2.cw diff --git a/externals/grill/flext/tutorial/simple1/simple1.cw b/externals/grill/flext/tutorial/simple1/simple1.cw Binary files differindex cd344206..e6b451be 100755 --- a/externals/grill/flext/tutorial/simple1/simple1.cw +++ b/externals/grill/flext/tutorial/simple1/simple1.cw diff --git a/externals/grill/flext/tutorial/simple2/simple2.cw b/externals/grill/flext/tutorial/simple2/simple2.cw Binary files differindex c622718f..6ada3deb 100755 --- a/externals/grill/flext/tutorial/simple2/simple2.cw +++ b/externals/grill/flext/tutorial/simple2/simple2.cw diff --git a/externals/grill/flext/tutorial/simple3/simple3.cw b/externals/grill/flext/tutorial/simple3/simple3.cw Binary files differindex b08661c7..bda7a203 100644 --- a/externals/grill/flext/tutorial/simple3/simple3.cw +++ b/externals/grill/flext/tutorial/simple3/simple3.cw diff --git a/externals/grill/flext/tutorial/thread1/thread1.cw b/externals/grill/flext/tutorial/thread1/thread1.cw Binary files differindex a7fed74e..1d4b813b 100644 --- a/externals/grill/flext/tutorial/thread1/thread1.cw +++ b/externals/grill/flext/tutorial/thread1/thread1.cw diff --git a/externals/grill/flext/tutorial/thread2/thread2.cw b/externals/grill/flext/tutorial/thread2/thread2.cw Binary files differindex 12b28e1a..346a25b1 100755 --- a/externals/grill/flext/tutorial/thread2/thread2.cw +++ b/externals/grill/flext/tutorial/thread2/thread2.cw |