bugfixes

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

2 files changed, 74 insertions, 69 deletions

diff --git a/controctopus/cc-learner.pd b/controctopus/cc-learner.pd
index 0f13eb3..8e7821d 100644
--- a/controctopus/cc-learner.pd
+++ b/controctopus/cc-learner.pd
@@ -1,9 +1,9 @@
 #N canvas 62 131 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
--1 -1 1 256;
+-1 -1 111 256;
 #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 208 r \$0.cc.v;
+#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
@@ -13,14 +13,13 @@
 #X obj 268 49 ctlin;
 #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 315 181 spigot;
 #X obj 268 267 spigot;
 #X obj 268 181 / 127;
-#X obj 315 237 ==;
+#X obj 315 207 ==;
 #X obj 349 566 list append;
 #X obj 333 611 s;
-#X msg 294 292 set \$1;
-#X obj 268 367 s \$0.data;
+#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 32 231 loadbang;
@@ -31,9 +30,9 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X obj 10 570 r \$1/getControls;
 #X obj 10 620 s \$1/controlsList;
 #X obj 10 594 list append \$2;
-#X obj 294 312 s \$1\$2/GUIR;
+#X obj 294 342 s \$1\$2/GUIR;
 #X obj 210 567 s \$1\$2;
-#X obj 294 343 r \$1\$2/GUI;
+#X obj 294 373 r \$1\$2/GUI;
 #X msg 349 587 symbol \$1\$2/Ch\$3;
 #X obj 349 478 list append \$1;
 #X text 208 594 Omni;
@@ -44,13 +43,11 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X obj 315 98 t a;
 #X obj 268 98 t a;
 #X obj 348 99 t a;
-#X obj 32 279 s \$0.channel;
 #X obj 222 493 outlet;
 #X obj 51 98 cnv 10 75 10 empty empty \$1 1 6 0 8 -66577 -171136 0
 ;
 #X obj 308 49 nr PDCTLIN 3;
 #X obj 32 304 r \$1/devNo;
-#X obj 32 329 s \$0.device-number.r;
 #N canvas 0 22 450 300 sssad 0;
 #X obj 43 89 sssadie/sssadiez \$1 \$2 cc 0 1024 \$0 round;
 #X obj 43 109 sssadie/sssadiez \$1 \$2 device-number 0 1024 \$0 round
@@ -99,7 +96,7 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X connect 17 0 18 0;
 #X connect 17 0 16 1;
 #X connect 18 0 17 1;
-#X restore 366 133 pd midi-learn;
+#X restore 396 133 pd midi-learn;
 #N canvas 872 119 244 290 parse-channel 0;
 #X obj 55 34 inlet;
 #X obj 55 241 outlet;
@@ -149,40 +146,47 @@ Dev 32 8 0 11 -110565 -1 -1 1 256;
 #X connect 14 0 15 0;
 #X connect 15 0 12 0;
 #X restore 485 392 pd midi-sensory;
-#X text 195 15 cc-learner /unit /control;
-#X connect 2 0 11 1;
-#X connect 6 0 36 0;
-#X connect 6 1 35 0;
-#X connect 6 2 37 0;
-#X connect 8 0 11 0;
-#X connect 9 0 14 0;
-#X connect 9 0 15 0;
-#X connect 10 0 9 0;
-#X connect 11 0 9 1;
-#X connect 12 0 29 0;
-#X connect 14 0 26 0;
-#X connect 16 0 27 0;
-#X connect 16 0 39 0;
-#X connect 17 0 13 0;
-#X connect 18 0 19 0;
-#X connect 19 0 38 0;
-#X connect 20 0 30 0;
-#X connect 20 1 12 1;
-#X connect 21 0 20 0;
-#X connect 22 0 12 0;
-#X connect 23 0 25 0;
-#X connect 25 0 24 0;
-#X connect 28 0 15 0;
-#X connect 29 0 13 1;
-#X connect 30 0 22 0;
-#X connect 32 0 33 0;
-#X connect 35 0 45 0;
-#X connect 35 0 8 0;
-#X connect 36 0 10 0;
-#X connect 37 0 46 0;
-#X connect 41 0 36 0;
-#X connect 41 1 35 0;
-#X connect 41 2 37 0;
-#X connect 42 0 43 0;
-#X connect 46 0 8 1;
+#X text 195 15 [cc-learner /unit /control];
+#X obj 268 133 midi.random-smooth;
+#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 connect 2 0 10 1;
+#X connect 6 0 35 0;
+#X connect 6 1 34 0;
+#X connect 6 2 36 0;
+#X connect 8 0 13 0;
+#X connect 8 0 14 0;
+#X connect 9 0 49 0;
+#X connect 10 0 50 0;
+#X connect 11 0 28 0;
+#X connect 13 0 25 0;
+#X connect 15 0 26 0;
+#X connect 15 0 37 0;
+#X connect 16 0 12 0;
+#X connect 17 0 18 0;
+#X connect 18 0 48 0;
+#X connect 19 0 29 0;
+#X connect 19 1 11 1;
+#X connect 20 0 19 0;
+#X connect 21 0 11 0;
+#X connect 22 0 24 0;
+#X connect 24 0 23 0;
+#X connect 27 0 14 0;
+#X connect 28 0 12 1;
+#X connect 29 0 21 0;
+#X connect 31 0 32 0;
+#X connect 34 0 42 0;
+#X connect 34 0 10 0;
+#X connect 35 0 46 0;
+#X connect 36 0 43 0;
+#X connect 39 0 35 0;
+#X connect 39 1 34 0;
+#X connect 39 2 36 0;
+#X connect 40 0 47 0;
+#X connect 43 0 50 1;
+#X connect 46 0 9 0;
+#X connect 49 0 8 0;
+#X connect 50 0 8 1;
 #X coords 0 -1 1 1 77 79 2 50 30;
