fixed a bug in controctopus demonstration (-help), renamed midi-tentacle generator to something slightly less obfuscated

svn path=/trunk/abstractions/senderfruit/; revision=10062

6 files changed, 123 insertions, 113 deletions

diff --git a/controctopus/controctopus-help.pd b/controctopus/controctopus-help.pd
index 83a61fb..76ba021 100644
--- a/controctopus/controctopus-help.pd
+++ b/controctopus/controctopus-help.pd
@@ -1,21 +1,21 @@
-#N canvas 154 46 1116 743 10;
+#N canvas 192 25 1116 743 10;
 #X obj 66 220 midi-tentacle /uc33 /Knob1 /modular;
 #X obj 67 12 cnv 15 340 170 empty empty Virtual_UC-33 20 12 0 14 -233017
 -66577 0;
 #X floatatom 310 148 5 0 0 0 - - -;
 #X obj 284 33 vsl 15 128 0 1 0 0 /uc33/Slider1/GUI /uc33/Slider1/GUIR
-Slider1 0 -9 0 10 -1 -159808 -1 0 1;
+Slider1 0 -9 0 10 -1 -159808 -1 7200 1;
 #X obj 85 80 knob 32 32 0 1 0 0 /uc33/Knob1/GUI /uc33/Knob1/GUIR Knob1
-0 -8 193 11 -262144 -159808 -1 0 1;
+0 -8 193 11 -262144 -159808 -1 3000 1;
 #X floatatom 128 148 5 0 0 0 - - -;
 #X obj 72 365 cnv 15 320 300 empty empty littlesynth-A 20 12 0 14 -232576
 -66577 0;
-#X obj 157 456 hsl 128 20 0 5000 0 0 \$0release \$0releaseR release
--2 -8 0 10 -203904 -1 -1 0 1;
+#X obj 157 456 hsl 128 20 0 5000 0 0 \$0Brelease \$0BreleaseR release
+-2 -8 0 10 -203904 -1 -1 7200 1;
 #X obj 195 502 r \$0release;
 #X obj 108 502 r \$0filterCut;
-#X obj 157 416 hsl 128 20 0 20000 0 0 \$0filterCut \$0filterCutR filter-cutoff
--2 -8 0 10 -261234 -1 -1 0 1;
+#X obj 157 416 hsl 128 20 0 20000 0 0 \$0BfilterCut \$0BfilterCutR
+filter-cutoff -2 -8 0 10 -261234 -1 -1 12290 1;
 #N canvas 0 22 450 300 littlesynthA 0;
 #X obj 49 37 inlet;
 #X obj 191 39 inlet;
@@ -27,9 +27,6 @@ and transmit to only one OSC address. "Ch.#" means the midi-tentacle
 will receive each channel and transmit it to an independently assigned
 OSC address. You can think of the radiobuttons as "pages"[1] - flip
 through them with the tentacle-pager:;
