Browse Source

added list-abs (for change)

m---w 11 years ago
parent
commit
180facc8b3
11 changed files with 452 additions and 825 deletions
  1. 8 7
      _DS_TEST.pd
  2. 10 4
      ds_help.pd
  3. 210 171
      ds_logic.pd
  4. 29 16
      ds_reg.pd
  5. 0 413
      ds_reg_table.pd
  6. 86 78
      ds_scheduler.pd
  7. 57 80
      ds_scheduler_gui.pd
  8. 26 26
      ds_transition.pd
  9. 10 10
      osc2send-help.pd
  10. 15 19
      osc2send.pd
  11. 1 1
      testsavefile.txt

+ 8 - 7
_DS_TEST.pd

@@ -1,4 +1,4 @@
-#N canvas 224 22 1075 737 10;
+#N canvas 204 22 1075 737 10;
 #X floatatom 70 449 5 0 0 0 - - -;
 #X msg 70 468 list kjbasd 9b2f #*lafn \$1_88 n\$1;
 #X obj 70 490 list;
@@ -6,17 +6,17 @@
 #X symbolatom 70 590 10 0 0 0 - - -;
 #X obj 70 609 s /variable2;
 #X obj 55 655 vsl 15 128 0 127 0 0 /variable3 /variable3 3 0 -9 0 10
--262144 -1 -1 12100 1;
+-262144 -1 -1 2900 1;
 #X obj 75 655 vsl 15 128 0 127 0 0 /variable4 /variable4 4 0 -9 0 10
--262144 -1 -1 10900 1;
+-262144 -1 -1 600 1;
 #X obj 95 655 vsl 15 128 0 127 0 0 /variable5 /variable5 5 0 -9 0 10
--262144 -1 -1 9100 1;
+-262144 -1 -1 1800 1;
 #X obj 115 655 vsl 15 128 0 127 0 0 /variable6 /variable6 6 0 -9 0
-10 -262144 -1 -1 11800 1;
+10 -262144 -1 -1 1600 1;
 #X obj 171 557 r /variable2;
 #X symbolatom 171 609 10 0 0 0 - - -;
 #X obj 318 461 r /variable1;
-#X msg 318 505 kjbasd 9b2f #*lafn 4_88 n4;
+#X msg 318 505 ---;
 #X obj 318 483 msg_monitor;
 #X obj 171 579 symbol;
 #X obj 742 299 table /mytable1 107;
@@ -27,8 +27,9 @@
 #X obj 60 66 ds_scheduler domain osc oscdomain;
 #X obj 60 86 ds_transition domain osc oscdomain;
 #X obj 60 46 ds_logic domain osc oscdomain;
-#X obj 679 668 ds_reg domain /mytable1 table;
 #X obj 679 548 ds_reg domain /variable1;
+#X obj 183 388 list-compare;
+#X obj 679 668 ds_reg domain /mytable1 table;
 #X obj 679 568 ds_reg domain /variable2;
 #X obj 679 588 ds_reg domain /variable3;
 #X obj 679 608 ds_reg domain /variable4;

+ 10 - 4
ds_help.pd

@@ -1,4 +1,4 @@
-#N canvas 50 22 1208 756 10;
+#N canvas 63 22 1208 756 10;
 #X obj 10 62 cnv 15 751 80 empty empty empty 5 8 0 14 -233017 -66577
 0;
 #X obj 834 478 cnv 15 370 30 empty empty empty 20 12 0 14 -228856 -66577
@@ -795,12 +795,12 @@ control.;
 #X text 86 415 Look inside:;
 #X obj 66 387 cnv 15 260 20 empty empty [ds_logic]:_FLAGS 5 10 0 14
 -1 -262144 0;
-#N canvas 129 40 457 485 \$0-logic_flags 0;
+#N canvas 274 22 457 485 \$0-logic_flags 1;
 #X obj 4 25 cnv 15 430 450 empty empty empty 20 12 0 14 -233017 -66577
 0;
 #X obj 34 135 cnv 15 370 160 empty empty empty 20 12 0 14 -262130 -66577
 0;
-#X obj 34 114 cnv 15 370 20 empty empty direct 5 10 0 14 -1 -262144
+#X obj 34 114 cnv 15 370 20 empty empty simple 5 10 0 14 -1 -262144
 0;
 #X obj 186 268 osc2send-help;
 #X obj 34 341 cnv 15 370 100 empty empty empty 20 12 0 14 -262130 -66577
@@ -1764,4 +1764,10 @@ But a beginning with "/" is proposed to conform with the OSC standard.
 PD does allow.;
 #X restore 901 649 pd \$0-naming_syntax;
 #X obj 419 1253 ds_scheduler_gui help;
-#X coords 0 756 1 755 150 115 0;
+#X obj 651 390 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
+#X msg 651 410 vis 1;
+#X obj 651 432 s pd-\$0-logic_flags;
+#X connect 118 0 119 0;
+#X connect 119 0 120 0;
+#X coords 0 -1 1 1 771 2000 2 0 0;

+ 210 - 171
ds_logic.pd

@@ -1,4 +1,4 @@
-#N canvas 540 22 693 704 10;
+#N canvas 302 158 655 559 10;
 #N canvas 88 236 314 267 init 0;
 #X obj 98 52 loadbang;
 #N canvas 0 22 460 359 LICENSE 0;
@@ -99,7 +99,6 @@ Public License;
 #X obj 181 375 + 30;
 #X obj 181 326 + 1;
 #X msg 266 252 0;
-#X obj 132 290 v \$0-module-counter;
 #X obj 74 97 r \$0-module-loader;
 #X obj 467 574 s pd-\$0-modules;
 #X obj 93 252 t a a b;
@@ -113,47 +112,48 @@ Public License;
 #X obj 74 145 t b a b;
 #X obj 247 101 inlet bang;
 #X obj 112 433 list append 0 0 0 0 0 0 0 0 0;
+#X obj 132 300 f;
 #X msg 139 493 obj 30 \$1 ds_logic_\$2 \$3 \$4 \$5 \$6 \$7 \$8 \$9
 ;
-#X connect 0 0 7 0;
+#X connect 0 0 6 0;
 #X connect 1 0 2 0;
-#X connect 2 0 9 1;
+#X connect 2 0 8 1;
 #X connect 3 0 1 0;
-#X connect 3 0 5 0;
-#X connect 4 0 5 0;
-#X connect 5 0 3 0;
-#X connect 6 0 16 0;
-#X connect 8 1 9 0;
-#X connect 8 2 5 0;
-#X connect 9 0 18 0;
-#X connect 10 0 11 0;
-#X connect 10 1 19 0;
-#X connect 11 0 7 0;
+#X connect 3 0 18 1;
+#X connect 4 0 18 1;
+#X connect 5 0 15 0;
+#X connect 7 1 8 0;
+#X connect 7 2 18 0;
+#X connect 8 0 17 0;
+#X connect 9 0 10 0;
+#X connect 9 1 19 0;
+#X connect 10 0 6 0;
+#X connect 11 0 13 0;
+#X connect 11 1 4 0;
+#X connect 11 1 0 0;
+#X connect 11 2 12 0;
 #X connect 12 0 14 0;
-#X connect 12 1 4 0;
-#X connect 12 1 0 0;
-#X connect 12 2 13 0;
-#X connect 13 0 15 0;
-#X connect 14 0 15 0;
-#X connect 16 0 14 0;
-#X connect 16 1 8 0;
-#X connect 16 2 13 0;
-#X connect 17 0 12 0;
-#X connect 18 0 10 0;
-#X connect 19 0 7 0;
+#X connect 13 0 14 0;
+#X connect 15 0 13 0;
+#X connect 15 1 7 0;
+#X connect 15 2 12 0;
+#X connect 16 0 11 0;
+#X connect 17 0 9 0;
+#X connect 18 0 3 0;
+#X connect 19 0 6 0;
 #X restore 115 164 pd MODULE_LOADER;
 #X connect 0 0 4 0;
 #X connect 4 0 2 0;
 #X connect 4 1 5 0;
 #X connect 4 2 3 0;
 #X connect 4 3 1 0;
-#X restore 71 29 pd init;
-#X text 346 17 (corresponding gui: [ds_gui]);
-#X obj 71 629 outlet datastream;
-#X obj 71 609 r \$0-datastream;
-#X text 55 657 (c)2012 Marian Weger;
-#X text 345 38 for help: see [ds-help];
-#X text 41 -13 ds_logic <domain> (<arg1> <arg2> ... );
+#X restore 71 -116 pd init;
+#X text 346 -128 (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 41 -158 ds_logic <domain> (<arg1> <arg2> ... );
 #N canvas 59 87 851 471 filename 0;
 #X obj 138 232 r /ds/\$1/reload;
 #X obj 118 55 r /ds/\$1/loadfile;
@@ -193,7 +193,7 @@ Public License;
 #X connect 15 0 12 0;
 #X connect 16 0 7 0;
 #X connect 17 0 3 0;
-#X restore 71 99 pd filename;
+#X restore 71 -46 pd filename;
 #N canvas 89 22 340 430 recall 0;
 #X obj 156 27 r /ds/\$1/scene/current;
 #X obj 53 27 r /ds/\$1/recall;
@@ -404,7 +404,7 @@ Public License;
 #X connect 12 2 6 0;
 #X connect 12 3 9 0;
 #X connect 12 4 13 0;
-#X restore 71 159 pd recall;
+#X restore 71 14 pd recall;
 #N canvas 72 22 513 573 store 0;
 #X obj 191 85 f 0;
 #X obj 206 57 r /ds/\$1/scene/selected;
@@ -511,7 +511,7 @@ Public License;
 #X connect 20 3 13 0;
 #X connect 20 4 14 0;
 #X connect 22 0 18 1;
-#X restore 71 199 pd store;
+#X restore 71 54 pd store;
 #N canvas 187 150 444 525 save 0;
 #X obj 86 420 list append cr;
 #X obj 86 467 list trim;
@@ -647,7 +647,7 @@ Public License;
 #X connect 15 1 12 0;
 #X connect 15 2 11 0;
 #X coords 0 525 1 524 85 60 0;
