improvements to OSC objects, new helpfiles, list-union-merge is handy for making OSC addresses

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

7 files changed, 148 insertions, 69 deletions

diff --git a/sfruit/OSCin.pd b/sfruit/OSCin.pd
new file mode 100644
index 0000000..dcd549e
--- /dev/null
+++ b/sfruit/OSCin.pd
@@ -0,0 +1,16 @@
+#N canvas 237 306 254 272 10;
+#X obj 46 54 udpreceive \$1;
+#X obj 46 80 unpackOSC;
+#X obj 139 190 s OSCIN;
+#X obj 46 105 list;
+#X obj 46 153 routeOSC /accxyz;
+#X obj 46 128 route list;
+#X obj 113 128 s OSCIN.ORPHANS;
+#X obj 46 189 s OSCIN.ACCEL;
+#X connect 0 0 1 0;
+#X connect 1 0 3 0;
+#X connect 3 0 5 0;
+#X connect 4 0 7 0;
+#X connect 4 1 2 0;
+#X connect 5 0 4 0;
+#X connect 5 1 6 0;
diff --git a/sfruit/deeprouteOSC.pd b/sfruit/deeprouteOSC.pd
index 0d42f08..0fac120 100644
--- a/sfruit/deeprouteOSC.pd
+++ b/sfruit/deeprouteOSC.pd
@@ -1,11 +1,7 @@
 #N canvas 368 88 344 571 10;
-
 #X obj 207 43 namecanvas \$0self;
 #N canvas 208 132 808 593 constructor 0;
 #X obj 401 113 symbol2list /;
-#X obj 440 364 s2l-explode;
-#X obj 440 385 list prepend /;
-#X obj 440 406 list-l2s;
 #X obj 377 466 list append;
 #X obj 377 533 s \$0self;
 #X obj 377 364 f;
@@ -43,54 +39,53 @@
 #X msg 377 489 obj 30 \$1 routeOSC \$2;
 #X obj 259 433 + 2;
 #X obj 292 433 + 3;
-#X connect 0 0 18 0;
-#X connect 1 0 2 0;
-#X connect 2 0 3 0;
-#X connect 3 0 4 1;
-#X connect 4 0 38 0;
-#X connect 6 0 13 0;
-#X connect 6 0 27 1;
-#X connect 6 0 29 0;
-#X connect 7 0 10 0;
-#X connect 7 1 8 1;
-#X connect 7 2 31 0;
-#X connect 8 0 7 0;
-#X connect 9 0 8 0;
-#X connect 9 1 8 1;
-#X connect 10 0 11 0;
-#X connect 10 1 6 0;
-#X connect 10 2 1 0;
-#X connect 11 0 8 0;
-#X connect 12 0 4 0;
-#X connect 12 0 23 0;
-#X connect 13 0 6 1;
-#X connect 14 0 15 0;
-#X connect 15 0 5 0;
-#X connect 16 0 6 1;
+#X msg 440 384 /\$1;
+#X connect 0 0 15 0;
+#X connect 1 0 35 0;
+#X connect 3 0 10 0;
+#X connect 3 0 24 1;
+#X connect 3 0 26 0;
+#X connect 4 0 7 0;
+#X connect 4 1 5 1;
+#X connect 4 2 28 0;
+#X connect 5 0 4 0;
+#X connect 6 0 5 0;
+#X connect 6 1 5 1;
+#X connect 7 0 8 0;
+#X connect 7 1 3 0;
+#X connect 7 2 38 0;
+#X connect 8 0 5 0;
+#X connect 9 0 1 0;
+#X connect 9 0 20 0;
+#X connect 10 0 3 1;
+#X connect 11 0 12 0;
+#X connect 12 0 2 0;
+#X connect 13 0 3 1;
+#X connect 14 0 16 0;
+#X connect 15 0 6 0;
+#X connect 15 1 13 0;
+#X connect 15 2 14 0;
 #X connect 17 0 19 0;
