updates for memento-p/semento rename, plus finished state-saving for midi-tentacles

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

6 files changed, 107 insertions, 90 deletions

diff --git a/controctopus/cc-learner.pd b/controctopus/cc-learner.pd
index 7e692d4..4d127e2 100644
--- a/controctopus/cc-learner.pd
+++ b/controctopus/cc-learner.pd
@@ -86,8 +86,8 @@
 #X obj 10 517 s \$0channel;
 #X obj 51 31 cnv 12 75 12 empty empty \$2 2 7 0 11 -83692 -262144 0
 ;
-#X obj 32 129 sft.commun \$2-cc \$0;
-#X obj 32 151 sft.commun \$2-device \$0;
+#X obj 32 129 commun-c \$2-cc \$0;
+#X obj 32 151 commun-c \$2-device \$0;
 #X obj 315 98 t a;
 #X obj 268 98 t a;
 #X obj 352 69 t a;
@@ -95,7 +95,7 @@
 #X obj 198 28 unpack f f f;
 #X obj 493 65 s \$0channel;
 #X obj 222 493 outlet;
-#X obj 39 327 sft.originator \$1 \$0;
+#X obj 39 327 originator-p \$1 \$0;
 #X obj 51 98 cnv 10 75 10 empty empty \$1 1 6 0 8 -66577 -171136 0
 ;
 #X connect 0 0 43 0;
diff --git a/controctopus/controctopus-help.pd b/controctopus/controctopus-help.pd
index 76ba021..5b1e9ec 100644
--- a/controctopus/controctopus-help.pd
+++ b/controctopus/controctopus-help.pd
@@ -30,11 +30,11 @@ through them with the tentacle-pager:;
 #X obj 540 307 tentacle-pager /uc33;
 #X obj 245 220 midi-tentacle /uc33 /Slider1 /modular;
 #X obj 535 433 polaroid /uc33 \$0A;
-#X obj 518 505 sft.originator /uc33 \$0A;
-#X obj 76 622 sft.commun.sc.ez \$0B /littlesynthA filterCut 0 20000
+#X obj 518 505 originator-p /uc33 \$0A;
+#X obj 76 622 commun-c-scale-ez \$0B /littlesynthA filterCut 0 20000
 ;
-#X obj 76 642 sft.commun.sc.ez \$0B /littlesynthA release 0 5000;
-#X obj 76 602 sft.originator /modular \$0B;
+#X obj 76 642 commun-c-scale-ez \$0B /littlesynthA release 0 5000;
+#X obj 76 602 originator-p /modular \$0B;
 #X text 668 495 [2];
 #X obj -303 -19 cnv 15 300 30 empty empty Controctopus_Basic_Overview
 20 12 0 14 -1721 -262144 0;
@@ -61,7 +61,7 @@ to represent \, or click the red button to "Learn" the controller (click
 #X text 413 129 The pdgui knobs and sliders work like virtual versions
 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)
+#X text 64 324 "/modular" is the group (as defined by originator-p)
 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
diff --git a/controctopus/controctopus-multi-help.pd b/controctopus/controctopus-multi-help.pd
index 914b46d..60d29a7 100644
--- a/controctopus/controctopus-multi-help.pd
+++ b/controctopus/controctopus-multi-help.pd
@@ -4,12 +4,12 @@
 #X obj 112 112 + 1;
 #X obj 112 133 s /uc33/demux;
 #X obj 101 205 midi-tentacle-multi /uc33 /Knob1 /drummr;