-#X restore 71 139 pd save;
+#X restore 71 -6 pd save;
 #N canvas 83 22 616 753 load 0;
 #X obj 153 340 b;
 #X obj 153 912 s;
@@ -871,7 +871,7 @@ Public License;
 #X connect 43 0 42 0;
 #X connect 44 0 15 0;
 #X coords 0 753 1 752 85 60 0;
-#X restore 71 119 pd load;
+#X restore 71 -26 pd load;
 #N canvas 0 22 334 258 slot-main 0;
 #X obj 79 136 textfile;
 #X obj 79 92 until;
@@ -884,13 +884,13 @@ Public License;
 #X connect 2 0 1 0;
 #X connect 2 1 0 0;
 #X connect 3 0 2 0;
-#X restore 71 219 pd slot-main;
-#N canvas 78 22 1011 756 slot-create 0;
-#X msg 557 894 clear;
-#X obj 546 917 s pd-\$0-scene-slots;
-#X obj 110 570 list prepend \$1 \$0;
-#X obj 186 621 r \$0-load-start;
-#X msg 176 646 0;
+#X restore 71 74 pd slot-main;
+#N canvas 78 22 1011 756 slot-create 1;
+#X msg 596 972 clear;
+#X obj 585 995 s pd-\$0-scene-slots;
+#X obj 149 588 list prepend \$1 \$0;
+#X obj 225 639 r \$0-load-start;
+#X msg 215 664 0;
 #X obj 74 67 r \$0-slot-create;
 #N canvas 0 22 450 300 PRINT 0;
 #X obj 131 61 inlet scene-nr;
@@ -898,55 +898,67 @@ Public License;
 #X obj 131 173 s /ds/\$1/print/debug;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
-#X restore 93 873 pd PRINT;
-#X obj 176 598 loadbang;
-#X obj 110 843 s;
-#X msg 546 824 obj 30 \$4 pd \$2-slot-\$3;
-#X msg 129 774 symbol pd-\$2-slot-\$3;
-#X obj 149 701 v \$0-slot-counter;
-#X obj 264 701 + 1;
-#X obj 507 767 list prepend \$1 \$0;
-#X obj 110 646 t l l b;
-#X obj 555 268 r /ds/\$1/scene/maximum;
-#X obj 569 869 r \$0-load-start;
-#X obj 557 846 loadbang;
-#X obj 507 1015 s;
-#X msg 526 946 symbol pd-\$2-slot-\$3;
-#X obj 507 799 t l l l;
-#X msg 507 978 vis 0;
-#X obj 264 774 s /ds/\$1/scene/quantity;
-#X obj 74 96 t b f b;
-#X msg 182 134 0;
-#X msg 134 134 1;
-#X obj 182 168 s /ds/\$1/dsp;
-#X obj 507 265 t f f;
-#X obj 540 292 >;
-#X obj 507 317 spigot;
-#X obj 507 491 spigot;
-#X obj 507 339 t f f;
-#X obj 534 362 s /ds/\$1/scene/maximum;
-#X obj 555 438 expr size("$s1");
-#X obj 507 389 t f f b;
-#X obj 540 467 >;
-#X msg 507 513 resize \$1;
-#X obj 507 675 t f f;
-#X obj 552 701 * 20;
-#X obj 552 723 + 20;
-#X obj 507 745 pack 0 0;
-#X obj 555 416 symbol \$0-slot-container-table;
-#X obj 507 535 s \$0-slot-container-table;
-#X msg 110 806 obj 30 20 ds_logic_slot \$1 \$2 \$3 \, loadbang;
-#X obj 93 202 t f f f f;
-#X obj 507 585 t f f;
-#X obj 540 607 tabread \$0-slot-container-table;
-#X obj 507 653 spigot;
-#X obj 781 319 table \$0-slot-container-table 50;
-#X obj 540 629 == 0;
+#X restore 132 891 pd PRINT;
+#X obj 215 616 loadbang;
+#X obj 149 861 s;
+#X msg 585 902 obj 30 \$4 pd \$2-slot-\$3;
+#X msg 168 792 symbol pd-\$2-slot-\$3;
+#X obj 188 719 v \$0-slot-counter;
+#X obj 303 719 + 1;
+#X obj 546 845 list prepend \$1 \$0;
+#X obj 149 664 t l l b;
+#X obj 594 286 r /ds/\$1/scene/maximum;
+#X obj 608 947 r \$0-load-start;
+#X obj 596 924 loadbang;
+#X obj 546 1093 s;
+#X msg 565 1024 symbol pd-\$2-slot-\$3;
+#X obj 546 877 t l l l;
+#X msg 546 1056 vis 0;
+#X obj 303 792 s /ds/\$1/scene/quantity;
+#X obj 113 114 t b f b;
+#X msg 221 152 0;
+#X msg 173 152 1;
+#X obj 221 186 s /ds/\$1/dsp;
+#X obj 546 283 t f f;
+#X obj 579 310 >;
+#X obj 546 335 spigot;
+#X obj 546 549 spigot;
+#X obj 546 357 t f f;
+#X obj 573 380 s /ds/\$1/scene/maximum;
+#X obj 594 496 expr size("$s1");
+#X obj 546 447 t f f b;
+#X obj 579 525 >;
+#X msg 546 571 resize \$1;
+#X obj 591 779 * 20;
+#X obj 591 801 + 20;
+#X obj 546 823 pack 0 0;
+#X obj 594 474 symbol \$0-slot-container-table;
+#X obj 546 593 s \$0-slot-container-table;
+#X obj 132 220 t f f f f;
+#X obj 546 643 t f f;
+#X obj 579 665 tabread \$0-slot-container-table;
+#X obj 546 711 spigot;
+#X obj 579 687 == 0;
+#X obj 546 419 + 2;
+#X text 595 419 +1 buffer;
+#X obj 74 89 moses 0;
+#N canvas 426 157 450 300 PRINT 0;
+#X obj 131 61 inlet scene-nr;
+#X obj 131 173 s /ds/\$1/print/errors;
+#X obj 131 149 list prepend can not create negative slot: scene;
+#X connect 0 0 2 0;
+#X connect 2 0 1 0;
+#X restore 74 220 pd PRINT;
+#X msg 149 824 clear \, obj 30 20 ds_logic_slot \$1 \$2 \$3 \, loadbang
+;
+#X obj 631 801 tabwrite \$0-slot-container-table;
+#X obj 546 733 t f f b f;
+#X msg 631 779 1;
 #X connect 0 0 1 0;
 #X connect 2 0 14 0;
 #X connect 3 0 4 0;
 #X connect 4 0 11 0;
-#X connect 5 0 23 0;
+#X connect 5 0 49 0;
 #X connect 7 0 4 0;
 #X connect 9 0 1 0;
 #X connect 10 0 8 1;
@@ -954,7 +966,7 @@ Public License;
 #X connect 12 0 11 0;
 #X connect 12 0 22 0;
 #X connect 13 0 20 0;
-#X connect 14 0 43 0;
+#X connect 14 0 51 0;
 #X connect 14 1 10 0;
 #X connect 14 2 11 0;
 #X connect 15 0 28 1;
@@ -966,7 +978,7 @@ Public License;
 #X connect 20 2 9 0;
 #X connect 21 0 18 0;
 #X connect 23 0 25 0;
-#X connect 23 1 44 0;
+#X connect 23 1 42 0;
 #X connect 23 2 24 0;
 #X connect 24 0 26 0;
 #X connect 25 0 26 0;
@@ -975,31 +987,37 @@ Public License;
 #X connect 28 0 29 1;
 #X connect 29 0 31 0;
 #X connect 30 0 36 0;
-#X connect 31 0 34 0;
+#X connect 31 0 47 0;
 #X connect 31 1 32 0;
 #X connect 33 0 35 1;
 #X connect 34 0 30 0;
 #X connect 34 1 35 0;
-#X connect 34 2 41 0;
+#X connect 34 2 40 0;
 #X connect 35 0 30 1;
-#X connect 36 0 42 0;
-#X connect 37 0 40 0;
-#X connect 37 1 38 0;
-#X connect 38 0 39 0;
-#X connect 39 0 40 1;
-#X connect 40 0 13 0;
-#X connect 41 0 33 0;
-#X connect 43 0 8 0;
-#X connect 44 0 6 0;
-#X connect 44 1 2 0;
-#X connect 44 2 45 0;
-#X connect 44 3 27 0;
-#X connect 45 0 47 0;
-#X connect 45 1 46 0;
-#X connect 46 0 49 0;
-#X connect 47 0 37 0;
-#X connect 49 0 47 1;
-#X restore 71 239 pd slot-create;
+#X connect 36 0 41 0;
+#X connect 37 0 38 0;
+#X connect 38 0 39 1;
+#X connect 39 0 13 0;
+#X connect 40 0 33 0;
+#X connect 42 0 6 0;
+#X connect 42 1 2 0;
+#X connect 42 2 43 0;
+#X connect 42 3 27 0;
+#X connect 43 0 45 0;
+#X connect 43 1 44 0;
+#X connect 44 0 46 0;
+#X connect 45 0 53 0;
+#X connect 46 0 45 1;
+#X connect 47 0 34 0;
+#X connect 49 0 50 0;
+#X connect 49 1 23 0;
+#X connect 51 0 8 0;
+#X connect 53 0 39 0;
+#X connect 53 1 37 0;
+#X connect 53 2 54 0;
+#X connect 53 3 52 1;
+#X connect 54 0 52 0;
+#X restore 71 94 pd slot-create;
 #N canvas 0 22 450 300 print_datastream 0;
 #X obj 133 63 r \$0-datastream;
 #X obj 133 115 spigot;
@@ -1010,7 +1028,7 @@ Public License;
 #X connect 1 0 2 0;
 #X connect 2 0 4 0;
 #X connect 3 0 1 1;
-#X restore 256 180 pd print_datastream;
+#X restore 353 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;
@@ -1111,7 +1129,7 @@ Public License;
 #X connect 41 0 37 1;
 #X connect 44 0 8 1;
 #X connect 44 0 9 0;
