Browse Source

a few small bugfixes

m---w 11 years ago
parent
commit
32e73b5a50
3 changed files with 244 additions and 233 deletions
  1. 19 26
      ds_logic.pd
  2. 216 202
      ds_reg.pd
  3. 9 5
      ds_transition.pd

+ 19 - 26
ds_logic.pd

@@ -154,11 +154,11 @@ Public License;
 #X connect 6 1 7 0;
 #X connect 7 0 8 0;
 #X restore 71 -116 pd init;
-#X text 346 -128 (corresponding gui: [ds_gui]);
+#X text 448 -122 (corresponding gui: [ds_gui]);
 #X obj 71 304 outlet datastream;
 #X obj 71 284 r \$0-datastream;
 #X text 55 332 (c)2012 Marian Weger;
-#X text 345 -107 for help: see [ds-help];
+#X text 447 -101 for help: see [ds-help];
 #X text 41 -158 ds_logic <domain> (<arg1> <arg2> ... );
 #N canvas 205 22 851 471 filename 0;
 #X obj 138 232 r /ds/\$1/reload;
@@ -1042,7 +1042,7 @@ Public License;
 #X connect 1 0 2 0;
 #X connect 2 0 4 0;
 #X connect 3 0 1 1;
-#X restore 353 244 pd print_datastream;
+#X restore 483 244 pd print_datastream;
 #N canvas 233 22 722 751 print_scenes 0;
 #X obj 123 117 f 0;
 #X obj 138 93 r /ds/\$1/scene/selected;
@@ -1143,7 +1143,7 @@ Public License;
 #X connect 41 0 37 1;
 #X connect 44 0 8 1;
 #X connect 44 0 9 0;
-#X restore 353 224 pd print_scenes;
+#X restore 483 224 pd print_scenes;
 #N canvas 0 22 450 300 print_main 0;
 #X obj 141 58 r /ds/\$1/print/main;
 #X obj 141 80 b;
@@ -1152,7 +1152,7 @@ Public License;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
-#X restore 353 204 pd print_main;
+#X restore 483 204 pd print_main;
 #N canvas 825 22 297 519 global_registers 0;
 #X obj 46 101 ds_reg_global \$1 /dispatch;
 #X obj 46 371 ds_reg_global \$1 /change;
@@ -1339,7 +1339,7 @@ Public License;
 #X connect 14 0 9 0;
 #X connect 15 0 0 0;
 #X connect 18 0 5 1;
-#X restore 353 -6 pd copy;
+#X restore 483 -6 pd copy;
 #N canvas 0 22 410 253 print_edit-lock-error 0;
 #X obj 108 80 r \$0-edit-lock-error;
 #X obj 108 102 b;
@@ -1348,7 +1348,7 @@ Public License;
 #X connect 0 0 1 0;
 #X connect 1 0 3 0;
 #X connect 3 0 2 0;
-#X restore 353 154 pd print_edit-lock-error;
+#X restore 483 154 pd print_edit-lock-error;
 #N canvas 65 253 388 305 paste_insert 0;
 #X obj 131 88 t b b;
 #X obj 158 113 s \$0-paste-insert-blank;
@@ -1357,7 +1357,7 @@ Public License;
 #X connect 0 0 2 0;
 #X connect 0 1 1 0;
 #X connect 3 0 0 0;
-#X restore 353 14 pd paste_insert;
+#X restore 483 14 pd paste_insert;
 #N canvas 175 22 732 745 insert_blank 0;
 #X obj 110 176 f 0;
 #X obj 125 146 r /ds/\$1/scene/selected;
@@ -1499,7 +1499,7 @@ subsequent incremented.;
 #X connect 43 0 31 1;
 #X connect 44 0 29 1;
 #X connect 44 0 30 1;
-#X restore 353 54 pd insert_blank;
+#X restore 483 54 pd insert_blank;
 #N canvas 822 251 376 225 cut 0;
 #X obj 110 44 r /ds/\$1/edit/scene/cut;
 #X obj 110 66 t b b;
@@ -1508,7 +1508,7 @@ subsequent incremented.;
 #X connect 0 0 1 0;
 #X connect 1 0 3 0;
 #X connect 1 1 2 0;