-#X obj 32 385 sft.originator /drummr1 \$0A;
-#X obj 32 405 sft.commun.sc.ez \$0A /noiseA filterCut 0 20000;
-#X obj 32 425 sft.commun.sc.ez \$0A /noiseA release 0 5000;
-#X obj 329 385 sft.originator /drummr2 \$0B;
-#X obj 329 405 sft.commun.sc.ez \$0B /noiseA filterCut 0 20000;
-#X obj 329 425 sft.commun.sc.ez \$0B /noiseA release 0 5000;
+#X obj 32 385 originator-p /drummr1 \$0A;
+#X obj 32 405 commun-c-scale-ez \$0A /noiseA filterCut 0 20000;
+#X obj 32 425 commun-c-scale-ez \$0A /noiseA release 0 5000;
+#X obj 329 385 originator-p /drummr2 \$0B;
+#X obj 329 405 commun-c-scale-ez \$0B /noiseA filterCut 0 20000;
+#X obj 329 425 commun-c-scale-ez \$0B /noiseA release 0 5000;
 #X text 289 240 midi-tentacle-multi allows you to address multiple
 identical sequentially-named groups \, like /synthsystem1 \, /synthsystem2
 \, ... /synthsystemN.;
diff --git a/controctopus/midi-tentacle-multi.pd b/controctopus/midi-tentacle-multi.pd
index 41b08c8..3ee186e 100644
--- a/controctopus/midi-tentacle-multi.pd
+++ b/controctopus/midi-tentacle-multi.pd
@@ -11,38 +11,48 @@
 #X obj 288 101 initbang;
 #X obj 160 187 initbang;
 #X msg 160 209 bgcolour #ee0000;
-#X msg 160 226 name $#++#$~~~~~>;
 #X obj 170 249 savebang;
 #X msg 160 274 options press 'get' to load parameters;
 #X msg 288 122 0;
+#X msg 160 226 name No-Destination;
 #X connect 1 0 0 0;
 #X connect 4 0 1 0;
-#X connect 5 0 11 0;
-#X connect 6 0 8 0;
+#X connect 5 0 10 0;
+#X connect 6 0 11 0;
 #X connect 6 0 7 0;
-#X connect 6 0 10 0;
+#X connect 6 0 9 0;
 #X connect 7 0 3 0;
-#X connect 8 0 3 0;
-#X connect 9 0 10 0;
-#X connect 10 0 3 0;
-#X connect 11 0 2 0;
+#X connect 8 0 9 0;
+#X connect 9 0 3 0;
+#X connect 10 0 2 0;
+#X connect 11 0 3 0;
 #X restore 31 361 pd init;
 #X obj 288 257 s \$0popOut;
 #X obj 288 134 r \$0setPopup;
-#N canvas 667 135 255 293 memento 0;
-#X obj 14 10 sft.originator \$1 \$0;
+#N canvas 667 135 215 526 memento 0;
+#X obj 14 10 originator-p \$1 \$0;
 #X obj 14 55 r \$0assgnList;
 #X obj 14 109 s \$0assgnList;
 #X obj 15 175 r \$0params;
 #X obj 15 259 s \$0popup;
-#X obj 14 82 sft.commun \$2-assignments \$0;
-#X obj 15 207 sft.commun \$2-parameters \$0;
+#X obj 14 82 commun-c \$2-assignments \$0;
+#X obj 15 207 commun-c \$2-parameters \$0;
 #X obj 15 231 list trim;
+#X obj 16 361 commun-c \$2-channel \$0;
+#X obj 16 338 r \$0channel;
+#X obj 16 384 s \$0channelR;
+#X obj 16 425 r \$0demux;
+#X obj 16 451 commun-c \$2-demux \$0;
+#X obj 16 475 s \$0demux;
 #X connect 1 0 5 0;
 #X connect 3 0 6 0;
 #X connect 5 0 2 0;
 #X connect 6 0 7 0;
 #X connect 7 0 4 0;
+#X connect 8 0 10 0;
+#X connect 9 0 8 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
 #X restore 31 339 pd memento;
 #X obj 156 139 s \$0params;
 #N canvas 55 208 632 552 listops 0;
@@ -109,7 +119,6 @@
 #X connect 21 0 20 0;
 #X connect 23 0 22 0;
 #X restore 31 315 pd listops;
-#X obj 145 257 route bang;
 #N canvas 935 166 242 368 16channelOuts 0;
 #X obj 18 23 rchannel-multi \$0 \$1 \$2 \$3 \$4 1;
 #X obj 18 43 rchannel-multi \$0 \$1 \$2 \$3 \$4 2;