-#X restore 256 160 pd print_scenes;
+#X restore 353 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;
@@ -1120,7 +1138,7 @@ Public License;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
-#X restore 256 140 pd print_main;
+#X restore 353 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;
@@ -1133,11 +1151,10 @@ Public License;
 #X obj 46 271 ds_reg_global \$1 /print/errors/state;
 #X obj 46 291 ds_reg_global \$1 /print/datastream/state;
 #X obj 46 311 ds_reg_global \$1 /print/debug/state;
-#X restore 71 69 pd global_registers;
+#X restore 71 -76 pd global_registers;
 #N canvas 374 206 450 300 \$0-modules 0;
-#X obj 30 50 ds_logic_osc domain oscdomain 0 0 0 0 0;
-#X obj 30 70 ds_logic_simple domain 2183 0 0 0 0 0;
-#X restore 71 49 pd \$0-modules;
+#X obj 30 9630 ds_logic_osc domain oscdomain 0 0 0 0 0;
+#X restore 71 -96 pd \$0-modules;
 #N canvas 0 22 450 300 current_scene 0;
 #X obj 81 121 r /ds/\$1/scene;
 #X obj 81 143 s /ds/\$1/scene/current;
@@ -1168,7 +1185,7 @@ Public License;
 #X connect 11 1 7 0;
 #X restore 242 143 pd prev-next_current;
 #X connect 0 0 1 0;
-#X restore 71 339 pd current_scene;
+#X restore 71 204 pd current_scene;
 #N canvas 0 22 450 300 selected_scene 0;
 #X obj 83 137 r /ds/\$1/scene/current;
 #X obj 83 159 s /ds/\$1/scene/selected;
@@ -1193,7 +1210,7 @@ Public License;
 #X connect 8 1 7 0;
 #X restore 244 159 pd prev-next_selected;
 #X connect 0 0 1 0;
-#X restore 71 359 pd selected_scene;
+#X restore 71 224 pd selected_scene;
 #N canvas 615 75 321 461 dsp 0;
 #X obj 186 404 s pd;
 #X obj 201 42 r pd;
@@ -1236,7 +1253,7 @@ Public License;
 #X connect 16 0 15 0;
 #X connect 17 0 18 0;
 #X connect 18 0 2 0;
-#X restore 71 389 pd dsp;
+#X restore 71 254 pd dsp;
 #N canvas 129 143 457 560 copy 0;
 #X obj 110 103 f 0;
 #X obj 125 76 r /ds/\$1/scene/selected;
@@ -1309,7 +1326,7 @@ Public License;
 #X connect 14 0 9 0;
 #X connect 15 0 0 0;
 #X connect 18 0 5 1;
-#X restore 460 257 pd copy;
+#X restore 353 -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;
@@ -1318,7 +1335,7 @@ Public License;
 #X connect 0 0 1 0;
 #X connect 1 0 3 0;
 #X connect 3 0 2 0;
-#X restore 460 417 pd print_edit-lock-error;
+#X restore 353 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;
@@ -1327,7 +1344,7 @@ Public License;
 #X connect 0 0 2 0;
 #X connect 0 1 1 0;
 #X connect 3 0 0 0;
-#X restore 460 277 pd paste_insert;
+#X restore 353 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;
@@ -1469,7 +1486,7 @@ subsequent incremented.;
 #X connect 43 0 31 1;
 #X connect 44 0 29 1;
 #X connect 44 0 30 1;
-#X restore 460 317 pd insert_blank;
+#X restore 353 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;
@@ -1478,7 +1495,7 @@ subsequent incremented.;
 #X connect 0 0 1 0;
 #X connect 1 0 3 0;
 #X connect 1 1 2 0;
-#X restore 460 357 pd cut;
+#X restore 353 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;
@@ -1510,7 +1527,7 @@ subsequent incremented.;
 #X connect 14 0 4 0;
 #X connect 15 0 6 0;
 #X connect 16 0 10 0;
-#X restore 256 240 pd PRINT;
+#X restore 353 184 pd PRINT;
 #N canvas 504 22 761 489 print_clipboard 0;
 #X msg 68 190 print;
 #X obj 113 190 list prepend \$0;
@@ -1551,7 +1568,7 @@ subsequent incremented.;
 #X connect 15 0 5 1;
 #X connect 16 0 4 1;
 #X connect 17 0 15 0;
-#X restore 460 397 pd print_clipboard;
+#X restore 353 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.;
@@ -1570,7 +1587,7 @@ subsequent incremented.;
 #X connect 6 0 1 0;
 #X connect 6 0 8 0;
 #X connect 6 1 7 0;
-#X restore 460 217 pd delete_all;
+#X restore 353 -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;
@@ -1604,24 +1621,36 @@ subsequent incremented.;
 #X connect 13 1 14 0;
 #X connect 13 2 9 0;
 #X connect 15 0 7 1;
-#X restore 460 237 pd clear;
+#X restore 353 -26 pd clear;
 #N canvas 107 247 415 286 \$0-scene-slots 0;
-#N canvas 0 22 450 300 2183-slot-0 0;
-#X obj 30 20 ds_logic_slot domain 2183 0;
-#X restore 30 20 pd 2183-slot-0;
-#N canvas 0 22 450 300 2183-slot-1 0;
-#X obj 30 20 ds_logic_slot domain 2183 1;
-#X restore 30 40 pd 2183-slot-1;
-#N canvas 0 22 450 300 2183-slot-2 0;
-#X obj 30 20 ds_logic_slot domain 2183 2;
-#X restore 30 60 pd 2183-slot-2;
-#N canvas 0 22 450 300 2183-slot-10 0;
-#X obj 30 20 ds_logic_slot domain 2183 10;
-#X restore 30 220 pd 2183-slot-10;
-#N canvas 0 22 450 300 2183-slot-100 0;
-#X obj 30 20 ds_logic_slot domain 2183 100;
-#X restore 30 2020 pd 2183-slot-100;
-#X restore 71 259 pd \$0-scene-slots;
+#N canvas 0 22 450 300 1174-slot-0 0;
+#X obj 30 20 ds_logic_slot domain 1174 0;
+#X restore 30 20 pd 1174-slot-0;
+#N canvas 0 22 450 300 1174-slot-1 0;
+#X obj 30 20 ds_logic_slot domain 1174 1;
+#X restore 30 40 pd 1174-slot-1;
+#N canvas 0 22 450 300 1174-slot-2 0;
+#X restore 30 60 pd 1174-slot-2;
+#N canvas 0 22 450 300 1174-slot-10 0;
+#X obj 30 20 ds_logic_slot domain 1174 10;
+#X restore 30 220 pd 1174-slot-10;
+#N canvas 0 22 450 300 1174-slot-100 0;
+#X obj 30 20 ds_logic_slot domain 1174 100;
+#X restore 30 2020 pd 1174-slot-100;
+#N canvas 0 22 450 300 1174-slot-9 0;
+#X restore 30 200 pd 1174-slot-9;
+#N canvas 0 22 450 300 1174-slot-99 0;
+#X restore 30 2000 pd 1174-slot-99;
+#N canvas 0 22 450 300 1174-slot-100 0;
+#X obj 30 20 ds_logic_slot domain 1174 100;
+#X restore 30 2020 pd 1174-slot-100;
+#N canvas 0 22 450 300 1174-slot-10 0;
+#X obj 30 20 ds_logic_slot domain 1174 10;
+#X restore 30 220 pd 1174-slot-10;
+#N canvas 0 22 450 300 1174-slot-4 0;
+#X obj 30 20 ds_logic_slot domain 1174 4;
+#X restore 30 100 pd 1174-slot-4;
+#X restore 71 134 pd \$0-scene-slots;
 #N canvas 47 22 475 654 paste_overwrite 0;
 #X obj 80 183 f 0;
 #X obj 95 156 r /ds/\$1/scene/selected;
@@ -1759,7 +1788,7 @@ subsequent incremented.;
 #X connect 24 4 3 0;
 #X connect 24 5 11 0;
 #X connect 25 0 17 0;
-#X restore 460 297 pd paste_overwrite;
+#X restore 353 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;
@@ -1904,29 +1933,37 @@ subsequent incremented.;
 #X connect 44 0 33 1;
 #X connect 44 0 35 1;
 #X connect 45 0 40 1;
-#X restore 460 337 pd delete;
+#X restore 353 74 pd delete;
 #N canvas 0 22 533 601 slot-clear 0;
-#X obj 120 200 list prepend \$1 \$0;
+#X obj 159 220 list prepend \$1 \$0;
 #N canvas 541 210 450 300 PRINT 0;
 #X obj 131 61 inlet scene-nr;
 #X obj 131 97 list prepend slot cleared: scene;
 #X obj 131 121 s /ds/\$1/print/debug;
 #X connect 0 0 1 0;
 #X connect 1 0 2 0;
-#X restore 93 453 pd PRINT;
-#X obj 120 423 s;
-#X msg 139 354 symbol pd-\$2-slot-\$3;
-#X obj 159 281 v \$0-slot-counter;
-#X obj 120 226 t l l b;
-#X obj 274 354 s /ds/\$1/scene/quantity;
-#X obj 74 96 t b f b;
-#X msg 182 134 0;
-#X msg 134 134 1;
-#X obj 74 67 r \$0-slot-clear;
-#X obj 274 281 - 1;
-#X msg 120 386 clear;
-#X obj 93 172 t f f;
-#X obj 182 168 s /ds/\$1/dsp;
+#X restore 132 473 pd PRINT;
+#X obj 159 443 s;
+#X msg 178 374 symbol pd-\$2-slot-\$3;
+#X obj 198 301 v \$0-slot-counter;
+#X obj 159 246 t l l b;
+#X obj 313 374 s /ds/\$1/scene/quantity;
+#X obj 113 116 t b f b;
+#X msg 221 154 0;
+#X msg 173 154 1;
+#X obj 74 57 r \$0-slot-clear;
+#X obj 313 301 - 1;
+#X msg 159 406 clear;
+#X obj 132 192 t f f;
+#X obj 221 188 s /ds/\$1/dsp;
+#X obj 74 89 moses 0;
+#N canvas 426 157 450 300 PRINT 0;
+#X obj 131 61 inlet scene-nr;
+#X obj 131 173 s /ds/\$1/print/errors;
+#X obj 131 149 list prepend can not clear negative slot: scene;
+#X connect 0 0 2 0;
+#X connect 2 0 1 0;
+#X restore 74 220 pd PRINT;
 #X connect 0 0 5 0;
 #X connect 3 0 2 1;
 #X connect 4 0 11 0;
