Browse Source

no unused slot-containers will get created

m---w 11 years ago
parent
commit
15070ff79d
6 changed files with 733 additions and 464 deletions
  1. 5 5
      _DS_TEST.pd
  2. 31 37
      ds_fetch.pd
  3. 454 328
      ds_logic.pd
  4. 55 77
      ds_scheduler.pd
  5. 23 6
      ds_slot-status-request.pd
  6. 165 11
      testsavefile.txt

+ 5 - 5
_DS_TEST.pd

@@ -1,4 +1,4 @@
-#N canvas 339 22 1075 737 10;
+#N canvas 405 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,13 +6,13 @@
 #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 0 1;
+-262144 -1 -1 12100 1;
 #X obj 75 655 vsl 15 128 0 127 0 0 /variable4 /variable4 4 0 -9 0 10
--262144 -1 -1 0 1;
+-262144 -1 -1 10900 1;
 #X obj 95 655 vsl 15 128 0 127 0 0 /variable5 /variable5 5 0 -9 0 10
--262144 -1 -1 0 1;
+-262144 -1 -1 9100 1;
 #X obj 115 655 vsl 15 128 0 127 0 0 /variable6 /variable6 6 0 -9 0
-10 -262144 -1 -1 0 1;
+10 -262144 -1 -1 11800 1;
 #X obj 171 557 r /variable2;
 #X symbolatom 171 609 10 0 0 0 - - -;
 #X obj 318 461 r /variable1;

+ 31 - 37
ds_fetch.pd

@@ -16,10 +16,6 @@
 #X text 454 412 global route;
 #X text 464 434 local route;
 #X obj 51 357 list;
-#X obj 352 512 r /ds/\$1/morph/time;
-#X text 477 510 global morph time;
-#X text 478 531 local morph time;
-#X obj 352 534 s /ds/\$1\$2/morph/time;
 #X obj 51 379 list trim;
 #X obj 51 59 r /ds/\$1/fetch/data;
 #X text 39 41 fetch data to storage;
@@ -32,7 +28,6 @@
 #X obj 132 443 kdemux2;
 #X obj 51 91 b;
 #X obj 51 115 kdemux2;
-#X text 331 490 not needed anymore???:;
 #X obj 352 324 b;
 #X obj 352 217 r /ds/\$1/resend;
 #X obj 352 241 s /ds/\$1\$2/resend;
@@ -55,40 +50,39 @@
 #X connect 2 0 1 0;
 #X connect 3 0 16 0;
 #X connect 3 1 4 0;
-#X connect 4 0 30 1;
-#X connect 5 0 30 1;
-#X connect 6 0 25 0;
-#X connect 6 1 30 0;
-#X connect 6 2 30 0;
+#X connect 4 0 26 1;
+#X connect 5 0 26 1;
+#X connect 6 0 21 0;
+#X connect 6 1 26 0;
+#X connect 6 2 26 0;
 #X connect 7 0 8 0;
 #X connect 9 0 16 0;
 #X connect 9 1 5 0;
 #X connect 9 2 8 1;
-#X connect 10 0 38 0;
-#X connect 16 0 21 0;
-#X connect 17 0 20 0;
-#X connect 21 0 6 0;
-#X connect 22 0 31 0;
-#X connect 24 0 43 0;
-#X connect 25 0 26 0;
-#X connect 26 0 27 0;
-#X connect 26 1 28 0;
-#X connect 27 0 7 0;
-#X connect 28 0 25 1;
-#X connect 29 0 25 1;
-#X connect 30 0 2 0;
-#X connect 30 1 7 0;
-#X connect 31 0 32 0;
-#X connect 32 0 3 0;
-#X connect 32 1 51 0;
-#X connect 34 0 10 0;
+#X connect 10 0 33 0;
+#X connect 16 0 17 0;
+#X connect 17 0 6 0;
+#X connect 18 0 27 0;
+#X connect 20 0 38 0;
+#X connect 21 0 22 0;
+#X connect 22 0 23 0;
+#X connect 22 1 24 0;
+#X connect 23 0 7 0;
+#X connect 24 0 21 1;
+#X connect 25 0 21 1;
+#X connect 26 0 2 0;
+#X connect 26 1 7 0;
+#X connect 27 0 28 0;
+#X connect 28 0 3 0;
+#X connect 28 1 46 0;
+#X connect 29 0 10 0;
+#X connect 30 0 31 0;
+#X connect 32 0 29 0;
 #X connect 35 0 36 0;
-#X connect 37 0 34 0;
-#X connect 40 0 41 0;
-#X connect 42 0 9 0;
-#X connect 43 0 47 0;
-#X connect 43 1 29 0;
-#X connect 47 0 39 0;
-#X connect 48 0 32 1;
-#X connect 49 0 50 0;
-#X connect 51 0 49 0;
+#X connect 37 0 9 0;
+#X connect 38 0 42 0;
+#X connect 38 1 25 0;
+#X connect 42 0 34 0;
+#X connect 43 0 28 1;
+#X connect 44 0 45 0;
+#X connect 46 0 44 0;