-#X text 435 358 [1] Though "Omni" is a special page that necessarily
-blocks all other channels (but they'll still remember their settings!)
-;
 #X obj 540 307 tentacle-pager /uc33;
 #X obj 245 220 midi-tentacle /uc33 /Slider1 /modular;
 #X obj 535 433 polaroid /uc33 \$0A;
@@ -66,7 +63,10 @@ of your hardware (helpful for testing). Look at their properties to
 see how they interface with cc-learner.;
 #X text 64 324 "/modular" is the group (as defined by sft.originator)
 that I want to address;
+#X text 435 358 [1] Though "Omni" is a special page that necessarily
+blocks all other channels (but they'll still remember their assignment
+settings!);
 #X connect 8 0 11 1;
 #X connect 9 0 11 0;
-#X connect 32 0 5 0;
-#X connect 33 0 2 0;
+#X connect 31 0 5 0;
+#X connect 32 0 2 0;
diff --git a/controctopus/grow-tentacles-help.pd b/controctopus/grow-tentacles-help.pd
new file mode 100644
index 0000000..b69e883
--- /dev/null
+++ b/controctopus/grow-tentacles-help.pd
@@ -0,0 +1,21 @@
+#N canvas 384 36 780 428 10;
+#X obj 22 122 cc-learner /uc33 /Knob1;
+#X obj 113 121 cc-learner /uc33 /Knob2;
+#X obj 200 121 cc-learner /uc33 /Knob3;
+#X obj 644 406 pddplink http://proyekto.net;
+#X text 584 393 2008 Luke Iannini \, tag sndrft;
+#X obj 288 121 cc-learner /uc33 /Knob4;
+#X obj 22 207 cc-learner /uc33 /Slider1;
+#X obj 112 207 cc-learner /uc33 /Slider2;
+#X obj 200 207 cc-learner /uc33 /Slider3;
+#X obj 288 207 cc-learner /uc33 /Slider4;
+#X text 14 319 use [grow-tentacles-multi] to build [midi-tentacle-multi]s
+instead.;
+#X text 14 302 call like [grow-tentacles /uc33 /modular];
+#X text 8 8 [grow-tentacles] generates a set of midi-tentacles automatically
+from a set of already-defined cc-learners.;
+#X text 24 91 So \, if you've built your virtual controller like so:
+;
+#X text 410 93 Then you can in a [grow-tentacles /controller /targetparent]
+to build companion midi-tentacles for each:;
+#X obj 515 171 grow-tentacles /uc33 /modular;
diff --git a/controctopus/octomother-multi.pd b/controctopus/grow-tentacles-multi.pd
index 409aaf9..409aaf9 100644
--- a/controctopus/octomother-multi.pd
+++ b/controctopus/grow-tentacles-multi.pd
diff --git a/controctopus/grow-tentacles.pd b/controctopus/grow-tentacles.pd
new file mode 100644
index 0000000..d3b754e
--- /dev/null
+++ b/controctopus/grow-tentacles.pd
@@ -0,0 +1,90 @@
+#N canvas 636 218 493 407 10;
+#X obj -35 84 r \$1/controlsList;
+#X obj -35 110 list prepend \$1;
+#X obj -35 243 list prepend;
+#X obj 44 218 r \$0x;
+#X obj -35 195 list prepend;
+#X obj 44 171 r \$0y;
+#X obj -35 136 t a b;
+#X obj 238 284 f 0;
+#X obj 238 359 s \$0y;
+#X obj 270 284 + 1;
+#X obj 321 287 f 0;
+#X obj 353 287 + 1;
+#X obj 321 342 s \$0x;
+#X obj 9 136 s \$0count;
+#X obj 238 255 r \$0count;
+#X obj 321 256 r \$0count;
+#X obj 238 309 div 8;
+#X obj 385 287 mod 8;
+#N canvas 50 247 1320 500 \$0controls 0;
+#X restore 148 10 pd \$0controls;
+#X obj -35 350 s pd-\$0controls;
+#X obj 302 11 loadbang;
+#X msg 302 38 clear;
+#X obj 302 62 s pd-\$0controls;
+#X obj 321 316 * 160;
+#X obj 238 333 * 80;
+#X msg 148 194 vis 1;
+#X obj 148 219 s pd-\$0controls;
+#X obj 175 113 s \$1/getControls;
+#X obj 301 101 cnv 15 15 15 empty empty g 2 7 0 14 -231960 -66577 0
+;
+#X obj 312 101 cnv 15 15 15 empty empty r 2 7 0 14 -181753 -66577 0
+;
+#X obj 323 101 cnv 15 15 15 empty empty o 2 7 0 14 -232778 -66577 0
+;
+#X obj 334 101 cnv 15 15 15 empty empty w 2 7 0 14 -36361 -66577 0
+;
+#X obj 345 101 cnv 15 15 15 empty empty G 2 7 0 14 -32312 -66577 0
+;
+#X obj 356 101 cnv 15 15 15 empty empty R 2 7 0 14 -230614 -66577 0
+;
+#X obj 367 101 cnv 15 15 15 empty empty O 2 7 0 14 -230961 -66577 0
+;
+#X obj 378 101 cnv 14 14 15 empty empty W 2 7 0 14 -221241 -66577 0
+;
+#X obj 301 114 cnv 15 91 45 empty empty \$1 2 7 0 11 -20537 -150464
+0;
+#X obj 303 143 bng 15 250 50 0 \$0show \$0showR Show 17 7 0 11 -174336
+-1 -183899;
+#X obj 303 126 bng 15 250 50 0 \$0getControls \$0getControlsR Generate
+17 7 0 11 -49136 -1 -239456;
+#X obj 148 172 r \$0show;
+#X obj 148 70 r \$0getControls;
+#X msg -35 269 obj \$1 \$2 midi-tentacle \$3 \$4;
+#X obj -35 295 list append \$2;
+#X obj -35 317 list trim;
+#X obj 148 91 t b b;
+#X obj 148 135 s \$0show;
+#X connect 0 0 1 0;
+#X connect 1 0 6 0;
+#X connect 2 0 41 0;
+#X connect 3 0 2 1;
+#X connect 4 0 2 0;
+#X connect 5 0 4 1;
+#X connect 6 0 4 0;
+#X connect 6 1 13 0;
+#X connect 7 0 9 0;
+#X connect 7 0 16 0;
+#X connect 9 0 7 1;
+#X connect 10 0 11 0;
+#X connect 10 0 23 0;
+#X connect 11 0 17 0;
+#X connect 14 0 7 0;
+#X connect 15 0 10 0;
+#X connect 16 0 24 0;
+#X connect 17 0 10 1;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X connect 23 0 12 0;
+#X connect 24 0 8 0;
+#X connect 25 0 26 0;
+#X connect 39 0 25 0;
+#X connect 40 0 44 0;
+#X connect 41 0 42 0;
+#X connect 42 0 43 0;
+#X connect 43 0 19 0;
+#X connect 44 0 45 0;
+#X connect 44 1 27 0;
+#X coords 0 -1 1 1 93 60 2 300 100;
diff --git a/controctopus/octomother-help.pd b/controctopus/octomother-help.pd
deleted file mode 100644
index e36c00c..0000000
--- a/controctopus/octomother-help.pd
+++ /dev/null
@@ -1,15 +0,0 @@
-#N canvas 334 339 595 363 10;
-#X obj 20 178 octomother /uc33 /modular;
-#X obj 184 61 cc-learner /uc33 /Knob1;
-#X obj 275 60 cc-learner /uc33 /Knob2;
-#X obj 362 60 cc-learner /uc33 /Knob3;
-#X text 19 249 call like [octomother /uc33 /modular];
-#X text 8 8 Octomother generates a set of midi-tentacles automatically
-from a set of already-defined cc-learners.;
-#X obj 332 339 pddplink http://proyekto.net;
-#X text 272 326 2008 Luke Iannini \, tag sndrft;
-#X obj 450 60 cc-learner /uc33 /Knob4;
-#X obj 184 146 cc-learner /uc33 /Slider1;
-#X obj 274 146 cc-learner /uc33 /Slider2;
-#X obj 362 146 cc-learner /uc33 /Slider3;
-#X obj 450 146 cc-learner /uc33 /Slider4;
diff --git a/controctopus/octomother.pd b/controctopus/octomother.pd
deleted file mode 100644
index d69c2b7..0000000
--- a/controctopus/octomother.pd
+++ /dev/null
@@ -1,86 +0,0 @@
-#N canvas 719 217 501 444 10;
-#X obj 35 84 r \$1/controlsList;
-#X obj 35 110 list prepend \$1;
-#X obj 35 243 list prepend;
-#X obj 114 218 r \$0x;
-#X obj 35 195 list prepend;
-#X obj 114 171 r \$0y;
-#X obj 35 136 t a b;
-#X obj 251 71 f 0;
-#X obj 251 146 s \$0y;
-#X obj 283 71 + 1;
-#X obj 251 274 f 0;
-#X obj 283 274 + 1;
-#X obj 251 329 s \$0x;
-#X obj 79 136 s \$0count;
-#X obj 251 42 r \$0count;
-#X obj 251 243 r \$0count;
-#X obj 251 96 div 8;
-#X obj 315 274 mod 8;
-#N canvas 50 247 1320 500 \$0controls 0;
-#X restore 148 10 pd \$0controls;
-#X obj 35 340 s pd-\$0controls;
-#X obj 339 311 loadbang;
-#X msg 339 338 clear;
-#X obj 339 362 s pd-\$0controls;
-#X obj 251 303 * 160;
-#X obj 251 120 * 80;
-#X msg 359 211 vis 1;
-#X obj 359 236 s pd-\$0controls;
-#X obj 182 219 s \$1/getControls;
-#X obj 301 101 cnv 15 15 15 empty empty O 2 7 0 14 -231960 -66577 0
-;
-#X obj 312 101 cnv 15 15 15 empty empty C 2 7 0 14 -181753 -66577 0
-;
-#X obj 323 101 cnv 15 15 15 empty empty T 2 7 0 14 -232778 -66577 0
-;
-#X obj 334 101 cnv 15 15 15 empty empty O 2 7 0 14 -36361 -66577 0
-;
-#X obj 345 101 cnv 15 15 15 empty empty M 2 7 0 14 -32312 -66577 0
-;
-#X obj 356 101 cnv 15 15 15 empty empty O 2 7 0 14 -230614 -66577 0
-;
-#X obj 367 101 cnv 15 15 15 empty empty M 2 7 0 14 -230961 -66577 0
-;
-#X obj 378 101 cnv 14 14 15 empty empty empty 2 7 0 14 -221241 -66577
-0;
-#X obj 301 114 cnv 15 91 45 empty empty \$1 2 7 0 11 -20537 -150464
-0;
-#X obj 303 143 bng 15 250 50 0 \$0show \$0showR Show 17 7 0 11 -174336
--1 -183899;
-#X obj 303 126 bng 15 250 50 0 \$0getControls \$0getControlsR Generate
-17 7 0 11 -49136 -1 -239456;
-#X obj 359 189 r \$0show;
-#X obj 182 187 r \$0getControls;
-#X msg 35 269 obj \$1 \$2 midi-tentacle \$3 \$4;
-#X obj 35 295 list append \$2;
-#X obj 35 317 list trim;
-#X connect 0 0 1 0;
-#X connect 1 0 6 0;
-#X connect 2 0 41 0;
-#X connect 3 0 2 1;
-#X connect 4 0 2 0;
-#X connect 5 0 4 1;
-#X connect 6 0 4 0;
-#X connect 6 1 13 0;
-#X connect 7 0 9 0;
-#X connect 7 0 16 0;
-#X connect 9 0 7 1;
-#X connect 10 0 11 0;
-#X connect 10 0 23 0;
-#X connect 11 0 17 0;
-#X connect 14 0 7 0;
-#X connect 15 0 10 0;
-#X connect 16 0 24 0;
-#X connect 17 0 10 1;
-#X connect 20 0 21 0;
-#X connect 21 0 22 0;
-#X connect 23 0 12 0;
-#X connect 24 0 8 0;
-#X connect 25 0 26 0;
-#X connect 39 0 25 0;
-#X connect 40 0 27 0;
-#X connect 41 0 42 0;
-#X connect 42 0 43 0;
-#X connect 43 0 19 0;
-#X coords 0 -1 1 1 93 60 2 300 100;