@@ -1938,13 +1975,15 @@ subsequent incremented.;
 #X connect 7 2 8 0;
 #X connect 8 0 14 0;
 #X connect 9 0 14 0;
-#X connect 10 0 7 0;
+#X connect 10 0 15 0;
 #X connect 11 0 4 0;
 #X connect 11 0 6 0;
 #X connect 12 0 2 0;
 #X connect 13 0 1 0;
 #X connect 13 1 0 0;
-#X restore 71 279 pd slot-clear;
+#X connect 15 0 16 0;
+#X connect 15 1 7 0;
+#X restore 71 154 pd slot-clear;
 #N canvas 0 22 413 596 dispatch 0;
 #X obj 53 534 s;
 #X obj 53 470 list;
@@ -1988,7 +2027,7 @@ subsequent incremented.;
 #X connect 16 0 4 1;
 #X connect 17 0 18 0;
 #X connect 18 0 16 1;
-#X restore 71 179 pd dispatch;
+#X restore 71 34 pd dispatch;
 #N canvas 0 22 504 496 clear-all 0;
 #X obj 126 397 s pd-\$0-scene-slots;
 #X msg 126 374 clear;
@@ -2027,10 +2066,10 @@ subsequent incremented.;
 #X connect 16 4 14 0;
 #X connect 17 0 4 0;
 #X connect 17 1 5 0;
-#X restore 71 299 pd clear-all;
-#X text 457 190 --- EDIT ---;
-#X obj 460 377 ds_logic_slot \$1 \$0 clipboard;
-#X text 346 -13 arguments: nodispatch \, osc <osc-domain> \, simple
+#X restore 71 174 pd clear-all;
+#X obj 353 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 connect 3 0 2 0;
-#X coords 0 704 1 703 85 60 0;
+#X coords 0 559 1 558 85 60 0;

+ 29 - 16
ds_reg.pd

@@ -40,17 +40,17 @@
 #X obj 145 437 s /ds/\$1\$2/transition/in;
 #X obj 145 475 r /ds/\$1\$2/transition/out;
 #X obj 94 1608 s /ds/\$1\$2/dispatched;
-#N canvas 457 223 609 443 change 0;
+#N canvas 485 289 536 430 change 0;
 #X obj 105 43 inlet;
 #X obj 105 117 change;
-#X obj 105 329 outlet;
+#X obj 105 379 outlet;
 #X obj 168 117 t a a;
 #X obj 207 142 list length;
 #X obj 207 164 > 1;
 #X obj 168 189 kdemux2;
 #X obj 208 231 symbol;
 #X obj 208 253 schange;
-#X obj 208 275 list trim;
+#X obj 208 345 list trim;
 #X obj 105 75 route float;
 #X obj 287 27 r \$2;
 #X msg 287 71 set \$1;
@@ -59,7 +59,10 @@
 #X obj 389 118 > 1;
 #X obj 350 143 kdemux2;
 #X obj 287 49 route float;
-#X text 380 220 todo: change for lists!;
+#X obj 302 255 list-abs/list-compare;
+#X obj 302 304 list;
+#X obj 302 226 t a a;
+#X obj 302 277 sel 0;
 #X connect 0 0 10 0;
 #X connect 1 0 2 0;
 #X connect 3 0 6 0;
@@ -67,7 +70,7 @@
 #X connect 4 0 5 0;
 #X connect 5 0 6 1;
 #X connect 6 0 7 0;
-#X connect 6 1 2 0;
+#X connect 6 1 20 0;
 #X connect 7 0 8 0;
 #X connect 8 0 9 0;
 #X connect 9 0 2 0;
@@ -80,8 +83,14 @@
 #X connect 14 0 15 0;
 #X connect 15 0 16 1;
 #X connect 16 0 8 1;
+#X connect 16 1 18 1;
 #X connect 17 0 12 0;
 #X connect 17 1 13 0;
+#X connect 18 0 21 0;
+#X connect 19 0 9 0;
+#X connect 20 0 18 0;
+#X connect 20 1 19 1;
+#X connect 21 0 19 0;
 #X restore 133 271 pd change;
 #X obj 94 247 kdemux2;
 #X obj 133 130 r /ds/\$1\$2/change;
@@ -617,20 +626,24 @@ occupy nooccupy table resize noresize;
 #X connect 79 0 42 1;
 #X restore 59 341 pd transition_loader;
 #N canvas 525 22 627 302 \$0-transition 0;
-#X obj 30 20 ds_transition_occupy domain /mytable1 table 0 0 0 0 0
-0 0 0 0 0 0 0;
-#X obj 30 60 ds_transition_slave domain /mytable1 table 0 0 0 0 0 0
-0 0 0 0 0 0;
-#X obj 30 100 ds_transition_delay domain /mytable1 table 0 0 0 0 0
-0 0 0 0 0 0 0;
-#X obj 381 180 s /ds/domain/mytable1/transition/out;
-#X obj 30 180 s /ds/domain/mytable1/dispatched;
+#X obj 30 20 ds_transition_occupy domain /variable1 0 0 0 0 0 0 0 0
+0 0 0 0 0;
+#X obj 30 60 ds_transition_slave domain /variable1 0 0 0 0 0 0 0 0
+0 0 0 0 0;
+#X obj 30 100 ds_transition_delay domain /variable1 0 0 0 0 0 0 0 0
+0 0 0 0 0;
+#X obj 30 140 ds_transition_morph domain /variable1 0 0 0 0 0 0 0 0
+0 0 0 0 0;
+#X obj 381 180 s /ds/domain/variable1/transition/out;
+#X obj 30 180 s /ds/domain/variable1/dispatched;
 #X connect 0 0 1 0;
 #X connect 0 1 1 1;
 #X connect 1 0 2 0;
 #X connect 1 1 2 1;
-#X connect 2 0 4 0;
-#X connect 2 1 3 0;
+#X connect 2 0 3 0;
+#X connect 2 1 3 1;
+#X connect 3 0 5 0;
+#X connect 3 1 4 0;
 #X restore 59 361 pd \$0-transition;
 #N canvas 151 242 403 420 route 0;
 #X obj 89 187 ds_route /ds/\$1\$2/data_prepend;
@@ -683,7 +696,7 @@ occupy nooccupy table resize noresize;
 #X connect 13 0 8 1;
 #X restore 59 241 pd fetch_and_route_loader;
 #N canvas 0 22 450 300 \$0-fetch_and_route 0;
-#X obj 30 20 ds_fetch_table domain /mytable1;
+#X obj 30 20 ds_fetch domain /variable1;
 #X restore 59 261 pd \$0-fetch_and_route;
 #N canvas 585 129 277 212 print 0;
 #X obj 64 86 r /ds/\$1\$2/print/out;

+ 0 - 413
ds_reg_table.pd