File diff suppressed because it is too large
+ 454 - 328
ds_logic.pd


+ 55 - 77
ds_scheduler.pd

@@ -99,52 +99,54 @@
 #X connect 6 0 7 0;
 #X connect 7 0 1 1;
 #X restore 53 130 pd elapsed-to-remaining-time;
-#N canvas 492 22 793 671 counter_logic 0;
+#N canvas 379 22 793 671 counter_logic 0;
 #X obj 242 68 r /ds/\$1/play;
 #X obj 463 68 r /ds/\$1/pause;
 #X msg 261 124 1;
-#X obj 261 234 metro 1;
-#X msg 15 337 0;
-#X obj 261 396 f;
-#X obj 366 396 + 1;
-#X obj 463 164 s /ds/\$1/transition/stop;
-#X obj 545 555 >=;
-#X obj 545 577 sel 1;
-#X obj 579 440 sel 0;
-#X obj 545 646 s /ds/\$1/scene/current/next;
-#X obj 15 217 s /ds/\$1/transition/resume;
-#X obj 15 194 spigot 0;
+#X obj 261 304 metro 1;
+#X msg 15 407 0;
+#X obj 261 466 f;
+#X obj 366 466 + 1;
+#X obj 463 234 s /ds/\$1/transition/stop;
+#X obj 545 625 >=;
+#X obj 545 647 sel 1;
+#X obj 579 510 sel 0;
+#X obj 545 716 s /ds/\$1/scene/current/next;
+#X obj 15 287 s /ds/\$1/transition/resume;
+#X obj 15 264 spigot 0;
 #X obj 463 90 t b b;
 #X msg 490 124 0;
-#X obj 579 475 t b b;
-#X obj 545 599 t b b;
-#X obj 261 646 s /ds/\$1/timer/elapsed/raw/ms;
-#X obj 533 475 t f f;
-#X msg 606 498 0;
-#X obj 15 253 r /ds/\$1/recall;
-#X obj 579 360 r /ds/\$1/scene/current/duration;
-#X obj 579 382 * 1000;
+#X obj 579 545 t b b;
+#X obj 545 669 t b b;
+#X obj 261 716 s /ds/\$1/timer/elapsed/raw/ms;
+#X obj 533 545 t f f;
+#X msg 606 568 0;
+#X obj 15 323 r /ds/\$1/recall;
+#X obj 579 430 r /ds/\$1/scene/current/duration;
+#X obj 579 452 * 1000;
 #X obj 332 68 r /ds/\$1/resolution;
-#X obj 261 478 * 1;
-#X obj 366 358 *;
-#X msg 366 312 1 \$1;
-#X obj 366 334 /;
+#X obj 261 548 * 1;
+#X obj 366 428 *;
+#X msg 366 382 1 \$1;
+#X obj 366 404 /;
 #X obj 332 90 t b f f f;
-#X obj 463 189 r /ds/\$1/timebase;
-#X obj 490 360 realtime;
-#X obj 490 440 +;
-#X obj 490 475 t f f;
-#X obj 508 316 t b b;
-#X obj 261 263 kdemux2;
+#X obj 463 259 r /ds/\$1/timebase;
+#X obj 490 430 realtime;
+#X obj 490 510 +;
+#X obj 490 545 t f f;
+#X obj 508 386 t b b;
+#X obj 261 333 kdemux2;
 #X obj 242 90 t b b b;
-#X obj 463 211 t f b;
-#X obj 572 622 s \$0-counter-reset;
-#X obj 579 528 s \$0-counter-reset;
-#X obj 15 315 r \$0-counter-reset;
-#X obj 15 285 s \$0-counter-reset;
-#X obj 261 196 f;
-#X obj 490 528 spigot;
+#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 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 connect 0 0 36 0;
 #X connect 1 0 14 0;
 #X connect 2 0 42 0;
@@ -160,7 +162,7 @@
 #X connect 10 0 16 0;
 #X connect 10 1 19 0;
 #X connect 13 0 12 0;
-#X connect 14 0 7 0;
+#X connect 14 0 45 0;
 #X connect 14 1 15 0;
 #X connect 15 0 42 0;
 #X connect 16 0 39 0;
@@ -203,53 +205,29 @@
 #X connect 42 0 3 0;
 #X connect 43 0 8 0;
 #X connect 44 0 13 1;
+#X connect 45 0 7 0;
+#X connect 46 0 45 1;
 #X coords 0 671 1 670 85 60 0;
 #X restore 53 90 pd counter_logic;
-#N canvas 282 22 520 604 forward_and_backward 0;
+#N canvas 98 22 573 616 forward_and_backward 1;
 #X obj 52 27 r /ds/\$1/forward;