@@ -129,15 +138,14 @@
 #X obj 18 243 rchannel-multi \$0 \$1 \$2 \$3 \$4 12;
 #X restore 31 293 pd 16channelOuts;
 #X obj 166 61 list-extend;
-#X obj 145 115 prepent options;
 #X obj 189 405 r \$0getParams;
 #X obj 280 166 cnv 15 15 15 empty \$0demuxDisplay 1 1 9 0 11 -261234
 -33289 0;
 #X obj 208 577 s;
 #X obj 240 61 r \$1/clearParams;
 #X obj 228 452 s \$1/clearParams;
-#X obj 145 211 popup 150 25 #ee0000 No-Destination /noiseA/release-normalized
-/noiseA/filterCut-normalized;
+#X obj 145 211 popup 150 25 #ee0000 No-Destination press 'get' to load
+parameters;
 #X obj 157 184 hradio 10 1 0 8 \$0chRow1 \$0chRow1R empty 0 -8 0 10
 -166441 -166441 -166441 0;
 #X obj 157 193 hradio 10 1 0 8 \$0chRow2 \$0chRow2R empty 0 -8 0 10
@@ -251,7 +259,7 @@
 #X obj -274 101 r \$1\$2;
 #X obj -96 102 t b a;
 #X obj -150 133 symbol /none;
-#X obj -96 81 r \$1/demux;
+#X obj -29 20 r \$1/demux;
 #X obj -150 156 list prepend 1;
 #X obj -150 177 list prepend \$3;
 #X msg -150 201 \$1\$2\$3;
@@ -261,13 +269,15 @@
 #X obj -50 156 prepent label;
 #X obj -274 180 spigot 0;
 #X obj -229 141 r \$0omni;
+#X obj -29 47 s \$0demux;
+#X obj -96 80 r \$0demux;
 #X connect 1 0 0 0;
 #X connect 2 0 13 0;
 #X connect 3 0 4 0;
 #X connect 3 1 6 1;
 #X connect 3 1 11 0;
 #X connect 4 0 6 0;
-#X connect 5 0 3 0;
+#X connect 5 0 15 0;
 #X connect 6 0 7 0;
 #X connect 7 0 8 0;
 #X connect 8 0 1 1;
@@ -276,6 +286,7 @@
 #X connect 12 0 10 0;
 #X connect 13 0 1 0;
 #X connect 14 0 13 1;
+#X connect 16 0 3 0;
 #X restore 134 293 pd omniOut;
 #N canvas 0 22 385 257 receiveParams 0;
 #X obj 38 17 loadbang;
@@ -299,25 +310,25 @@ as dollar-eleven;
 #X obj 189 601 s \$0doneGettingParams;
 #X obj 223 500 list append \$3;
 #X obj 223 531 list append 1;
-#X connect 1 0 17 0;
-#X connect 4 0 17 1;
-#X connect 10 0 33 1;
-#X connect 11 0 6 0;
-#X connect 11 0 17 0;
-#X connect 12 0 35 0;
-#X connect 15 0 10 1;
-#X connect 17 0 8 0;
-#X connect 17 1 3 0;
-#X connect 24 0 25 0;
-#X connect 25 0 23 0;
-#X connect 26 0 37 0;
-#X connect 27 0 14 1;
-#X connect 28 0 10 0;
-#X connect 33 0 11 0;
-#X connect 34 0 33 0;
+#X obj 145 114 prepent options;
+#X connect 1 0 15 0;
+#X connect 4 0 15 1;
+#X connect 9 0 31 1;
+#X connect 10 0 33 0;
+#X connect 13 0 9 1;
+#X connect 15 1 3 0;
+#X connect 22 0 23 0;
+#X connect 23 0 21 0;
+#X connect 24 0 35 0;
+#X connect 25 0 12 1;
+#X connect 26 0 9 0;
+#X connect 31 0 37 0;
+#X connect 32 0 31 0;
+#X connect 33 0 34 0;
+#X connect 33 1 12 0;
+#X connect 33 2 14 0;
 #X connect 35 0 36 0;