-#X restore 353 94 pd cut;
+#X restore 483 94 pd cut;
 #N canvas 0 22 774 367 PRINT 0;
 #X obj 96 278 print Kollabs/DS (\$1);
 #X obj 96 254 list trim;
@@ -1540,7 +1540,7 @@ subsequent incremented.;
 #X connect 14 0 4 0;
 #X connect 15 0 6 0;
 #X connect 16 0 10 0;
-#X restore 353 184 pd PRINT;
+#X restore 483 184 pd PRINT;
 #N canvas 504 22 761 489 print_clipboard 0;
 #X msg 68 190 print;
 #X obj 113 190 list prepend \$0;
@@ -1581,7 +1581,7 @@ subsequent incremented.;
 #X connect 15 0 5 1;
 #X connect 16 0 4 1;
 #X connect 17 0 15 0;
-#X restore 353 134 pd print_clipboard;
+#X restore 483 134 pd print_clipboard;
 #N canvas 369 207 318 307 delete_all 0;
 #X obj 83 67 r /ds/\$1/edit/clear;
 #X msg 83 252 all scenes in memory deleted.;
@@ -1600,7 +1600,7 @@ subsequent incremented.;
 #X connect 6 0 1 0;
 #X connect 6 0 8 0;
 #X connect 6 1 7 0;
-#X restore 353 -46 pd delete_all;
+#X restore 483 -46 pd delete_all;
 #N canvas 499 22 395 512 clear 0;
 #X obj 110 44 r /ds/\$1/edit/scene/clear;
 #X obj 110 186 f 0;
@@ -1634,17 +1634,8 @@ subsequent incremented.;
 #X connect 13 1 14 0;
 #X connect 13 2 9 0;
 #X connect 15 0 7 1;
-#X restore 353 -26 pd clear;
+#X restore 483 -26 pd clear;
 #N canvas 107 247 415 286 \$0-scene-slots 0;
-#N canvas 0 22 450 300 1920-slot-0 0;
-#X obj 30 20 ds_logic_slot help2 1920 0;
-#X restore 30 20 pd 1920-slot-0;
-#N canvas 0 22 450 300 1920-slot-1 0;
-#X obj 30 20 ds_logic_slot help2 1920 1;
-#X restore 30 40 pd 1920-slot-1;
-#N canvas 0 22 450 300 1920-slot-2 0;
-#X obj 30 20 ds_logic_slot help2 1920 2;
-#X restore 30 60 pd 1920-slot-2;
 #X restore 71 134 pd \$0-scene-slots;
 #N canvas 47 22 475 654 paste_overwrite 0;
 #X obj 80 183 f 0;
@@ -1783,7 +1774,7 @@ subsequent incremented.;
 #X connect 24 4 3 0;
 #X connect 24 5 11 0;
 #X connect 25 0 17 0;
-#X restore 353 34 pd paste_overwrite;
+#X restore 483 34 pd paste_overwrite;
 #N canvas 156 22 824 707 delete 0;
 #X obj 110 186 f 0;
 #X obj 125 156 r /ds/\$1/scene/selected;
@@ -1928,7 +1919,7 @@ subsequent incremented.;
 #X connect 44 0 33 1;
 #X connect 44 0 35 1;
 #X connect 45 0 40 1;
-#X restore 353 74 pd delete;
+#X restore 483 74 pd delete;
 #N canvas 0 22 533 601 slot-clear 0;
 #X obj 159 220 list prepend \$1 \$0;
 #N canvas 541 210 450 300 PRINT 0;
@@ -2062,9 +2053,11 @@ subsequent incremented.;
 #X connect 17 0 4 0;
 #X connect 17 1 5 0;
 #X restore 71 174 pd clear-all;
-#X obj 353 114 ds_logic_slot \$1 \$0 clipboard;
+#X obj 483 114 ds_logic_slot \$1 \$0 clipboard;
 #X text 346 -158 arguments: nodispatch \, osc <osc-domain> \, simple
 ;
 #X obj 71 114 table \$0-slot-container-table 50;
+#X text 161 -96 <-- clear contents before saving!!!;
+#X text 186 136 <-- clear contents before saving!!!;
 #X connect 3 0 2 0;
 #X coords 0 559 1 558 85 60 0;