-#X obj 151 247 f;
-#X obj 90 278 f;
-#X msg 105 189 0;
-#X obj 90 350 s /ds/\$1/transition/state;
-#X obj 120 446 s /ds/\$1/recall;
 #X obj 301 66 r /ds/\$1/backward;
 #X obj 318 230 s /ds/\$1/scene/current/prev;
-#X obj 117 322 s /ds/\$1/transition/stop;
-#X obj 90 300 t f b;
-#X obj 120 391 r /ds/\$1/transition/busy;
-#X obj 69 473 s /ds/\$1/scene/current/next;
-#X obj 69 418 kdemux2 0;
+#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 text 263 354 ???;
-#X obj 52 49 t b b b b;
-#X obj 301 94 t b b b b;
-#X obj 166 27 r /ds/\$1/transition/busy;
-#X text 327 28 ???;
-#X connect 0 0 18 0;
-#X connect 1 0 2 1;
-#X connect 2 0 9 0;
-#X connect 3 0 2 1;
-#X connect 6 0 19 0;
-#X connect 9 1 8 0;
-#X connect 10 0 12 1;
-#X connect 12 0 11 0;
-#X connect 12 1 5 0;
-#X connect 13 0 7 0;
-#X connect 13 1 14 0;
-#X connect 15 0 13 1;
-#X connect 16 0 15 0;
-#X connect 18 0 2 0;
-#X connect 18 1 12 0;
-#X connect 18 2 3 0;
-#X connect 18 3 1 0;
-#X connect 19 0 2 0;
-#X connect 19 1 13 0;
-#X connect 19 2 3 0;
-#X connect 19 3 1 0;
-#X connect 20 0 1 1;
+#X obj 52 49 b;
+#X obj 301 94 b;
+#X connect 0 0 8 0;
+#X connect 1 0 9 0;
+#X connect 4 0 2 0;
+#X connect 4 1 5 0;
+#X connect 6 0 4 1;
+#X connect 7 0 6 0;
+#X connect 8 0 3 0;
+#X connect 9 0 4 0;
 #X restore 53 110 pd forward_and_backward;
 #X text 29 18 ds_scheduler <domain>;
 #N canvas 0 22 450 300 register 0;
@@ -425,5 +403,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_logic_osc domain oscdomain 0 0 0 0 0;
+#X obj 30 50 ds_scheduler_osc domain oscdomain 0 0 0 0 0;
 #X restore 53 230 pd \$0-modules;

+ 23 - 6
ds_slot-status-request.pd

@@ -1,28 +1,45 @@
-#N canvas 173 22 532 524 10;
+#N canvas 423 22 540 594 10;
 #X msg 36 278 0;
 #X obj 84 278 s;
 #X obj 67 107 t b b f b;
-#X msg 82 328 1;
-#X obj 67 367 f 0;
-#X obj 67 399 outlet slot-status;
+#X msg 82 398 1;
+#X obj 67 437 f 0;
+#X obj 67 469 outlet slot-status;
 #X obj 67 84 inlet slot-id;
-#X text 88 466 (c)2013 Marian Weger;
+#X text 88 536 (c)2013 Marian Weger;
 #X obj 291 210 list prepend \$1;
 #X msg 291 232 symbol /ds/\$1/slot/\$2/status/request;
 #X text 26 22 ds/slot-status-request <domain>;
 #X obj 82 306 r \$0-slot-status-answer;
 #X obj 84 210 f \$0;
 #X msg 84 232 symbol \$1-slot-status-answer;
+#X obj 82 348 f;
+#X obj 117 348 + 1;
+#X obj 82 370 sel 0;
+#X obj 206 425 list prepend slot;
+#X obj 206 402 list prepend has;
+#X obj 206 447 list append duplicates!;
+#X obj 206 469 print /ds/\$1/print/errors;
 #X connect 0 0 4 1;
+#X connect 0 0 14 1;
 #X connect 2 0 4 0;
 #X connect 2 1 12 0;
 #X connect 2 2 8 0;
+#X connect 2 2 17 1;
 #X connect 2 3 0 0;
 #X connect 3 0 4 1;
 #X connect 4 0 5 0;
 #X connect 6 0 2 0;
 #X connect 8 0 9 0;
 #X connect 9 0 1 1;
-#X connect 11 0 3 0;
+#X connect 11 0 14 0;
 #X connect 12 0 13 0;
 #X connect 13 0 1 0;
+#X connect 14 0 15 0;
+#X connect 14 0 16 0;
+#X connect 15 0 14 1;
+#X connect 16 0 3 0;
+#X connect 16 1 18 0;
+#X connect 17 0 19 0;
+#X connect 18 0 17 0;
+#X connect 19 0 20 0;

File diff suppressed because it is too large
+ 165 - 11
testsavefile.txt