-#X connect 35 1 14 0;
-#X connect 35 2 16 0;
-#X connect 37 0 38 0;
-#X connect 38 0 27 0;
+#X connect 36 0 25 0;
+#X connect 37 0 6 0;
+#X connect 37 0 15 0;
 #X coords 0 -1 1 1 160 80 2 140 160;
diff --git a/controctopus/midi-tentacle.pd b/controctopus/midi-tentacle.pd
index 63100b3..f25d02c 100644
--- a/controctopus/midi-tentacle.pd
+++ b/controctopus/midi-tentacle.pd
@@ -5,11 +5,11 @@
 parameters;
 #X obj 65 126 r \$0popup;
 #X obj 157 216 hradio 10 1 0 8 \$0chRow1 \$0chRow1R empty 0 -8 0 10
--118016 -62784 -166441 0;
+-166441 -166441 -166441 2;
 #X obj 157 226 hradio 10 1 0 8 \$0chRow2 \$0chRow2R empty 0 -8 0 10
--118016 -118016 -166441 0;
-#X obj 240 219 cnv 15 37 15 empty \$0channelDisp Ch.2 2 7 0 10 -66577
--225280 0;
+-166441 -166441 -166441 5;
+#X obj 240 219 cnv 15 37 15 empty \$0channelDisp Omni 2 7 0 10 -66577
+-260818 0;
 #N canvas 259 247 434 288 init 0;
 #X obj 41 81 s \$0assgnList;
 #X obj 288 83 s \$0channelR;
@@ -18,39 +18,44 @@ parameters;
 #X obj 288 41 initbang;
 #X obj 160 127 initbang;
 #X msg 160 149 bgcolour #ee0000;
-#X msg 160 166 name $#++#$~~~~~>;
 #X msg 41 59 a b c d e f g h i j k l m n o p q;
 #X msg 288 62 0;
 #X obj 170 189 savebang;
 #X msg 160 214 options press 'get' to load parameters;
-#X connect 3 0 8 0;
-#X connect 4 0 9 0;
-#X connect 5 0 7 0;
-#X connect 5 0 6 0;
+#X msg 160 166 name No-Destination;
+#X connect 3 0 7 0;
+#X connect 4 0 8 0;
 #X connect 5 0 11 0;
+#X connect 5 0 6 0;
+#X connect 5 0 10 0;
 #X connect 6 0 2 0;
-#X connect 7 0 2 0;
-#X connect 8 0 0 0;
-#X connect 9 0 1 0;
-#X connect 10 0 11 0;
+#X connect 7 0 0 0;
+#X connect 8 0 1 0;
+#X connect 9 0 10 0;
+#X connect 10 0 2 0;
 #X connect 11 0 2 0;
 #X restore 31 361 pd init;
 #X obj 288 257 s \$0popOut;
 #X obj 288 134 r \$0setPopup;
-#N canvas 667 135 255 293 memento 0;
+#N canvas 667 135 208 415 memento 0;
 #X obj 14 55 r \$0assgnList;
 #X obj 14 109 s \$0assgnList;
 #X obj 15 175 r \$0params;
 #X obj 15 259 s \$0popup;
-#X obj 14 82 sft.commun \$2-assignments \$0;
-#X obj 15 207 sft.commun \$2-parameters \$0;
+#X obj 14 82 commun-c \$2-assignments \$0;
+#X obj 15 207 commun-c \$2-parameters \$0;
 #X obj 15 231 list trim;
-#X obj 14 10 sft.originator \$1 \$0;
+#X obj 14 10 originator-p \$1 \$0;
+#X obj 16 361 commun-c \$2-channel \$0;
+#X obj 16 338 r \$0channel;
+#X obj 16 384 s \$0channelR;
 #X connect 0 0 4 0;
 #X connect 2 0 5 0;
 #X connect 4 0 1 0;
 #X connect 5 0 6 0;
 #X connect 6 0 3 0;