+ 216 - 202
ds_reg.pd

@@ -1,45 +1,44 @@
-#N canvas 770 47 444 499 10;
+#N canvas 690 99 444 499 10;
 #N canvas 229 22 611 756 dispatch 0;
-#X obj 145 1150 list trim;
-#X obj 94 535 t b a;
-#X obj 145 638 kdemux2;
+#X obj 145 1200 list trim;
+#X obj 94 585 t b a;
+#X obj 145 688 kdemux2;
 #X obj 58 160 t a a;
 #X obj 37 284 route bang;
 #X obj 37 80 r /ds/\$1\$2/redispatch;
 #X obj 58 103 r /ds/\$1\$2/dispatch;
-#X obj 184 674 list prepend;
-#X obj 145 1623 s;
-#X obj 160 1578 list trim;
-#X obj 160 1600 symbol;
-#X obj 160 1236 list prepend \$2;
-#X obj 184 590 t b a;
-#X msg 184 612 1;
-#X obj 145 778 kdemux2;
-#X obj 184 730 t b a;
-#X msg 184 752 1;
-#X obj 184 814 list append;
-#X obj 160 1338 kdemux2;
-#X obj 199 1290 t b a;
-#X msg 199 1312 1;
-#X obj 199 1361 list prepend;
-#X msg 199 1383 \$1\$2;
-#X obj 160 1488 kdemux2;
-#X obj 199 1440 t b a;
-#X msg 199 1462 1;
-#X msg 199 1533 \$1\$2;
-#X obj 199 1511 list append;
-#X obj 160 1190 r \$0-init-complete;
-#X obj 199 1418 r /ds/\$1\$2/name_append;
-#X obj 199 1268 r /ds/\$1\$2/name_prepend;
-#X obj 184 568 r /ds/\$1\$2/data_prepend;
-#X obj 184 708 r /ds/\$1\$2/data_append;
-#X obj 94 472 kdemux2 1;
+#X obj 184 724 list prepend;
+#X obj 145 1673 s;
+#X obj 160 1628 list trim;
+#X obj 160 1650 symbol;
+#X obj 160 1286 list prepend \$2;
+#X obj 184 640 t b a;
+#X msg 184 662 1;
+#X obj 145 828 kdemux2;
+#X obj 184 780 t b a;
+#X msg 184 802 1;
+#X obj 184 864 list append;
+#X obj 160 1388 kdemux2;
+#X obj 199 1340 t b a;
+#X msg 199 1362 1;
+#X obj 199 1411 list prepend;
+#X msg 199 1433 \$1\$2;
+#X obj 160 1538 kdemux2;
+#X obj 199 1490 t b a;
+#X msg 199 1512 1;
+#X msg 199 1583 \$1\$2;
+#X obj 199 1561 list append;
+#X obj 160 1240 r \$0-init-complete;
+#X obj 199 1468 r /ds/\$1\$2/name_append;
+#X obj 199 1318 r /ds/\$1\$2/name_prepend;
+#X obj 184 618 r /ds/\$1\$2/data_prepend;
+#X obj 184 758 r /ds/\$1\$2/data_append;
 #X obj 145 379 r /ds/\$1/transition/state;
 #X obj 37 184 list;
-#X obj 160 1212 b;
-#X obj 145 497 s /ds/\$1\$2/transition/in;
-#X obj 145 535 r /ds/\$1\$2/transition/out;
-#X obj 94 1668 s /ds/\$1\$2/dispatched;
+#X obj 160 1262 b;
+#X obj 133 547 s /ds/\$1\$2/transition/in;
+#X obj 145 585 r /ds/\$1\$2/transition/out;
+#X obj 94 1718 s /ds/\$1\$2/dispatched;
 #N canvas 653 247 547 492 change 0;
 #X obj 105 13 inlet;
 #X obj 138 107 change;
@@ -113,33 +112,37 @@
 #X obj 145 451 && 1;
 #X obj 157 425 t b f;
 #X obj 157 403 r /ds/\$1/transition/activate;