@@ -1,413 +0,0 @@
-#N canvas 131 22 853 550 10;
-#N canvas 154 30 870 699 dispatch 0;
-#X obj 364 476 t b a;
-#X obj 364 158 t a a;
-#X obj 413 237 route bang;
-#X obj 413 158 r /ds/\$1\$2/redispatch;
-#X obj 364 1 r /ds/\$1\$2/dispatch;
-#X obj 762 431 list trim;
-#X obj 762 453 symbol;
-#X obj 762 89 list prepend \$2;
-#X obj 762 191 kdemux2;
-#X obj 801 143 t b a;
-#X msg 801 165 1;
-#X obj 801 214 list prepend;
-#X msg 801 236 \$1\$2;
-#X obj 762 341 kdemux2;
-#X obj 801 293 t b a;
-#X msg 801 315 1;
-#X msg 801 386 \$1\$2;
-#X obj 801 364 list append;
-#X obj 762 43 r \$0-init-complete;
-#X obj 801 271 r /ds/\$1\$2/name_append;
-#X obj 801 121 r /ds/\$1\$2/name_prepend;
-#X obj 364 403 kdemux2 1;
-#X obj 415 370 r /ds/\$1/transition/state;
-#X obj 413 215 list;
-#X obj 762 65 b;
-#X obj 415 438 s /ds/\$1\$2/transition/in;
-#X obj 415 476 r /ds/\$1\$2/transition/out;
-#X obj 364 609 s /ds/\$1\$2/dispatched;
-#N canvas 457 223 609 443 change 0;
-#X obj 105 43 inlet;
-#X obj 105 117 change;
-#X obj 105 329 outlet;
-#X obj 168 117 t a a;
-#X obj 207 142 list length;
-#X obj 207 164 > 1;
-#X obj 168 189 kdemux2;
-#X obj 208 231 symbol;
-#X obj 208 253 schange;
-#X obj 208 275 list trim;
-#X obj 105 75 route float;
-#X obj 287 27 r \$2;
-#X msg 287 71 set \$1;
-#X obj 350 71 t a a;
-#X obj 389 96 list length;
-#X obj 389 118 > 1;
-#X obj 350 143 kdemux2;
-#X obj 287 49 route float;
-#X text 380 220 todo: change for lists!;
-#X connect 0 0 10 0;
-#X connect 1 0 2 0;
-#X connect 3 0 6 0;
-#X connect 3 1 4 0;
-#X connect 4 0 5 0;
-#X connect 5 0 6 1;
-#X connect 6 0 7 0;
-#X connect 6 1 2 0;
-#X connect 7 0 8 0;
-#X connect 8 0 9 0;
-#X connect 9 0 2 0;
-#X connect 10 0 1 0;
-#X connect 10 1 3 0;
-#X connect 11 0 17 0;
-#X connect 12 0 1 0;
-#X connect 13 0 16 0;
-#X connect 13 1 14 0;
-#X connect 14 0 15 0;
-#X connect 15 0 16 1;
-#X connect 16 0 8 1;
-#X connect 17 0 12 0;
-#X connect 17 1 13 0;
-#X restore 403 322 pd change;
-#X obj 364 298 kdemux2;
-#X obj 565 147 r /ds/\$1\$2/change;
-#X obj 577 167 r /ds/\$1/change;
-#X obj 565 237 spigot 1;
-#X obj 610 213 == 0;
-#X obj 610 191 r /ds/\$1\$2/change/lock;
-#X obj 391 564 s;
-#X obj 47 124 list length;
-#X obj 364 124 list prepend 0;
-#X obj 364 32 t a a;
-#X obj 159 333 r /ds/\$1\$2/resize;
-#X obj 114 430 spigot 1;
-#X msg 47 452 const 0;
-#X obj 47 383 t b f;
-#X msg 114 452 resize \$1;
-#X obj 159 401 spigot 1;
-#X obj 204 377 == 0;
-#X obj 204 355 r /ds/\$1\$2/resize/lock;
-#X connect 0 0 27 0;
-#X connect 0 1 35 0;
-#X connect 1 0 29 0;
-#X connect 1 1 23 1;
-#X connect 2 1 29 0;
-#X connect 3 0 23 0;
-#X connect 4 0 38 0;
-#X connect 5 0 6 0;
-#X connect 6 0 35 1;
-#X connect 7 0 8 0;
-#X connect 8 0 13 0;
-#X connect 8 1 11 0;
-#X connect 9 0 10 0;
-#X connect 9 1 11 1;
-#X connect 10 0 8 1;
-#X connect 11 0 12 0;
-#X connect 12 0 13 0;
-#X connect 13 0 5 0;
-#X connect 13 1 17 0;
-#X connect 14 0 15 0;
-#X connect 14 1 17 1;
-#X connect 15 0 13 1;
-#X connect 16 0 5 0;
-#X connect 17 0 16 0;
-#X connect 18 0 24 0;
-#X connect 19 0 14 0;
-#X connect 20 0 9 0;
-#X connect 21 0 0 0;
-#X connect 21 1 25 0;
-#X connect 22 0 21 1;
-#X connect 23 0 2 0;
-#X connect 24 0 7 0;
-#X connect 26 0 35 0;
-#X connect 28 0 21 0;
-#X connect 29 0 21 0;
-#X connect 29 1 28 0;
-#X connect 30 0 32 0;
-#X connect 31 0 32 0;
-#X connect 32 0 29 1;
-#X connect 33 0 32 1;
-#X connect 34 0 33 0;
-#X connect 36 0 42 0;
-#X connect 37 0 1 0;
-#X connect 38 0 37 0;
-#X connect 38 1 36 0;
-#X connect 39 0 44 0;
-#X connect 40 0 43 0;
-#X connect 41 0 35 0;
-#X connect 42 0 41 0;
-#X connect 42 1 40 0;
-#X connect 43 0 35 0;
-#X connect 44 0 40 1;
-#X connect 45 0 44 1;
-#X connect 46 0 45 0;
-#X coords 0 699 1 698 85 60 0;
-#X restore 59 307 pd dispatch;
-#X obj 255 404 outlet slave-chain;
-#N canvas 488 22 784 717 fetch_and_route 0;
-#X obj 132 673 s /ds/\$1/fetched;
-#X obj 132 651 list prepend \$2;
-#X obj 51 219 t b b;
-#X msg 78 242 0;
-#X msg 171 337 1;
-#X obj 51 384 route bang set;
-#X obj 171 449 list trim;
-#X obj 241 493 s;
-#X obj 152 241 t b b a;
-#X text 161 202 route value;
-#X text 454 392 global route;
-#X text 464 414 local route;
-#X obj 51 359 list trim;
-#X obj 175 542 r /ds/\$1\$2/print;
-#X obj 175 586 list prepend \$0-print;
-#X obj 429 629 r \$0-print;
-#X obj -20 542 spigot;
-#X obj -20 564 t b b;
-#X msg -20 586 <not initialised>;
-#X msg 40 542 0;
-#X msg 13 515 1;
-#X obj 132 423 kdemux2;
-#X obj 90 91 r \$0-busy;
-#X obj 90 160 s \$0-print;
-#X obj 51 91 b;
-#X obj 51 115 kdemux2;
-#X msg 90 138 Busy! Could not be saved!;
-#X obj 175 608 s /ds/\$1\$2/route;
-#X obj 352 392 r /ds/\$1/route;
-#X obj 352 414 s /ds/\$1\$2/route;
-#X obj 152 219 r /ds/\$1\$2/route;
-#X obj 175 564 t b b;
-#X obj 429 651 print Kollabs/DS (\$1): \$2;
-#X obj 51 59 r /ds/\$1/fetch/tables;
-#X obj 51 337 ktabdump \$2;
-#X text 39 41 fetch table to storage;
-#X connect 1 0 0 0;
-#X connect 2 0 34 0;
-#X connect 2 1 3 0;
-#X connect 3 0 21 1;
-#X connect 4 0 21 1;
-#X connect 5 0 16 0;
-#X connect 5 1 21 0;
-#X connect 5 2 21 0;
-#X connect 6 0 7 0;
-#X connect 8 0 34 0;
-#X connect 8 1 4 0;
-#X connect 8 2 7 1;
-#X connect 12 0 5 0;
-#X connect 13 0 31 0;
-#X connect 14 0 27 0;
-#X connect 15 0 32 0;
-#X connect 16 0 17 0;
-#X connect 17 0 18 0;
-#X connect 17 1 19 0;
-#X connect 18 0 6 0;
-#X connect 19 0 16 1;
-#X connect 20 0 16 1;
-#X connect 21 0 1 0;
-#X connect 21 1 6 0;
-#X connect 22 0 25 1;
-#X connect 24 0 25 0;
-#X connect 25 0 2 0;
-#X connect 25 1 26 0;
-#X connect 26 0 23 0;
-#X connect 28 0 29 0;
-#X connect 30 0 8 0;
-#X connect 31 0 14 0;
-#X connect 31 1 20 0;
-#X connect 33 0 24 0;
-#X connect 34 0 12 0;
-#X restore 59 285 pd fetch_and_route;
-#X obj 355 309 s /ds/\$1\$2/dialog;
-#N canvas 354 38 930 709 init 0;
-#X obj 28 34 loadbang;
-#X obj 28 346 list split 1;
-#X obj 55 433 list trim;
-#X obj 28 322 list prepend \$15 \$14 \$13 \$12 \$11 \$10 \$9 \$8 \$7
-\$6 \$5 \$4 \$3;
-#X obj 105 34 r /ds/\$1/loadbang;
-#X obj 55 116 list prepend \$1 \$2 \$0;
-#X msg 184 616 1;
-#X obj 184 591 b;
-#X obj 28 1146 s \$0-init-complete;
-#X obj 78 1101 + 1;
-#X obj 62 368 t l;
-#X obj 28 1123 sel 12;
-#X obj 28 1101 f 0;
-#X obj 28 398 t b a;
-#X msg 227 616 1;
-#X obj 249 863 spigot;
-#X msg 306 875 0;
-#X obj 249 912 s /ds/\$1\$2/delay;
-#X obj 249 885 t f b;
-#X obj 113 1014 s /ds/\$1\$2/slave;
-#X obj 76 1039 s /ds/\$1\$2/slave/lock;
-#X msg 76 1011 1;
-#X obj 76 969 t b b;
-#X msg 113 992 1;
-#X obj 227 937 s /ds/\$1\$2/delay/lock;
-#X obj 227 591 b;
-#X msg 313 616 1;
-#X obj 335 591 b;
-#X msg 335 616 0;
-#X msg 583 659 1;
-#X obj 583 637 b;
-#X obj 583 681 s /ds/\$1\$2/occupy/lock;
-#X obj 583 605 t b b;
-#X msg 631 626 1;
-#X obj 631 648 s /ds/\$1\$2/occupy;
-#X obj 313 591 b;
-#X obj 270 616 b;
-#X msg 184 963 1;
-#X obj 211 963 s /ds/\$1\$2/change;
-#X obj 184 985 s /ds/\$1\$2/change/lock;
-#X obj 184 937 t b f;
-#X obj 28 89 t b b;
-#X msg 98 768 1;
-#X obj 98 726 t b b;
-#X obj 135 771 s /ds/\$1\$2/resize;
-#X obj 98 796 s /ds/\$1\$2/resize/lock;
-#X obj 120 676 t b b;
-#X msg 157 699 1;
-#X obj 157 721 s /ds/\$1\$2/resize;
-#X msg 135 749 0;
-#X msg 139 566 1;
-#X obj 139 541 b;
-#X obj 400 880 spigot;
-#X obj 400 902 t a b;
-#X msg 457 892 0;
-#X obj 400 966 symbol;
-#X obj 400 923 list prepend symbol;
-#X msg 400 945 symbol \$2;
-#X msg 162 566 1;
-#X obj 162 541 b;
-#X obj 702 881 spigot;
-#X obj 702 903 t a b;
-#X msg 759 893 0;
-#X obj 702 925 list prepend symbol;
-#X msg 702 947 symbol \$2;
-#X obj 702 969 symbol;
-#X obj 400 990 s /ds/\$1\$2/name_prepend;
-#X obj 702 990 s /ds/\$1\$2/name_append;
-#X obj 400 541 t a;
-#X obj 55 458 route nomorph slave noresize resize name_prepend name_append
-change bang delay float direct noslave nodelay nochange occupy nooccupy
-;
-#X msg 55 148 \; /ds/\$1\$2/change 0 \; /ds/\$1\$2/change/lock 0 \;
-/ds/\$1\$2/name \$2 \;;
-#X connect 0 0 41 0;
-#X connect 1 0 13 0;
-#X connect 1 1 10 0;
-#X connect 2 0 69 0;
-#X connect 3 0 1 0;
-#X connect 4 0 41 0;
-#X connect 5 0 70 0;
-#X connect 6 0 40 0;
-#X connect 7 0 6 0;
-#X connect 9 0 12 1;
-#X connect 10 0 1 0;
-#X connect 11 0 8 0;
-#X connect 12 0 9 0;
-#X connect 12 0 11 0;
-#X connect 13 0 12 0;
-#X connect 13 1 2 0;
-#X connect 14 0 15 1;
-#X connect 14 0 24 0;
-#X connect 15 0 18 0;
-#X connect 16 0 15 1;
-#X connect 18 0 17 0;
-#X connect 18 1 16 0;
-#X connect 21 0 20 0;
-#X connect 22 0 21 0;
-#X connect 22 1 23 0;
-#X connect 23 0 19 0;
-#X connect 25 0 14 0;
-#X connect 26 0 24 0;
-#X connect 27 0 28 0;
-#X connect 28 0 40 0;
-#X connect 29 0 31 0;
-#X connect 30 0 29 0;
-#X connect 32 0 30 0;
-#X connect 32 1 33 0;
-#X connect 33 0 34 0;
-#X connect 35 0 26 0;
-#X connect 36 0 21 0;
-#X connect 37 0 39 0;
-#X connect 40 0 37 0;
-#X connect 40 1 38 0;
-#X connect 41 0 3 0;
-#X connect 41 1 5 0;
-#X connect 42 0 45 0;
-#X connect 43 0 42 0;
-#X connect 43 1 49 0;
-#X connect 46 0 42 0;
-#X connect 46 1 47 0;
-#X connect 47 0 48 0;
-#X connect 49 0 44 0;
-#X connect 50 0 52 1;
-#X connect 51 0 50 0;
-#X connect 52 0 53 0;
-#X connect 53 0 56 0;
-#X connect 53 1 54 0;
-#X connect 54 0 52 1;
-#X connect 55 0 66 0;
-#X connect 56 0 57 0;
-#X connect 57 0 55 0;
-#X connect 58 0 60 1;
-#X connect 59 0 58 0;
-#X connect 60 0 61 0;
-#X connect 61 0 63 0;
-#X connect 61 1 62 0;
-#X connect 62 0 60 1;
-#X connect 63 0 64 0;
-#X connect 64 0 65 0;
-#X connect 65 0 67 0;
-#X connect 68 0 60 0;
-#X connect 68 0 52 0;
-#X connect 69 1 22 0;
-#X connect 69 2 43 0;
-#X connect 69 3 46 0;
-#X connect 69 4 51 0;
-#X connect 69 5 59 0;
-#X connect 69 6 7 0;
-#X connect 69 8 25 0;
-#X connect 69 9 15 0;
-#X connect 69 9 68 0;
-#X connect 69 10 30 0;
-#X connect 69 10 35 0;
-#X connect 69 10 36 0;
-#X connect 69 11 36 0;
-#X connect 69 12 35 0;
-#X connect 69 13 27 0;
-#X connect 69 14 32 0;
-#X connect 69 15 30 0;
-#X connect 69 16 68 0;
-#X restore 59 252 pd init;
-#X obj 355 216 inlet settings;
-#X obj 355 246 route dialog bang;
-#X obj 404 279 s /ds/\$1\$2/slave/start;
-#X obj 255 372 r /ds/\$1\$2/dispatched;
-#X obj 631 202 r /ds/\$1/name/route;
-#X obj 631 224 s /ds/\$1\$2/name/route;
-#X obj 231 522 ds_transition_slot_table \$1 \$2;
-#X text 40 21 ds_reg_table <domain> <name> <arg1> <arg2> ...;
-#X text 37 62 registers table to state saving system;
-#X text 495 105 (c)2013 Marian Weger;
-#X obj 85 427 r /ds/\$1\$2/dispatched;
-#X obj 85 449 s /ds/\$1/dispatched;
-#X text 39 100 arguments: slave \, direct \, delay <time/s> \, noslave
-\, nodelay \, nochange \, occupy \, nooccupy \, resize \, noresize
-;
-#X text 278 497 dynamisch!!!;
-#X obj 631 172 ds_route /ds/\$1\$2/name;
-#N canvas 760 269 450 300 route 0;
-#X obj 67 162 ds_route /ds/\$1\$2/name_prepend;
-#X obj 67 182 ds_route /ds/\$1\$2/name_append;
-#X restore 59 335 pd route;
-#X connect 5 0 6 0;
-#X connect 6 0 3 0;
-#X connect 6 1 7 0;
-#X connect 8 0 1 0;
-#X connect 9 0 10 0;
-#X connect 15 0 16 0;