diff --git a/controctopus/note-learner.pd b/controctopus/note-learner.pd
index 7c14def..a0bc7ee 100644
--- a/controctopus/note-learner.pd
+++ b/controctopus/note-learner.pd
@@ -6,7 +6,7 @@
 #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 1 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 36 256;
+11 -260624 -1 -1 0 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
 -1 -1;
@@ -75,7 +75,7 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X obj 365 104 t a;
 #X obj 395 104 t a;
 #X obj 349 53 notein;
-#X text 351 17 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;
@@ -178,52 +178,52 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #X obj 51 90 t b f;
 #X obj 40 265 s;
 #X obj 51 177 s \$1\$2/polytouch;
-#X msg 55 243 symbol \$1\$2/polytouch/in;
 #X obj 55 222 list prepend \$3;
 #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;
 #X connect 1 0 6 0;
 #X connect 2 0 0 0;
 #X connect 3 0 2 0;
 #X connect 4 0 0 0;
 #X connect 4 1 1 1;
-#X connect 7 0 5 1;
+#X connect 7 0 10 0;
 #X connect 8 0 7 0;
-#X connect 9 0 8 0;
-#X connect 10 0 4 0;
-#X connect 10 0 5 0;
+#X connect 9 0 4 0;
+#X connect 9 0 5 0;
+#X connect 10 0 5 1;
 #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 193 list prepend \$3;
-#X msg 236 214 symbol \$1\$2/velocity/in;
 #X obj 221 132 r \$0.velocity;
 #X obj 61 237 s;
 #X obj 76 172 r \$0.pad.v;
 #X obj 76 193 list prepend \$3;
-#X msg 76 214 symbol \$1\$2/note/in;
 #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 199 list prepend \$3;
-#X msg 427 220 symbol \$1\$2/trigger/in;
 #X obj 412 154 != 0;
+#X msg 76 214 symbol \$1*\$2/note/in;
+#X msg 236 214 symbol \$1*\$2/velocity/in;
+#X msg 427 220 symbol \$1*\$2/trigger/in;
 #X connect 1 0 2 0;
-#X connect 2 0 3 0;
-#X connect 3 0 0 1;
-#X connect 4 0 0 0;
-#X connect 6 0 7 0;
-#X connect 7 0 8 0;
-#X connect 8 0 5 1;
-#X connect 9 0 5 0;
-#X connect 10 0 15 0;
-#X connect 12 0 13 0;
-#X connect 13 0 14 0;
-#X connect 14 0 11 1;
-#X connect 15 0 11 0;
+#X connect 2 0 14 0;
+#X connect 3 0 0 0;
+#X connect 5 0 6 0;
+#X connect 6 0 13 0;
+#X connect 7 0 4 0;
+#X connect 8 0 12 0;
+#X connect 10 0 11 0;
+#X connect 11 0 15 0;
+#X connect 12 0 9 0;
+#X connect 13 0 4 1;
+#X connect 14 0 0 1;
+#X connect 15 0 9 1;
 #X restore 451 457 pd group-style-sends;
 #N canvas 0 22 220 213 gui-relay 0;
 #X obj 56 77 prepent set;
@@ -243,6 +243,7 @@ empty 0 -6 0 10 -110565 -1 -1 1 256;
 #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 connect 0 0 3 0;
 #X connect 1 0 35 0;
 #X connect 1 0 44 0;