-#X obj 211 927 list length;
-#X obj 313 929 r /ds/\$1\$2/resize;
-#X obj 268 1026 spigot 1;
-#X msg 211 1048 const 0;
-#X obj 211 979 t b f;
-#X msg 268 1048 resize \$1;
-#X obj 313 997 spigot 1;
-#X obj 358 973 == 0;
-#X obj 358 951 r /ds/\$1\$2/resize/lock;
-#X obj 145 880 kdemux2;
-#X obj 184 857 r /ds/\$1\$2/table;
-#X obj 184 903 t a a;
-#X obj 184 1076 list prepend 0;
+#X obj 211 977 list length;
+#X obj 313 979 r /ds/\$1\$2/resize;
+#X obj 268 1076 spigot 1;
+#X msg 211 1098 const 0;
+#X obj 211 1029 t b f;
+#X msg 268 1098 resize \$1;
+#X obj 313 1047 spigot 1;
+#X obj 358 1023 == 0;
+#X obj 358 1001 r /ds/\$1\$2/resize/lock;
+#X obj 145 930 kdemux2;
+#X obj 184 907 r /ds/\$1\$2/table;
+#X obj 184 953 t a a;
+#X obj 184 1126 list prepend 0;
 #X obj 58 125 anyonce /ds/\$1\$2/dispatch;
 #X obj 178 204 r \$0-init-complete;
 #X obj 178 226 v /ds/\$1\$2/change/lock/v;
 #X obj 178 248 == 0;
+#X obj 94 522 kdemux2;
+#X obj 145 493 && 0;
+#X obj 208 447 t b f;
+#X obj 208 425 r \$0-transition-state;
 #X connect 0 0 8 0;
-#X connect 1 0 39 0;
+#X connect 1 0 38 0;
 #X connect 1 1 2 0;
 #X connect 2 0 14 0;
 #X connect 2 1 7 0;
-#X connect 3 0 35 1;
+#X connect 3 0 34 1;
 #X connect 3 1 4 0;
-#X connect 4 1 41 0;
-#X connect 5 0 35 0;
-#X connect 6 0 61 0;
+#X connect 4 1 40 0;
+#X connect 5 0 34 0;
+#X connect 6 0 60 0;
 #X connect 7 0 14 0;
 #X connect 9 0 10 0;
 #X connect 10 0 8 1;
@@ -147,12 +150,12 @@
 #X connect 12 0 13 0;
 #X connect 12 1 7 1;
 #X connect 13 0 2 1;
-#X connect 14 0 57 0;
+#X connect 14 0 56 0;
 #X connect 14 1 17 0;
 #X connect 15 0 16 0;
 #X connect 15 1 17 1;
 #X connect 16 0 14 1;
-#X connect 17 0 57 0;
+#X connect 17 0 56 0;
 #X connect 18 0 23 0;
 #X connect 18 1 21 0;
 #X connect 19 0 20 0;
@@ -167,47 +170,51 @@
 #X connect 25 0 23 1;
 #X connect 26 0 9 0;
 #X connect 27 0 26 0;
-#X connect 28 0 36 0;
+#X connect 28 0 35 0;
 #X connect 29 0 24 0;
 #X connect 30 0 19 0;
 #X connect 31 0 12 0;
 #X connect 32 0 15 0;
-#X connect 33 0 1 0;
-#X connect 33 1 37 0;
-#X connect 34 0 45 0;
-#X connect 35 0 4 0;
-#X connect 36 0 11 0;
-#X connect 38 0 2 0;
-#X connect 40 0 33 0;
-#X connect 41 0 33 0;
-#X connect 41 1 40 0;
-#X connect 42 0 44 0;
-#X connect 43 0 44 0;
-#X connect 44 0 41 1;
-#X connect 45 0 33 1;
+#X connect 33 0 44 0;
+#X connect 34 0 4 0;
+#X connect 35 0 11 0;
+#X connect 37 0 2 0;
+#X connect 39 0 64 0;
+#X connect 40 0 64 0;
+#X connect 40 1 39 0;
+#X connect 41 0 43 0;
+#X connect 42 0 43 0;
+#X connect 43 0 40 1;
+#X connect 44 0 65 0;
+#X connect 45 0 44 0;
+#X connect 45 1 44 1;
 #X connect 46 0 45 0;