+#X connect 8 0 10 0;
+#X connect 9 0 8 0;
 #X restore 31 339 pd memento;
 #X obj 156 139 s \$0params;
 #N canvas 738 69 632 552 listops 0;
@@ -120,7 +125,6 @@ parameters;
 #X connect 23 1 21 0;
 #X connect 24 0 22 0;
 #X restore 31 315 pd listops;
-#X obj 145 257 route bang;
 #X obj 31 478 s \$0channelR;
 #X obj 166 64 list-extend;
 #X obj 145 115 prepent options;
@@ -147,7 +151,7 @@ parameters;
 #X restore 31 293 pd 16channelOuts;
 #X obj 241 64 r \$1/clearParams;
 #X obj 145 220 hradio 12 1 0 1 \$0chRow0 \$0chRow0R empty 0 -8 0 10
--166441 -166441 -166441 0;
+-260818 -62784 -166441 0;
 #N canvas 0 65 921 562 3RowRadio 0;
 #X obj 258 324 r \$0chRow1;
 #X obj 508 334 r \$0chRow2;
@@ -263,21 +267,23 @@ parameters;
 #X connect 6 0 1 0;
 #X connect 7 0 6 1;
 #X restore 134 293 pd omniOut;
-#X connect 1 0 12 0;
+#X obj 65 152 popup-fix;
+#X connect 1 0 31 1;
 #X connect 1 1 7 0;
-#X connect 2 0 1 0;
+#X connect 2 0 31 0;
 #X connect 8 0 1 1;
-#X connect 14 0 25 1;
-#X connect 15 0 1 0;
-#X connect 15 0 10 0;
-#X connect 17 0 28 0;
-#X connect 19 0 14 1;
-#X connect 22 0 24 0;
-#X connect 23 0 14 0;
-#X connect 24 0 13 0;
-#X connect 25 0 15 0;
-#X connect 26 0 25 0;
-#X connect 28 0 27 0;
-#X connect 28 1 29 0;
-#X connect 28 2 30 0;
+#X connect 13 0 24 1;
+#X connect 14 0 10 0;
+#X connect 14 0 31 0;
+#X connect 16 0 27 0;
+#X connect 18 0 13 1;
+#X connect 21 0 23 0;
+#X connect 22 0 13 0;
+#X connect 23 0 12 0;
+#X connect 24 0 14 0;
+#X connect 25 0 24 0;
+#X connect 27 0 26 0;
+#X connect 27 1 28 0;
+#X connect 27 2 29 0;
+#X connect 31 0 1 0;
 #X coords 0 -1 1 1 160 80 2 140 160;
diff --git a/controctopus/note-learner.pd b/controctopus/note-learner.pd
index 97d7134..d681dda 100644
--- a/controctopus/note-learner.pd
+++ b/controctopus/note-learner.pd
@@ -30,7 +30,7 @@ Note 32 7 0 11 -260624 -1 -1 0 256;
 #X obj 724 62 polytouchin;
 #X obj 722 383 spigot;
 #X obj 733 435 t b f;
-#X obj 41 470 sft.originator \$1 \$0;
+#X obj 41 470 originator-p \$1 \$0;
 #X obj 41 411 instance lnote;
 #X obj 41 436 s \$0-padNumberR;
 #X obj 722 284 / 127;
@@ -100,9 +100,9 @@ Note 32 7 0 11 -260624 -1 -1 0 256;
 #X obj 788 243 + 1;
 #X obj 358 549 s \$1\$2/note;
 #X obj 733 522 s \$1\$2/tch;
-#X obj 42 316 sft.commun \$2-channel \$0;
-#X obj 42 334 sft.commun \$2-note \$0;
-#X obj 42 352 sft.commun \$2-pad \$0;
+#X obj 42 316 commun-c \$2-channel \$0;
+#X obj 42 334 commun-c \$2-note \$0;
+#X obj 42 352 commun-c \$2-pad \$0;
 #X obj 722 166 t a;
 #X obj 755 166 t a;
 #X obj 791 166 t a;