+ 86 - 78
ds_scheduler.pd

@@ -1,4 +1,4 @@
-#N canvas 440 71 279 283 10;
+#N canvas 75 274 279 283 10;
 #X text 32 263 (c)2013 Marian Weger;
 #N canvas 0 22 454 379 elapsed_time 0;
 #X obj 95 53 / 1000;
@@ -104,7 +104,7 @@
 #X obj 463 68 r /ds/\$1/pause;
 #X msg 261 124 1;
 #X obj 261 304 metro 1;
-#X msg 15 407 0;
+#X msg 15 497 0;
 #X obj 261 466 f;
 #X obj 366 466 + 1;
 #X obj 463 234 s /ds/\$1/transition/stop;
@@ -140,13 +140,17 @@
 #X obj 463 281 t f b;
 #X obj 572 692 s \$0-counter-reset;
 #X obj 579 598 s \$0-counter-reset;
-#X obj 15 385 r \$0-counter-reset;
-#X obj 15 355 s \$0-counter-reset;
+#X obj 15 475 r \$0-counter-reset;
+#X obj 15 445 s \$0-counter-reset;
 #X obj 261 266 f;
 #X obj 490 598 spigot;
 #X obj 60 68 r /ds/\$1/transition/busy;
 #X obj 463 199 spigot 0;
 #X obj 508 173 r /ds/\$1/transition/busy;
+#X obj 25 343 r /ds/\$1/scene/current/prev;
+#X obj 35 363 r /ds/\$1/scene/current/next;
+#X obj 15 423 b;
+#X obj 45 383 r /ds/\$1/scene/current;
 #X connect 0 0 36 0;
 #X connect 1 0 14 0;
 #X connect 2 0 42 0;
@@ -172,7 +176,7 @@
 #X connect 19 0 43 1;
 #X connect 19 1 8 1;
 #X connect 20 0 43 1;
-#X connect 21 0 41 0;
+#X connect 21 0 49 0;
 #X connect 22 0 23 0;
 #X connect 23 0 10 0;
 #X connect 24 0 29 0;
@@ -207,18 +211,22 @@
 #X connect 44 0 13 1;
 #X connect 45 0 7 0;
 #X connect 46 0 45 1;
+#X connect 47 0 49 0;
+#X connect 48 0 49 0;
+#X connect 49 0 41 0;
+#X connect 50 0 49 0;
 #X coords 0 671 1 670 85 60 0;
 #X restore 53 90 pd counter_logic;
-#N canvas 98 22 573 616 forward_and_backward 1;
-#X obj 52 27 r /ds/\$1/forward;
+#N canvas 98 22 573 616 forward_and_backward 0;
+#X obj 69 27 r /ds/\$1/forward;
 #X obj 301 66 r /ds/\$1/backward;
-#X obj 318 230 s /ds/\$1/scene/current/prev;
+#X obj 301 230 s /ds/\$1/scene/current/prev;
 #X obj 69 433 s /ds/\$1/scene/current/next;
-#X obj 318 188 kdemux2;
-#X obj 357 210 s /ds/\$1/recall;
-#X obj 357 160 > 0;
-#X obj 357 138 r /ds/\$1/timer/elapsed/raw/ms;
-#X obj 52 49 b;
+#X obj 301 188 kdemux2;
+#X obj 340 210 s /ds/\$1/recall;
+#X obj 340 160 > 0;
+#X obj 340 138 r /ds/\$1/timer/elapsed/raw/ms;
+#X obj 69 49 b;
 #X obj 301 94 b;
 #X connect 0 0 8 0;
 #X connect 1 0 9 0;
@@ -283,7 +291,6 @@
 #X obj 181 375 + 30;
 #X obj 181 326 + 1;
 #X msg 266 252 0;
-#X obj 132 290 v \$0-module-counter;
 #X obj 74 97 r \$0-module-loader;
 #X obj 467 574 s pd-\$0-modules;
 #X obj 93 252 t a a b;
@@ -299,32 +306,33 @@
 #X obj 112 433 list append 0 0 0 0 0 0 0 0 0;
 #X msg 139 493 obj 30 \$1 ds_scheduler_\$2 \$3 \$4 \$5 \$6 \$7 \$8
 \$9;
-#X connect 0 0 7 0;
+#X obj 132 300 f;
+#X connect 0 0 6 0;
 #X connect 1 0 2 0;
-#X connect 2 0 9 1;
+#X connect 2 0 8 1;
 #X connect 3 0 1 0;
-#X connect 3 0 5 0;
-#X connect 4 0 5 0;
-#X connect 5 0 3 0;
-#X connect 6 0 16 0;
-#X connect 8 1 9 0;
-#X connect 8 2 5 0;
-#X connect 9 0 18 0;
-#X connect 10 0 11 0;
-#X connect 10 1 19 0;
-#X connect 11 0 7 0;
+#X connect 3 0 19 1;
+#X connect 4 0 19 1;
+#X connect 5 0 15 0;
+#X connect 7 1 8 0;
+#X connect 7 2 19 0;
+#X connect 8 0 17 0;
+#X connect 9 0 10 0;
+#X connect 9 1 18 0;
+#X connect 10 0 6 0;
+#X connect 11 0 13 0;
+#X connect 11 1 4 0;
+#X connect 11 1 0 0;
+#X connect 11 2 12 0;
 #X connect 12 0 14 0;