-#X connect 46 1 45 1;
-#X connect 47 0 46 0;
-#X connect 48 0 52 0;
-#X connect 49 0 54 0;
-#X connect 50 0 53 0;
-#X connect 51 0 0 0;
-#X connect 52 0 51 0;
-#X connect 52 1 50 0;
-#X connect 53 0 0 0;
-#X connect 54 0 50 1;
-#X connect 55 0 54 1;
-#X connect 56 0 55 0;
-#X connect 57 0 0 0;
-#X connect 57 1 59 0;
-#X connect 58 0 57 1;
-#X connect 59 0 60 0;
-#X connect 59 1 48 0;
-#X connect 60 0 0 0;
-#X connect 61 0 3 0;
+#X connect 47 0 51 0;
+#X connect 48 0 53 0;
+#X connect 49 0 52 0;
+#X connect 50 0 0 0;
+#X connect 51 0 50 0;
+#X connect 51 1 49 0;
+#X connect 52 0 0 0;
+#X connect 53 0 49 1;
+#X connect 54 0 53 1;
+#X connect 55 0 54 0;
+#X connect 56 0 0 0;
+#X connect 56 1 58 0;
+#X connect 57 0 56 1;
+#X connect 58 0 59 0;
+#X connect 58 1 47 0;
+#X connect 59 0 0 0;
+#X connect 60 0 3 0;
+#X connect 61 0 62 0;
 #X connect 62 0 63 0;
-#X connect 63 0 64 0;
-#X connect 64 0 44 1;
+#X connect 63 0 43 1;
+#X connect 64 0 1 0;
+#X connect 64 1 36 0;
+#X connect 65 0 64 1;
+#X connect 66 0 65 0;
+#X connect 66 1 65 1;
+#X connect 67 0 66 0;
 #X restore 59 301 pd dispatch;
 #X obj 59 465 outlet slave-chain;
 #N canvas 67 22 1046 726 init 0;
@@ -253,7 +260,7 @@
 #X obj 482 766 list prepend symbol;
 #X msg 482 788 symbol \$2;
 #X obj 482 810 symbol;
-#X obj 755 724 s \$0-init-complete;
+#X obj 850 753 s \$0-init-complete;
 #X obj 243 782 s /ds/\$1\$2/name_prepend;
 #X obj 328 660 s /ds/\$1\$2/data_prepend;
 #X obj 544 689 s /ds/\$1\$2/data_append;
@@ -456,15 +463,14 @@ occupy nooccupy table resize noresize;
 #X restore 59 221 pd init;
 #X text 40 21 ds_reg <domain> <name> <arg1> <arg2> ...;
 #X obj 59 191 s /ds/\$1\$2/slave/start;
-#X text 280 430 (c)2011 Marian Weger;
+#X text 282 456 (c)2011 Marian Weger;
 #X obj 59 391 r /ds/\$1\$2/dispatched;
 #X obj 86 441 s /ds/\$1/dispatched;
-#N canvas 416 22 884 668 transition_loader 0;
-#X obj 89 144 r /ds/\$1/transition/check/answer;
-#X obj 403 162 s /ds/\$1/transition/check/question;
-#X msg 433 455 clear;
-#X obj 89 238 t b b b;
-#X msg 178 279 0;
+#N canvas 246 34 884 668 transition_loader 0;
+#X obj 89 124 r /ds/\$1/transition/check/answer;
+#X obj 403 212 s /ds/\$1/transition/check/question;
+#X msg 627 1863 clear;
+#X msg 183 279 0;
 #X msg 129 279 1;
 #X obj 450 1864 s pd-\$0-transition;
 #X obj 108 374 list append \$1 \$2 \$3 \$4 \$5 \$6 \$7 \$8 \$9 \$10
@@ -506,7 +512,7 @@ occupy nooccupy table resize noresize;
 #X msg 644 400 0;
 #X obj 317 1354 == 0;
 #X obj 317 1330 ||;
-#X obj 403 40 r \$0-init-complete;
+#X obj 403 30 r \$0-init-complete;
 #X obj 317 611 &&;
 #X obj 424 571 t b f;
 #X obj 317 958 == 0;
@@ -531,13 +537,12 @@ occupy nooccupy table resize noresize;
 #X msg 558 1642 obj 381 180 s /ds/\$1\$2/transition/out;
 #X obj 208 1699 v \$0-transition-counter;
 #X obj 208 1743 - 1;
