normalizing send names

svn path=/trunk/abstractions/sfruit/; revision=12455

2 files changed, 74 insertions, 71 deletions

diff --git a/controctopus/cc-learner.pd b/controctopus/cc-learner.pd
index ad4b9ae..51da7e8 100644
--- a/controctopus/cc-learner.pd
+++ b/controctopus/cc-learner.pd
@@ -1,17 +1,17 @@
 #N canvas 63 47 629 668 10;
-#X obj 60 46 nbx 3 14 0 127 0 1 \$0.cc.s \$0.cc.r CC 42 8 0 11 -194624
+#X obj 60 46 nbx 3 14 0 127 0 1 \$0-cc-s \$0-cc.r CC 42 8 0 11 -194624
 -1 -1 1 256;
-#X obj 63 64 bng 13 250 50 0 \$0.learn-on \$0.nullR empty 0 -6 0 8
+#X obj 63 64 bng 13 250 50 0 \$0-learn-on \$0-nullR empty 0 -6 0 8
 -259541 -1 -1;
-#X obj 330 178 r \$0.cc.v;
-#X obj 81 67 bng 8 250 50 0 empty \$0.lite1 empty 0 -6 0 8 -1 -262085
+#X obj 330 178 r \$0-cc-v;
+#X obj 81 67 bng 8 250 50 0 empty \$0-lite1 empty 0 -6 0 8 -1 -262085
 -1;
-#X obj 92 67 bng 8 250 50 0 empty \$0.lite2 empty 0 -6 0 8 -1 -262085
+#X obj 92 67 bng 8 250 50 0 empty \$0-lite2 empty 0 -6 0 8 -1 -262085
 -1;
-#X obj 103 67 bng 8 250 50 0 empty \$0.lite3 empty 0 -6 0 8 -1 -262085
+#X obj 103 67 bng 8 250 50 0 empty \$0-lite3 empty 0 -6 0 8 -1 -262085
 -1;
 #X obj 268 49 ctlin;
-#X obj 60 81 nbx 2 14 1 64 0 0 \$0.device-number.s \$0.device-number.r
+#X obj 60 81 nbx 2 14 1 64 0 0 \$0-device-number-s \$0-device-number.r
 Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X obj 268 267 spigot;
 #X obj 268 181 / 127;
@@ -19,13 +19,13 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X obj 349 566 list append;
 #X obj 333 611 s;
 #X msg 294 322 set \$1;
-#X obj 268 397 s \$0.data;
-#X obj 210 467 r \$0.data;
-#X obj 333 431 r \$0.data;
+#X obj 268 397 s \$0-data;
+#X obj 210 467 r \$0-data;
+#X obj 333 431 r \$0-data;
 #X obj 32 231 loadbang;
 #X msg 32 253 1;
 #X obj 391 544 t b f;
-#X obj 391 522 r \$0.channel;
+#X obj 391 522 r \$0-channel;
 #X obj 349 500 list append \$2;
 #X obj 10 570 r \$1/getControls;
 #X obj 10 620 s \$1/controlsList;
@@ -37,7 +37,7 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X obj 349 478 list append \$1;
 #X text 208 594 Omni;
 #X obj 10 492 r \$1/setChannel;
-#X obj 10 517 s \$0.channel;
+#X obj 10 517 s \$0-channel;
 #X obj 51 31 cnv 12 75 12 empty empty \$2 2 7 0 11 -83692 -262144 0
 ;
 #X obj 315 98 t a;
@@ -55,20 +55,20 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X restore 26 198 pd sssad;
 #N canvas 0 22 458 308 midi-learn 0;
 #X obj 217 143 inlet;
-#X obj 162 38 r \$0.learn-on;
+#X obj 162 38 r \$0-learn-on;
 #X obj 217 177 spigot;
 #X obj 74 188 metro 250;
 #X obj 29 126 t b b;
-#X obj 217 199 s \$0.cc.r;
+#X obj 217 199 s \$0-cc.r;
 #X obj 162 75 pipe 1000;
 #X msg 255 74 1;
 #X msg 274 118 0;
 #X msg 74 150 0;
 #X msg 106 150 1;
 #X obj 58 251 sel 0 1 2;
-#X obj 58 281 s \$0.lite1;
-#X obj 138 281 s \$0.lite2;
-#X obj 218 281 s \$0.lite3;
+#X obj 58 281 s \$0-lite1;
+#X obj 138 281 s \$0-lite2;
+#X obj 218 281 s \$0-lite3;
 #X msg 29 189 0;
 #X obj 58 221 f;
 #X obj 85 221 + 1;