-#X connect 12 1 4 0;
-#X connect 12 1 0 0;
-#X connect 12 2 13 0;
-#X connect 13 0 15 0;
-#X connect 14 0 15 0;
-#X connect 16 0 14 0;
-#X connect 16 1 8 0;
-#X connect 16 2 13 0;
-#X connect 17 0 12 0;
-#X connect 18 0 10 0;
-#X connect 19 0 7 0;
+#X connect 13 0 14 0;
+#X connect 15 0 13 0;
+#X connect 15 1 7 0;
+#X connect 15 2 12 0;
+#X connect 16 0 11 0;
+#X connect 17 0 9 0;
+#X connect 18 0 6 0;
+#X connect 19 0 3 0;
 #X restore 179 250 pd MODULE_LOADER;
 #X obj 145 78 t b b b;
 #X connect 0 0 5 0;
@@ -334,58 +342,58 @@
 #X connect 5 2 2 0;
 #X restore 53 50 pd init;
 #N canvas 59 192 738 517 current_scene_name_&_duration 0;
-#X obj 301 254 sel 1 0;
-#X obj 320 297 symbol;
-#X obj 241 163 moses;
+#X obj 321 244 sel 1 0;
+#X obj 340 297 symbol;
+#X obj 253 163 moses;
 #X obj 521 232 b;
-#X obj 253 318 f;
-#X obj 241 195 t f f;
-#X msg 70 174 0;
-#X msg 37 174 1;
-#X obj 222 83 t b f b;
-#X obj 301 232 ds_slot-status-request \$1;
+#X obj 253 195 t f f;
+#X msg 82 174 0;
+#X msg 49 174 1;
+#X obj 234 83 t b f b;
+#X obj 286 222 ds_slot-status-request \$1;
 #X obj 253 474 s;
-#X obj 268 117 r /ds/\$1/scene/maximum;
-#X obj 268 139 + 1;
+#X obj 280 117 r /ds/\$1/scene/maximum;
+#X obj 280 139 + 1;
 #X msg 521 297 0;
 #X msg 253 360 \$1 name \, \$1 duration;
 #X obj 253 412 t a a;
-#X obj 222 61 r /ds/\$1/scene/current;
-#X obj 37 206 s /ds/\$1/scene/current/lock;
+#X obj 234 61 r /ds/\$1/scene/current;
+#X obj 49 206 s /ds/\$1/scene/current/lock;
 #X obj 521 318 s /ds/\$1/scene/current/duration;
-#X obj 320 318 s /ds/\$1/scene/current/name;
+#X obj 340 318 s /ds/\$1/scene/current/name;
 #X obj 253 390 list prepend \$1;
 #X msg 345 442 symbol /ds/\$1/scene/\$2/\$3/route;
 #X msg 187 442 /ds/\$1/scene/current/\$3;
-#X obj 37 149 del 1;
-#X connect 0 0 4 0;
+#X obj 49 149 del 1;
+#X obj 253 318 spigot;
 #X connect 0 1 1 0;
-#X connect 0 1 13 0;
-#X connect 1 0 19 0;
-#X connect 2 0 5 0;
+#X connect 0 1 12 0;
+#X connect 1 0 18 0;
+#X connect 2 0 4 0;
 #X connect 2 1 3 0;
 #X connect 3 0 1 0;
-#X connect 3 0 13 0;
-#X connect 4 0 14 0;
-#X connect 5 0 9 0;
-#X connect 5 1 4 1;
-#X connect 6 0 17 0;
-#X connect 7 0 17 0;
-#X connect 8 0 23 0;
-#X connect 8 1 2 0;
-#X connect 8 2 6 0;
-#X connect 9 0 0 0;
-#X connect 11 0 12 0;
-#X connect 12 0 2 1;
-#X connect 13 0 18 0;
-#X connect 14 0 20 0;
-#X connect 15 0 22 0;
-#X connect 15 1 21 0;
-#X connect 16 0 8 0;
-#X connect 20 0 15 0;
-#X connect 21 0 10 1;
-#X connect 22 0 10 0;
-#X connect 23 0 7 0;
+#X connect 3 0 12 0;
+#X connect 4 0 23 0;
+#X connect 4 1 8 0;
+#X connect 5 0 16 0;
+#X connect 6 0 16 0;
+#X connect 7 0 22 0;
+#X connect 7 1 2 0;
+#X connect 7 2 5 0;
+#X connect 8 0 0 0;
+#X connect 8 0 23 1;
+#X connect 10 0 11 0;
+#X connect 11 0 2 1;
+#X connect 12 0 17 0;
+#X connect 13 0 19 0;
+#X connect 14 0 21 0;
+#X connect 14 1 20 0;
+#X connect 15 0 7 0;
+#X connect 19 0 14 0;
+#X connect 20 0 9 1;
+#X connect 21 0 9 0;
+#X connect 22 0 6 0;
+#X connect 23 0 13 0;
 #X restore 53 210 pd current_scene_name_&_duration;
 #N canvas 452 305 545 318 playing 0;
 #X obj 99 51 r /ds/\$1/play;
@@ -403,5 +411,5 @@
 #X connect 5 0 6 0;
 #X restore 53 190 pd playing;
 #N canvas 0 22 450 300 \$0-modules 0;
-#X obj 30 50 ds_scheduler_osc domain oscdomain 0 0 0 0 0;
+#X obj 30 9630 ds_scheduler_osc domain oscdomain 0 0 0 0 0;
 #X restore 53 230 pd \$0-modules;

+ 57 - 80
ds_scheduler_gui.pd

@@ -23,15 +23,15 @@
 #X obj 101 115 cnv 20 307 240 empty empty empty 20 12 0 14 -228856
 -66577 0;
 #X obj 100 117 vradio 14 1 0 12 \$0-cursor-set \$0-cursor empty 0 -8
-0 10 -176107 -1 -1 2;
+0 10 -176107 -1 -1 1;
 #X obj 380 117 vradio 14 1 0 12 \$0-selected-set \$0-selected empty
-0 -8 0 10 -260454 -1 -1 2;
+0 -8 0 10 -260454 -1 -1 1;
 #X obj 101 272 cnv 13 14 13 empty empty empty 20 12 0 14 -228856 -66577
 0;
 #X obj 101 117 cnv 13 14 13 empty empty empty 20 12 0 14 -228856 -66577
 0;
 #X obj 114 277 nbx 3 14 -1e+37 1e+37 0 0 \$0-scene-set \$0-scene empty
-0 -8 0 10 -204786 -1 -1 1 256;
+0 -8 0 10 -204786 -1 -1 0 256;
 #X obj 380 272 cnv 13 14 13 empty empty empty 20 12 0 14 -228856 -66577
 0;
 #X obj 380 117 cnv 13 14 13 empty empty empty 20 12 0 14 -228856 -66577
@@ -226,54 +226,6 @@ resolution/ms 57 8 0 10 -262144 -1 -1 1 256;
 #X connect 18 0 13 0;
 #X connect 18 1 14 0;
 #X restore 433 185 pd SLIDER;
-#N canvas 0 22 450 300 COLOR_current_scene 0;
-#X obj 117 232 outlet;
-#X msg 117 196 color \$1 22 22;
-#X obj 117 82 r /ds/\$1/transition/busy;
-#X obj 117 104 sel 0 1;
-#N canvas 0 22 423 423 rgb2iemgui 0;
-#X obj 202 169 t b f;
-#X obj 156 227 +;
-#X obj 156 252 t b f;
-#X obj 156 283 +;
-#X obj 99 147 * -65536;
-#X obj 156 147 * -256;
-#X obj 202 147 * -1;
-#X obj 156 314 - 1;
-#X obj 156 336 outlet;
-#X obj 102 39 inlet;
-#X obj 102 83 pack 0 0 0;
-#X obj 192 39 inlet;
-#X obj 262 39 inlet;
-#X obj 102 105 unpack 0 0 0;
-#X connect 0 0 1 0;
-#X connect 0 1 1 1;
-#X connect 1 0 2 0;
-#X connect 2 0 3 0;
-#X connect 2 1 3 1;
-#X connect 3 0 7 0;
-#X connect 4 0 3 0;
-#X connect 5 0 1 0;
-#X connect 6 0 0 0;
-#X connect 7 0 8 0;
-#X connect 9 0 10 0;
-#X connect 10 0 13 0;
-#X connect 11 0 10 1;
-#X connect 12 0 10 2;
-#X connect 13 0 4 0;
-#X connect 13 1 5 0;
-#X connect 13 2 6 0;
-#X restore 117 168 pd rgb2iemgui;
-#X msg 117 136 170 255 170;
-#X msg 207 136 220 220 220;
-#X connect 1 0 0 0;
-#X connect 2 0 3 0;
-#X connect 3 0 5 0;
-#X connect 3 1 6 0;
-#X connect 4 0 1 0;
-#X connect 5 0 4 0;
-#X connect 6 0 4 0;
-#X restore 100 74 pd COLOR_current_scene;
 #N canvas 0 22 450 300 COLOR_selected_scene 0;
 #X obj 117 232 outlet;
 #X msg 117 196 color \$1 22 22;
@@ -371,33 +323,59 @@ resolution/ms 57 8 0 10 -262144 -1 -1 1 256;
 #X obj 114 229 ds_scheduler_gui_element \$1 7 \$0;
 #X obj 114 243 ds_scheduler_gui_element \$1 8 \$0;
 #X obj 114 257 ds_scheduler_gui_element \$1 9 \$0;
-#N canvas 0 22 450 300 COLOR_PLAY 0;
-#X obj 117 232 outlet;
-#X msg 217 156 13;
-#X msg 117 156 0;
-#X msg 117 196 color 22 2 \$1;
-#X obj 117 87 r /ds/\$1/playing;
-#X obj 117 109 sel 0 1;
-#X connect 1 0 3 0;
-#X connect 2 0 3 0;
-#X connect 3 0 0 0;
-#X connect 4 0 5 0;
-#X connect 5 0 2 0;
-#X connect 5 1 1 0;
+#N canvas 0 22 459 339 COLOR_PLAY 0;
+#X obj 117 322 outlet;
+#X msg 117 246 0;
+#X obj 117 47 r /ds/\$1/playing;
+#X obj 117 179 sel 0 1;
+#X obj 220 84 r /ds/\$1/transition/busy;
+#X msg 117 286 color 22 2 \$1;
+#X msg 217 286 color 15 2 13;
+#X obj 117 149 f;
+#X obj 208 205 kdemux2;
+#X msg 257 246 13;
+#X obj 220 106 t b f;
+#X msg 217 246 16;
+#X connect 1 0 5 0;
+#X connect 2 0 7 0;
+#X connect 3 0 1 0;
+#X connect 3 1 8 0;
+#X connect 4 0 10 0;
+#X connect 5 0 0 0;
+#X connect 6 0 0 0;
+#X connect 7 0 3 0;
+#X connect 8 0 11 0;
+#X connect 8 1 9 0;
+#X connect 9 0 5 0;
+#X connect 10 0 7 0;
+#X connect 10 1 8 1;
+#X connect 11 0 5 0;
 #X restore 343 54 pd COLOR_PLAY;