-#X obj 178 312 s /ds/\$1/dsp;
+#X obj 183 312 s /ds/\$1/dsp;
 #X obj 301 1285 v /ds/\$1\$2/table/v;
 #X obj 403 134 del 100;
 #X obj 427 938 v /ds/\$1\$2/delay/lock/v;
 #X obj 424 549 v /ds/\$1\$2/slave/lock/v;
 #X obj 644 372 r \$0-transition-loader-init;
-#X obj 433 429 r \$0-transition-loader-init;
 #X obj 424 528 r \$0-transition-loader-init;
 #X obj 427 914 r \$0-transition-loader-init;
 #X obj 272 1259 t a b b;
@@ -545,112 +550,119 @@ occupy nooccupy table resize noresize;
 #X obj 89 186 loadonce /ds/\$1\$2/transition/check/answer;
 #X obj 430 90 s \$0-transition-loader-init;
 #X obj 403 62 t b b;
-#X obj 480 349 r \$0-preinit;
-#X connect 0 0 77 0;
-#X connect 2 0 6 0;
-#X connect 3 0 5 0;
-#X connect 3 1 7 0;
-#X connect 3 2 4 0;
-#X connect 4 0 66 0;
-#X connect 5 0 66 0;
-#X connect 7 0 10 0;
-#X connect 8 0 6 0;
-#X connect 9 0 6 0;
-#X connect 10 0 9 0;
-#X connect 10 1 55 0;
-#X connect 10 2 75 0;
-#X connect 10 3 23 0;
-#X connect 10 4 17 0;
-#X connect 10 5 8 0;
-#X connect 10 6 2 0;
-#X connect 10 6 38 0;
+#X obj 627 1837 r \$0-preinit;
+#X obj 109 149 r \$0-transition-check-answer;
+#X obj 403 156 list prepend symbol \$0-transition-check-answer;
+#X obj 403 178 list trim;
+#X obj 129 335 s \$0-transition-state;
+#X obj 89 238 t b b b;
+#X connect 0 0 75 0;
+#X connect 2 0 5 0;
+#X connect 3 0 65 0;
+#X connect 4 0 65 0;
+#X connect 4 0 82 0;
+#X connect 6 0 9 0;
+#X connect 7 0 5 0;
+#X connect 8 0 5 0;
+#X connect 9 0 8 0;
+#X connect 9 1 54 0;
+#X connect 9 2 73 0;
+#X connect 9 3 22 0;
+#X connect 9 4 16 0;
+#X connect 9 5 7 0;
+#X connect 9 6 37 0;
+#X connect 10 0 11 0;
+#X connect 10 1 5 0;
 #X connect 11 0 12 0;
-#X connect 11 1 6 0;
-#X connect 12 0 13 0;
-#X connect 13 0 15 0;
-#X connect 13 1 14 0;
-#X connect 14 0 15 1;
-#X connect 14 0 12 0;
-#X connect 15 0 52 0;
-#X connect 16 0 11 0;
-#X connect 17 0 16 0;
+#X connect 12 0 14 0;
+#X connect 12 1 13 0;
+#X connect 13 0 14 1;
+#X connect 13 0 11 0;
+#X connect 14 0 51 0;
+#X connect 15 0 10 0;
+#X connect 16 0 15 0;
+#X connect 17 0 18 0;
+#X connect 17 1 5 0;
 #X connect 18 0 19 0;
-#X connect 18 1 6 0;
-#X connect 19 0 20 0;
-#X connect 20 0 22 0;
-#X connect 20 1 21 0;
-#X connect 21 0 22 1;
-#X connect 21 0 19 0;
-#X connect 22 0 53 0;
-#X connect 23 0 30 0;
+#X connect 19 0 21 0;
+#X connect 19 1 20 0;
+#X connect 20 0 21 1;
+#X connect 20 0 18 0;
+#X connect 21 0 52 0;
+#X connect 22 0 29 0;
+#X connect 23 0 24 0;
+#X connect 23 1 5 0;
 #X connect 24 0 25 0;