@@ -102,10 +102,10 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X obj 55 241 outlet;
 #X obj 55 137 div 16;
 #X obj 55 197 ==;
-#X obj 71 175 r \$0.device-number;
+#X obj 71 175 r \$0-device-number;
 #X obj 82 88 mod 16;
 #X obj 55 67 t f f;
-#X obj 82 108 s \$0.channel;
+#X obj 82 108 s \$0-channel;
 #X obj 55 156 + 1;
 #X connect 0 0 6 0;
 #X connect 2 0 8 0;
@@ -118,7 +118,7 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X restore 348 156 pd parse-channel;
 #N canvas 115 84 464 470 midi-sensory 1;
 #X obj 73 159 spigot;
-#X obj 73 100 r \$0.data;
+#X obj 73 100 r \$0-data;
 #X obj 106 134 r MMMAP_SENSING?;
 #X obj 219 61 keycommand ¬ MMMAP_SENSING? 1;
 #X obj 219 86 keycommand Escape MMMAP_SENSING? 0;
@@ -126,14 +126,14 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X obj 73 181 t b b;
 #X msg 110 181 0;
 #X obj 139 181 s MMMAP_SENSING?;
-#X obj 73 231 s \$1.sensed;
+#X obj 73 231 s \$1-sensed;
 #X obj 77 288 r MMMAP_SENSING?;
 #X obj 137 422 s \$1\$2/GUIR;
 #X msg 137 398 color \$1 -1 -1;
-#X obj 198 288 r \$1\$2.assigning?;
+#X obj 198 288 r \$1\$2-assigning?;
 #X obj 334 315 sel 0 1;
 #X msg 334 340 0;
-#X obj 334 268 r \$1\$2.connections;
+#X obj 334 268 r \$1\$2-connections;
 #X obj 197 308 sel 1;
 #X obj 334 291 f;
 #X msg 197 331 19;
@@ -171,8 +171,8 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X connect 25 0 12 0;
 #X restore 485 392 pd midi-sensory;
 #X text 195 15 [cc-learner /unit /control];
-#X obj 32 329 s \$0.device-number.all;
-#X obj 32 279 s \$0.device-number.all;
+#X obj 32 329 s \$0-device-number.all;
+#X obj 32 279 s \$0-device-number.all;
 #X obj 268 203 min 1;
 #X obj 315 250 &&;
 #X obj 268 133 midi.random-smooth;
diff --git a/controctopus/note-learner.pd b/controctopus/note-learner.pd
index ac5b53d..b25dabb 100644
--- a/controctopus/note-learner.pd
+++ b/controctopus/note-learner.pd
@@ -3,34 +3,34 @@
 #X obj 363 337 f;
 #X obj 336 506 pack;
 #X obj 336 277 t b b;
-#X obj 102 293 nbx 2 14 1 128 0 0 \$0.pad.s \$0.pad.r Pad 32 7 0 11
--154432 -1 -1 13 256;
-#X obj 102 276 nbx 2 14 0 127 0 0 \$0.note.s \$0.note.r Note 32 7 0
-11 -260624 -1 -1 48 256;
+#X obj 102 293 nbx 2 14 1 128 0 0 \$0-pad-s \$0-pad.r Pad 32 7 0 11
+-154432 -1 -1 15 256;
+#X obj 102 276 nbx 2 14 0 127 0 0 \$0-note-s \$0-note.r Note 32 7 0
+11 -260624 -1 -1 50 256;
 #X obj 420 523 outlet;
-#X obj 137 263 bng 13 250 50 0 \$0.learn-on empty empty 0 -6 0 8 -259541
+#X obj 137 263 bng 13 250 50 0 \$0-learn-on empty empty 0 -6 0 8 -259541
 -1 -1;
-#X obj 103 265 bng 8 250 50 0 empty \$0.lite1 empty 0 -6 0 8 -1 -262085
+#X obj 103 265 bng 8 250 50 0 empty \$0-lite1 empty 0 -6 0 8 -1 -262085
 -1;
-#X obj 114 265 bng 8 250 50 0 empty \$0.lite2 empty 0 -6 0 8 -1 -262085
+#X obj 114 265 bng 8 250 50 0 empty \$0-lite2 empty 0 -6 0 8 -1 -262085
 -1;