-#N canvas 142 357 450 300 COLOR_PAUSE 0;
-#X obj 117 232 outlet;
-#X msg 217 156 0;
-#X msg 117 156 16;
-#X msg 117 196 color 22 2 \$1;
-#X obj 117 84 r /ds/\$1/playing;
-#X obj 117 106 sel 0 1;
-#X connect 1 0 3 0;
-#X connect 2 0 3 0;
-#X connect 3 0 0 0;
-#X connect 4 0 5 0;
+#N canvas 142 357 545 369 COLOR_PAUSE 0;
+#X obj 121 314 outlet;
+#X obj 118 40 r /ds/\$1/playing;
+#X obj 118 172 sel 0 1;
+#X obj 221 77 r /ds/\$1/transition/busy;
+#X msg 118 279 color 22 2 \$1;
+#X obj 118 142 f;
+#X obj 209 198 kdemux2;
+#X msg 258 239 13;
+#X obj 221 99 t b f;
+#X msg 218 239 16;
+#X msg 136 230 0;
+#X connect 1 0 5 0;
+#X connect 2 0 6 0;
+#X connect 2 1 10 0;
+#X connect 3 0 8 0;
+#X connect 4 0 0 0;
 #X connect 5 0 2 0;
-#X connect 5 1 1 0;
+#X connect 6 0 9 0;
+#X connect 6 1 7 0;
+#X connect 7 0 4 0;
+#X connect 8 0 5 0;
+#X connect 8 1 6 1;
+#X connect 9 0 4 0;
+#X connect 10 0 4 0;
 #X restore 311 34 pd COLOR_PAUSE;
 #X floatatom 219 322 3 0 0 2 s /ds/#1/timer/elapsed/s #0-dummy;
 #X floatatom 219 336 3 0 0 0 - /ds/#1/timer/remaining/s #0-dummy;
@@ -408,8 +386,7 @@ resolution/ms 57 8 0 10 -262144 -1 -1 1 256;
 ;
 #X floatatom 167 322 4 0 0 2 h /ds/#1/timer/elapsed/h #0-dummy;
 #X floatatom 167 336 4 0 0 2 - /ds/#1/timer/remaining/h #0-dummy;
-#X connect 33 0 3 0;
-#X connect 34 0 4 0;
-#X connect 49 0 14 0;
-#X connect 50 0 15 0;
+#X connect 33 0 4 0;
+#X connect 48 0 14 0;
+#X connect 49 0 15 0;
 #X coords 0 -1 1 1 309 256 1 100 100;

+ 26 - 26
ds_transition.pd

@@ -70,13 +70,12 @@
 #X connect 14 1 8 0;
 #X connect 14 2 7 0;
 #X restore 170 199 pd FLAGS;
-#N canvas 660 22 611 540 MODULE_LOADER 0;
+#N canvas 655 79 611 540 MODULE_LOADER 0;
 #X msg 467 493 clear;
 #X obj 181 353 * 20;
 #X obj 181 375 + 30;
 #X obj 181 326 + 1;
 #X msg 266 252 0;
-#X obj 132 290 v \$0-module-counter;
 #X obj 74 97 r \$0-module-loader;
 #X obj 467 574 s pd-\$0-modules;
 #X obj 93 252 t a a b;
@@ -92,32 +91,33 @@
 #X obj 112 433 list append 0 0 0 0 0 0 0 0 0;
 #X msg 139 493 obj 30 \$1 ds_transition_\$2 \$3 \$4 \$5 \$6 \$7 \$8
 \$9;
-#X connect 0 0 7 0;
+#X obj 132 302 f;
+#X connect 0 0 6 0;
 #X connect 1 0 2 0;
-#X connect 2 0 9 1;
+#X connect 2 0 8 1;
 #X connect 3 0 1 0;
-#X connect 3 0 5 0;
-#X connect 4 0 5 0;
-#X connect 5 0 3 0;
-#X connect 6 0 16 0;
-#X connect 8 1 9 0;
-#X connect 8 2 5 0;
-#X connect 9 0 18 0;
-#X connect 10 0 11 0;
-#X connect 10 1 19 0;
-#X connect 11 0 7 0;
+#X connect 3 0 19 1;
+#X connect 4 0 19 1;
+#X connect 5 0 15 0;
+#X connect 7 1 8 0;
+#X connect 7 2 19 0;
+#X connect 8 0 17 0;
+#X connect 9 0 10 0;
+#X connect 9 1 18 0;
+#X connect 10 0 6 0;
+#X connect 11 0 13 0;
+#X connect 11 1 4 0;
+#X connect 11 1 0 0;
+#X connect 11 2 12 0;
 #X connect 12 0 14 0;
-#X connect 12 1 4 0;
-#X connect 12 1 0 0;
-#X connect 12 2 13 0;
-#X connect 13 0 15 0;
-#X connect 14 0 15 0;
-#X connect 16 0 14 0;
-#X connect 16 1 8 0;
-#X connect 16 2 13 0;
-#X connect 17 0 12 0;
-#X connect 18 0 10 0;
-#X connect 19 0 7 0;
+#X connect 13 0 14 0;
+#X connect 15 0 13 0;
+#X connect 15 1 7 0;
+#X connect 15 2 12 0;
+#X connect 16 0 11 0;
+#X connect 17 0 9 0;
+#X connect 18 0 6 0;
+#X connect 19 0 3 0;
 #X restore 187 175 pd MODULE_LOADER;
 #X obj 142 38 t b b b b;
 #X connect 0 0 8 0;
@@ -184,5 +184,5 @@
 #X connect 19 0 14 0;
 #X restore 56 151 pd transition_busy;
 #N canvas 0 22 450 300 \$0-modules 0;
-#X obj 30 50 ds_logic_osc domain oscdomain 0 0 0 0 0;
+#X obj 30 9630 ds_transition_osc domain oscdomain 0 0 0 0 0;
 #X restore 56 171 pd \$0-modules;

+ 10 - 10
osc2send-help.pd

@@ -1,26 +1,26 @@
 #N canvas 678 110 351 374 10;
 #X text 28 -59 osc2send;
 #X floatatom 42 25 5 0 0 0 - - -;
-#X msg 42 44 /bla/blub \$1;
 #X obj 42 86 osc2send;
 #X obj 42 135 r /bla/blub;
 #X floatatom 42 157 5 0 0 0 - - -;
-#X obj 149 24 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 169 24 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 149 135 r /pling/plong;
 #X obj 149 157 unpack f s;
 #X floatatom 149 179 5 0 0 0 - - -;
 #X symbolatom 206 179 10 0 0 0 - - -;
 #X text 49 233 (c)2011 Marian Weger;
-#X msg 149 44 /pling/plong \$1 #blip?\$1;
+#X msg 169 44 /pling/plong \$1 #blip?\$1;
 #X text 27 -32 takes osc style messages and routes them to the corresponding
 send/receive;
-#X connect 1 0 2 0;
-#X connect 2 0 3 0;
-#X connect 4 0 5 0;
-#X connect 6 0 12 0;
+#X msg 42 44 /bla/blub \$1;
+#X connect 1 0 13 0;
+#X connect 3 0 4 0;
+#X connect 5 0 11 0;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 8 0 9 0;
-#X connect 8 1 10 0;
-#X connect 12 0 3 0;
+#X connect 7 1 9 0;
+#X connect 11 0 2 0;
+#X connect 13 0 2 0;
 #X coords 0 374 1 373 85 60 0;

+ 15 - 19
osc2send.pd

@@ -1,24 +1,20 @@
-#N canvas 212 191 416 534 10;
-#X obj 102 392 s;
-#X obj 45 324 list;
-#X obj 45 346 list trim;
-#X obj 32 244 list split 1;
-#X text 28 91 osc2send;
-#X obj 90 284 t b s;
-#X text 27 128 routes them to the corresponding send;
-#X text 27 118 takes osc style messages and;
-#X text 121 173 example:;
-#X text 191 467 (c)2011 Marian Weger;
-#X obj 45 368 route bang;
-#X obj 32 202 inlet list;
-#X text 123 211 --> "1 two 3" is sent to "/bla/blub";
-#X text 123 191 inlet: "/bla/blub 1 two 3";
+#N canvas 212 191 358 391 10;
+#X obj 102 179 s;
+#X obj 45 111 list;
+#X obj 45 133 list trim;
+#X obj 32 31 list split 1;
+#X text 28 -52 osc2send;
+#X obj 90 71 t b s;
+#X text 170 37 (c)2011 Marian Weger;
+#X obj 45 155 route bang;
+#X obj 32 -11 inlet list;
+#X text 130 157 filter out empty messages;
 #X connect 1 0 2 0;
-#X connect 2 0 10 0;
+#X connect 2 0 7 0;
 #X connect 3 0 5 0;
 #X connect 3 1 1 1;
 #X connect 5 0 1 0;
 #X connect 5 1 0 1;
-#X connect 10 1 0 0;
-#X connect 11 0 3 0;
-#X coords 0 534 1 533 85 60 0;
+#X connect 7 1 0 0;
+#X connect 8 0 3 0;
+#X coords 0 391 1 390 85 60 0;

+ 1 - 1
testsavefile.txt

@@ -252,7 +252,7 @@
 ======================== SCENE 10 ========================
 # PROPERTIES
 /duration 0
-/name <unnamed>
+/name bla blub 1 2 3
 # SETTINGS
 /variable1/morph/timegrain 20
 /variable1/morph/curve/quality 0