-#X connect 24 1 6 0;
-#X connect 25 0 26 0;
-#X connect 26 0 28 0;
-#X connect 26 1 27 0;
-#X connect 27 0 28 1;
-#X connect 27 0 25 0;
-#X connect 28 0 54 0;
-#X connect 29 0 31 0;
-#X connect 30 0 18 0;
-#X connect 31 0 24 0;
+#X connect 25 0 27 0;
+#X connect 25 1 26 0;
+#X connect 26 0 27 1;
+#X connect 26 0 24 0;
+#X connect 27 0 53 0;
+#X connect 28 0 30 0;
+#X connect 29 0 17 0;
+#X connect 30 0 23 0;
+#X connect 31 0 32 0;
+#X connect 31 1 5 0;
 #X connect 32 0 33 0;
-#X connect 32 1 6 0;
-#X connect 33 0 34 0;
-#X connect 34 0 36 0;
-#X connect 34 1 35 0;
-#X connect 35 0 36 1;
-#X connect 35 0 33 0;
-#X connect 36 0 61 0;
-#X connect 38 0 37 0;
-#X connect 39 0 29 1;
-#X connect 40 0 39 0;
-#X connect 41 0 79 0;
-#X connect 42 0 50 0;
-#X connect 43 0 42 0;
-#X connect 43 1 42 1;
-#X connect 44 0 45 0;
-#X connect 45 0 51 0;
-#X connect 46 0 45 0;
-#X connect 46 1 45 1;
-#X connect 47 0 44 0;
-#X connect 48 0 42 0;
-#X connect 49 0 48 0;
-#X connect 50 0 17 1;
-#X connect 51 0 23 1;
-#X connect 52 0 6 0;
-#X connect 53 0 6 0;
-#X connect 54 0 6 0;
-#X connect 55 0 62 0;
-#X connect 55 1 63 0;
+#X connect 33 0 35 0;
+#X connect 33 1 34 0;
+#X connect 34 0 35 1;
+#X connect 34 0 32 0;
+#X connect 35 0 60 0;
+#X connect 37 0 36 0;
+#X connect 38 0 28 1;
+#X connect 39 0 38 0;
+#X connect 40 0 77 0;
+#X connect 41 0 49 0;
+#X connect 42 0 41 0;
+#X connect 42 1 41 1;
+#X connect 43 0 44 0;
+#X connect 44 0 50 0;
+#X connect 45 0 44 0;
+#X connect 45 1 44 1;
+#X connect 46 0 43 0;
+#X connect 47 0 41 0;
+#X connect 48 0 47 0;
+#X connect 49 0 16 1;
+#X connect 50 0 22 1;
+#X connect 51 0 5 0;
+#X connect 52 0 5 0;
+#X connect 53 0 5 0;
+#X connect 54 0 61 0;
+#X connect 54 1 62 0;
+#X connect 55 0 63 0;
+#X connect 55 1 5 0;
 #X connect 56 0 64 0;
-#X connect 56 1 6 0;
-#X connect 57 0 65 0;
-#X connect 57 1 58 0;
-#X connect 58 0 59 1;
-#X connect 59 0 60 0;
-#X connect 60 0 6 0;
-#X connect 61 0 6 0;
-#X connect 62 0 56 0;
-#X connect 63 0 32 0;
-#X connect 64 0 57 0;
-#X connect 65 0 59 0;
-#X connect 67 0 40 0;
-#X connect 68 0 1 0;
-#X connect 69 0 46 0;
-#X connect 70 0 43 0;
-#X connect 71 0 38 0;
-#X connect 72 0 2 0;
-#X connect 73 0 70 0;
-#X connect 74 0 69 0;
-#X connect 75 0 29 0;
-#X connect 75 1 67 0;
-#X connect 75 2 76 0;
-#X connect 76 0 40 1;
-#X connect 77 0 3 0;
-#X connect 79 0 68 0;
-#X connect 79 1 78 0;
-#X connect 80 0 2 0;
+#X connect 56 1 57 0;
+#X connect 57 0 58 1;
+#X connect 58 0 59 0;
+#X connect 59 0 5 0;
+#X connect 60 0 5 0;
+#X connect 61 0 55 0;
+#X connect 62 0 31 0;
+#X connect 63 0 56 0;
+#X connect 64 0 58 0;
+#X connect 66 0 39 0;
+#X connect 67 0 80 0;
+#X connect 68 0 45 0;
+#X connect 69 0 42 0;
+#X connect 70 0 37 0;
+#X connect 71 0 69 0;
+#X connect 72 0 68 0;
+#X connect 73 0 28 0;
+#X connect 73 1 66 0;
+#X connect 73 2 74 0;
+#X connect 74 0 39 1;
+#X connect 75 0 83 0;
+#X connect 77 0 67 0;
+#X connect 77 1 76 0;
+#X connect 78 0 2 0;
+#X connect 79 0 75 0;
+#X connect 80 0 81 0;
+#X connect 81 0 1 0;
+#X connect 83 0 4 0;
+#X connect 83 1 6 0;
+#X connect 83 2 3 0;
 #X restore 59 341 pd transition_loader;
 #N canvas 525 22 627 302 \$0-transition 0;
 #X restore 59 361 pd \$0-transition;