-#X obj 125 265 bng 8 250 50 0 empty \$0.lite3 empty 0 -6 0 8 -1 -262085
+#X obj 125 265 bng 8 250 50 0 empty \$0-lite3 empty 0 -6 0 8 -1 -262085
 -1;
-#X obj 369 231 r \$0.note.v;
-#X obj 351 308 r \$0.pad.v;
+#X obj 369 231 r \$0-note-v;
+#X obj 351 308 r \$0-pad-v;
 #X obj 336 209 spigot;
-#X obj 152 263 nbx 2 13 1 64 0 0 \$0.device-number.s \$0.device-number.r
-empty 0 -6 0 10 -110565 -1 -1 1 256;
-#X obj 801 256 r \$0.note.v;
+#X obj 152 263 nbx 2 13 1 64 0 0 \$0-device-number-s \$0-device-number.r
+empty 0 -6 0 10 -110565 -1 -1 2 256;
+#X obj 801 256 r \$0-note-v;
 #X obj 755 234 spigot;
 #X obj 722 112 polytouchin;
 #X obj 722 303 spigot;
 #X obj 41 411 instance lnote;
-#X obj 722 204 / 127;
+#X obj 722 214 / 127;
 #X obj 378 104 / 127;
 #N canvas 73 463 404 329 midi-learn 0;
 #X text 238 89 Route Number;
-#X obj 24 18 r \$0.learn-on;
+#X obj 24 18 r \$0-learn-on;
 #X obj 180 119 spigot;
 #X obj 217 95 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1
 ;
@@ -40,15 +40,15 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X obj 24 145 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1
 ;
 #X text 287 62 Learn Time-Window;
-#X obj 180 141 s \$0.note-r;
+#X obj 180 141 s \$0-note-r;
 #X obj 217 62 pipe 1000;
 #X obj 180 14 inlet;
 #X obj 24 197 f 0;
 #X obj 51 197 + 1;
 #X msg 73 141 0;
-#X obj 24 281 s \$0.lite1;
-#X obj 104 281 s \$0.lite2;
-#X obj 184 281 s \$0.lite3;
+#X obj 24 281 s \$0-lite1;
+#X obj 104 281 s \$0-lite2;
+#X obj 184 281 s \$0-lite3;
 #X obj 77 197 mod 3;
 #X connect 1 0 3 0;
 #X connect 1 0 7 0;
@@ -74,7 +74,7 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X obj 336 104 t a;
 #X obj 471 104 t a;
 #X obj 349 53 notein;
-#X text 345 33 Intercepts for looping back MIDI (e.g. from sft.schoen)
+#X text 345 33 Intercepts for looping back MIDI (e.g. from sft-schoen)
 ;
 #X obj 755 273 ==;
 #X obj 27 18 loadbang;
@@ -116,28 +116,28 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X connect 12 0 6 0;
 #X connect 12 0 9 1;
 #X restore 336 456 pd pad-select;
-#X obj 420 358 s \$0.velocity;
-#X obj 767 303 r \$0.velocity;
-#X obj 336 400 s \$0.note;
-#X obj 363 379 s \$0.trigger;
+#X obj 420 358 s \$0-velocity;
+#X obj 767 303 r \$0-velocity;
+#X obj 336 400 s \$0-note;
+#X obj 363 379 s \$0-trigger;
 #X obj 27 86 r \$1/solo;
 #X obj 27 108 sel 0;
 #X obj 54 132 sel \$2;
 #X msg 27 166 1;
-#X obj 27 196 s \$0.solo?;
+#X obj 27 196 s \$0-solo?;
 #X msg 87 166 0;
-#X obj 336 142 ifspigot \$0.solo? t 1;
+#X obj 336 142 ifspigot \$0-solo? t 1;
 #X obj 736 16 import-disabled nsend list-abs;
-#X obj 27 63 s \$0.channel;
+#X obj 27 63 s \$0-channel;
 #N canvas 0 22 265 307 parse-channel 0;
 #X obj 76 35 inlet;
 #X obj 76 254 outlet;
 #X obj 76 155 div 16;
 #X obj 76 221 ==;
-#X obj 91 199 r \$0.device-number.v;
+#X obj 91 199 r \$0-device-number-v;
 #X obj 103 102 mod 16;
 #X obj 76 72 t f f;
-#X obj 103 122 s \$0.channel;
+#X obj 103 122 s \$0-channel;
 #X obj 76 174 + 1;
 #X connect 0 0 6 0;
 #X connect 2 0 8 0;