-#X connect 18 0 9 0;
-#X connect 18 1 16 0;
-#X connect 18 2 17 0;
-#X connect 20 0 22 0;
-#X connect 21 0 20 0;
-#X connect 22 0 5 0;
-#X connect 24 0 21 1;
-#X connect 25 0 12 0;
-#X connect 26 0 27 0;
-#X connect 27 0 30 0;
-#X connect 28 0 39 0;
-#X connect 28 1 40 0;
-#X connect 29 0 28 0;
-#X connect 29 1 25 0;
-#X connect 30 0 28 0;
-#X connect 31 0 32 0;
-#X connect 31 1 21 0;
-#X connect 33 0 34 0;
-#X connect 34 0 36 0;
-#X connect 34 1 0 0;
-#X connect 35 0 33 0;
-#X connect 36 0 0 0;
-#X connect 38 0 5 0;
-#X connect 39 0 14 0;
-#X connect 40 0 14 1;
+#X connect 18 0 17 0;
+#X connect 19 0 2 0;
+#X connect 21 0 18 1;
+#X connect 22 0 9 0;
+#X connect 23 0 24 0;
+#X connect 24 0 27 0;
+#X connect 25 0 36 0;
+#X connect 25 1 37 0;
+#X connect 26 0 25 0;
+#X connect 26 1 22 0;
+#X connect 27 0 25 0;
+#X connect 28 0 29 0;
+#X connect 28 1 18 0;
+#X connect 30 0 31 0;
+#X connect 31 0 33 0;
+#X connect 31 1 0 0;
+#X connect 32 0 30 0;
+#X connect 33 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 11 0;
+#X connect 37 0 11 1;
+#X connect 38 0 1 1;
 #X restore 207 21 pd constructor;
diff --git a/sfruit/dialog.yes-no-help.pd b/sfruit/dialog.yes-no-help.pd
new file mode 100644
index 0000000..abe05b4
--- /dev/null
+++ b/sfruit/dialog.yes-no-help.pd
@@ -0,0 +1,21 @@
+#N canvas 0 22 441 317 10;
+#X text 16 18 [dialog.yes-no] will spawn a dialog box under the user's
+cursor when banged \, outputting "1" if the user clicks "Yes" and "0"
+if the user clicks "No". The message in the dialog box can be given
+as the first argument. Due to limitations in Pd \, the message must
+use _ in place of spaces. If no argument is given \, the message will
+simply be "Are_you_sure?".;
+#X text 312 276 2008 Luke Iannini;
+#X obj 118 124 bng 30 250 50 0 empty empty empty 17 7 0 10 -261234
+-1 -1;
+#X obj 118 189 sel 1 0;
+#X msg 118 215 set YES;
+#X msg 169 215 set NO;
+#X obj 118 166 dialog.yes-no Activate_soulsonic_mantronic_force?;
+#X msg 118 241;
+#X connect 2 0 6 0;
+#X connect 3 0 4 0;
+#X connect 3 1 5 0;
+#X connect 4 0 7 0;
+#X connect 5 0 7 0;
+#X connect 6 0 3 0;
diff --git a/sfruit/dialog.yes-no.pd b/sfruit/dialog.yes-no.pd
index 04d9876..19d1677 100644
--- a/sfruit/dialog.yes-no.pd
+++ b/sfruit/dialog.yes-no.pd
@@ -1,10 +1,7 @@
 #N canvas 266 442 628 346 10;
-
-
-
-#N canvas 781 650 305 105 \$0.dialog-box 0;
-#X obj 2 2 cnv 15 300 30 empty \$0.line1 Are_you_sure? 20 12 0 14 -262144
--1 0;
+#N canvas 0 201 305 105 \$0.dialog-box 0;
+#X obj 2 2 cnv 15 300 30 empty \$0.line1 empty 20 12 0 14 -262144 -1
+0;
 #X obj 2 33 cnv 15 300 30 empty \$0.line2 empty 20 12 0 14 -262144
 -1 0;
 #X obj 74 71 bng 30 250 50 0 \$0.yes-s \$0.yes-r Yes. 35 15 0 10 -4032
@@ -14,9 +11,9 @@
 #X restore 49 308 pd \$0.dialog-box;
 #X obj 31 22 inlet;
 #X obj 33 159 r \$0.yes-s;
-#X obj 73 179 r \$0.no-s;
+#X obj 103 159 r \$0.no-s;
 #X msg 33 203 1;
-#X msg 73 203 vis 0;
+#X msg 103 233 vis 0;
 #X obj 33 252 outlet;
 #X obj 344 40 loadbang;
 #X obj 344 87 s2l-explode;
@@ -27,15 +24,17 @@
 #X obj 381 165 prepent label;
 #X obj 344 274 s \$0.line1;
 #X obj 381 187 s \$0.line2;