@@ -719,6 +731,8 @@ occupy nooccupy table resize noresize;
 <symbol> \, name_prepend <symbol> \, name_append <symbol> \, direct
 \, delay <time/s> \, noslave \, nodelay \, nochange \, occupy \, nooccupy
 \, table \, resize \, noresize;
+#X text 198 263 <-- clear contents before saving!!!;
+#X text 167 361 <-- clear contents before saving!!!;
 #X connect 6 0 13 0;
 #X connect 12 0 4 0;
 #X connect 13 0 1 0;

+ 9 - 5
ds_transition.pd

@@ -19,11 +19,11 @@
 ;
 #X obj -565 227 ds_reg_global \$1 /reg/settings/buffer/occupy;
 #X restore 56 131 pd register_settings_buffer;
-#N canvas 438 22 532 526 init 0;
+#N canvas 438 22 532 526 init 1;
 #X obj 142 16 loadbang;
 #X obj 299 122 list prepend \$1;
-#X obj 170 495 r /ds/\$1/transition/check/question;
-#X obj 170 537 s /ds/\$1/transition/check/answer;
+#X obj 245 478 r /ds/\$1/transition/check/question;
+#X obj 142 597 s /ds/\$1/transition/check/answer;
 #X msg 299 152 \; /ds/\$1/store/settings/state 1 \; /ds/\$1/recall/settings/state
 1 \; /ds/\$1/transition/state 1 \; /ds/\$1/occupy 1 \; /ds/\$1/morph
 1 \; /ds/\$1/occupy/override 0 \; /ds/\$1/slave 1 \; /ds/\$1/delay
@@ -33,7 +33,7 @@
 0 \; /ds/\$1/reg/settings/buffer/morph/curve/weight 0 \; /ds/\$1/reg/settings/buffer/morph/curve/quality
 0 \; /ds/\$1/reg/settings/buffer/morph/curve/resolution 128 \; /ds/\$1/reg/settings/buffer/occupy
 0 \; /ds/\$1/transition/busy 0 \; /ds/\$1/transition/paused 0 \;;
-#X obj 142 460 del 100;
+#X obj 142 440 del 100;
 #N canvas 80 22 899 619 FLAGS 0;
 #X obj 70 109 list split 1;
 #X obj 104 131 t l;
@@ -123,9 +123,11 @@
 #X obj 325 96 s /ds/\$1/print;
 #X msg 325 74 ERROR [ds_transition] multiply defined!;
 #X obj 142 44 loadonce /ds/\$1/transition/init;
+#X obj 245 532 s;
+#X obj 245 502 t b s;
 #X connect 0 0 11 0;
 #X connect 1 0 4 0;
-#X connect 2 0 3 0;
+#X connect 2 0 13 0;
 #X connect 5 0 3 0;
 #X connect 8 0 5 0;
 #X connect 8 1 6 0;
@@ -134,6 +136,8 @@
 #X connect 10 0 9 0;
 #X connect 11 0 8 0;
 #X connect 11 1 10 0;
+#X connect 13 0 12 0;
+#X connect 13 1 12 1;
 #X restore 56 91 pd init;
 #N canvas 322 375 450 300 register 0;
 #X obj 94 98 ds_reg_global \$1 /occupy;