@@ -155,10 +155,10 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X obj 76 254 outlet;
 #X obj 76 155 div 16;
 #X obj 76 221 ==;
-#X obj 91 199 r \$0.device-number.v;
+#X obj 91 199 r \$0-device-number-v;
 #X obj 103 102 mod 16;
 #X obj 76 72 t f f;
-#X obj 103 122 s \$0.channel;
+#X obj 103 122 s \$0-channel;
 #X obj 76 174 + 1;
 #X connect 0 0 6 0;
 #X connect 2 0 8 0;
@@ -169,16 +169,16 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X connect 6 1 5 0;
 #X connect 8 0 3 0;
 #X restore 788 197 pd parse-channel;
-#N canvas 282 148 271 319 send-polytouch 0;
-#X msg 51 116 13;
+#N canvas 282 148 271 319 send-polytouch 1;
+#X msg 51 116 15;
 #X obj 51 148 pack;
 #X msg 110 99 set \$1;
-#X obj 110 75 r \$0.pad.v;
+#X obj 110 75 r \$0-pad-v;
 #X obj 51 90 t b f;
 #X obj 40 265 s;
 #X obj 51 177 s \$1\$2/polytouch;
 #X obj 55 222 list prepend \$3;
-#X obj 55 202 r \$0.pad.v;
+#X obj 55 202 r \$0-pad-v;
 #X obj 40 63 inlet;
 #X msg 55 243 symbol \$1*\$2/polytouch/in;
 #X connect 0 0 1 0;
@@ -195,16 +195,16 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X restore 722 334 pd send-polytouch;
 #N canvas 0 22 625 312 group-style-sends 0;
 #X obj 221 237 s;
-#X obj 236 172 r \$0.pad.v;
+#X obj 236 172 r \$0-pad-v;
 #X obj 236 193 list prepend \$3;
-#X obj 221 132 r \$0.velocity;
+#X obj 221 132 r \$0-velocity;
 #X obj 61 237 s;
-#X obj 76 172 r \$0.pad.v;
+#X obj 76 172 r \$0-pad-v;
 #X obj 76 193 list prepend \$3;
-#X obj 61 132 r \$0.note;
-#X obj 412 132 r \$0.trigger;
+#X obj 61 132 r \$0-note;
+#X obj 412 132 r \$0-trigger;
 #X obj 412 243 s;
-#X obj 427 178 r \$0.pad.v;
+#X obj 427 178 r \$0-pad-v;
 #X obj 427 199 list prepend \$3;
 #X obj 412 154 != 0;
 #X msg 76 214 symbol \$1*\$2/note/in;
@@ -234,15 +234,17 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X connect 2 0 4 0;
 #X connect 3 0 0 0;
 #X restore 372 547 pd gui-relay;
-#X obj 357 485 r \$0.trigger;
-#X obj 336 428 r \$0.note;
+#X obj 357 485 r \$0-trigger;
+#X obj 336 428 r \$0-note;
 #X obj 132 19 r \$1/devNo;
-#X obj 132 46 s \$0.device-number.r;
-#X obj 41 436 s \$0.pad.r;
+#X obj 132 46 s \$0-device-number.r;
+#X obj 41 436 s \$0-pad.r;
 #X obj 26 553 sssadie/sssadiez \$1 \$2 note 0 256 \$0;
 #X obj 26 573 sssadie/sssadiez \$1 \$2 pad 0 256 \$0;
 #X obj 26 533 sssadie/sssadiez \$1 \$2 device-number 0 256 \$0;
 #X text 344 3 [note-learner /device /pad# /group(nonumber)];
+#X obj 722 190 sel 0;
+#X text 761 183 ignore zeros so it doesn't jump on noteoff;
 #X connect 0 0 3 0;
 #X connect 1 0 34 0;
 #X connect 1 0 43 0;
@@ -272,7 +274,7 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X connect 27 0 18 1;
 #X connect 28 0 29 0;
 #X connect 29 0 52 0;
-#X connect 31 0 20 0;
+#X connect 31 0 69 0;
 #X connect 32 0 16 0;
 #X connect 33 0 56 0;
 #X connect 34 1 40 0;
@@ -299,4 +301,5 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X connect 60 0 2 1;
 #X connect 61 0 39 0;
 #X connect 62 0 63 0;
+#X connect 69 1 20 0;
 #X coords 0 -1 1 1 81 60 1 100 250;