-#X obj 73 225 s pd-\$0.dialog-box;
+#X obj 103 255 s pd-\$0.dialog-box;
 #X obj 31 67 s pd-\$0.dialog-box;
 #X obj 31 45 dialog.under-cursor 305 105 1440 900;
 #X obj 344 62 list-onearg \$1 Are_you_sure?;
 #X obj 481 22 import-disabled list-abs;
+#X msg 64 203 0;
 #X connect 1 0 18 0;
 #X connect 2 0 4 0;
 #X connect 2 0 5 0;
 #X connect 3 0 5 0;
+#X connect 3 0 21 0;
 #X connect 4 0 6 0;
 #X connect 5 0 16 0;
 #X connect 7 0 19 0;
@@ -49,3 +48,4 @@
 #X connect 13 0 15 0;
 #X connect 18 0 17 0;
 #X connect 19 0 8 0;
+#X connect 21 0 6 0;
diff --git a/sfruit/keycommand.pd b/sfruit/keycommand.pd
index b1a2866..b0b0cef 100644
--- a/sfruit/keycommand.pd
+++ b/sfruit/keycommand.pd
@@ -1,13 +1,17 @@
-#N canvas 274 22 408 156 10;
-#X obj 29 47 keynamedown \$1;
+#N canvas 274 22 434 172 10;
+#X obj 29 27 keynamedown \$1;
 #X obj 29 116 s \$2;
 #X obj 29 82 list append \$3;
-#X obj 197 48 r ACTIVE_KEYCOMMANDS?;
-#X obj 197 122 s ACTIVE_KEYCOMMAND;
-#X obj 197 74 list append \$1: Sends \$3 to \$2;
-#X obj 197 98 list trim;
-#X connect 0 0 2 0;
+#X obj 227 48 r ACTIVE_KEYCOMMANDS?;
+#X obj 227 122 s ACTIVE_KEYCOMMAND;
+#X obj 227 74 list append \$1: Sends \$3 to \$2;
+#X obj 227 98 list trim;
+#X obj 29 58 spigot 1;
+#X obj 83 58 r ENABLE_KEYCOMMANDS?;
+#X connect 0 0 7 0;
 #X connect 2 0 1 0;
 #X connect 3 0 5 0;
 #X connect 5 0 6 0;
 #X connect 6 0 4 0;
+#X connect 7 0 2 0;
+#X connect 8 0 7 1;
diff --git a/sfruit/learnOSC.pd b/sfruit/learnOSC.pd
new file mode 100644
index 0000000..2271fea
--- /dev/null
+++ b/sfruit/learnOSC.pd
@@ -0,0 +1,20 @@
+#N canvas 145 92 239 311 10;
+#X obj 72 131 list split 1;
+#X obj 72 181 t b a;
+#X msg 129 155 0;
+#X obj 25 218 sdeeprouteOSC;
+#X obj 25 247 outlet;
+#X obj 105 87 inlet learn?;
+#X obj 144 249 outlet;
+#X obj 72 155 spigot;
+#X obj 25 58 r OSCIN;
+#X connect 0 0 7 0;
+#X connect 1 0 2 0;
+#X connect 1 1 3 1;
+#X connect 1 1 6 0;
+#X connect 2 0 7 1;
+#X connect 3 0 4 0;
+#X connect 5 0 7 1;
+#X connect 7 0 1 0;
+#X connect 8 0 0 0;
+#X connect 8 0 3 0;
diff --git a/sfruit/list-union-merge.pd b/sfruit/list-union-merge.pd
new file mode 100644
index 0000000..c11a7ce
--- /dev/null
+++ b/sfruit/list-union-merge.pd
@@ -0,0 +1,23 @@
+#N canvas 809 374 341 379 10;
+#X obj 52 137 list-map;
+#X obj 117 206 list;
+#X obj 117 237 list-map;
+#X obj 97 166 t b a;
+#X obj 184 237 list append;
+#X msg 184 258 \$1\$2;
+#X obj 67 166 t a;
+#X obj 138 33 inlet;
+#X obj 52 32 inlet;
+#X obj 52 339 outlet;
+#X connect 0 0 9 0;
+#X connect 0 1 3 0;
+#X connect 1 0 2 0;
+#X connect 2 0 6 0;
+#X connect 2 1 4 0;
+#X connect 3 0 1 0;
+#X connect 3 1 4 1;
+#X connect 4 0 5 0;
+#X connect 5 0 2 1;
+#X connect 6 0 0 1;
+#X connect 7 0 1 1;
+#X connect 8 0 0 0;