removed stupid reset/delay kludge from frameclock and implemented a better way to handle frame jumping: it checkes whether the current frame is one different than the previous, otherwise it resets. I ported the fstablooper~ guts to fstabplay~ too

svn path=/trunk/externals/framesync/; revision=12791

1 files changed, 88 insertions, 59 deletions

diff --git a/fstabplay~.pd b/fstabplay~.pd
index 0ac4c53..fe927e8 100644
--- a/fstabplay~.pd
+++ b/fstabplay~.pd
@@ -1,15 +1,8 @@
-#N canvas 705 374 707 506 10;
+#N canvas 114 22 684 636 10;
 #X obj 301 4 inlet;
-#X obj 131 458 outlet~;
-#X obj 224 325 samplerate~;
-#X obj 204 120 / 1000;
-#X obj 224 348 *;
-#X obj 99 100 trigger bang float;
-#X obj 131 375 *;
-#X obj 131 397 pack float float;
-#X obj 224 376 + 100;
+#X obj 252 196 / 1000;
 #X obj 301 83 purepd/symbol_argument \$1;
-#X obj 222 30 loadbang;
+#X obj 202 30 loadbang;
 #X obj 504 11 inlet;
 #X text 544 8 frame # when to play;
 #X obj 504 82 purepd/float_argument \$2;
@@ -18,56 +11,92 @@
 #X obj 158 231 /;
 #X obj 158 251 int;
 #X obj 158 271 + 1;
-#X obj 131 353 -;
 #X obj 158 299 +;
-#X obj 194 458 outlet;
-#X text 240 458 bang when done;
-#X obj 131 431 tabplay~ \$1;
-#X msg 301 396 set \$1;
-#X obj 99 78 framesync/fps_ms;
-#X obj 222 50 trigger bang bang bang;
-#X obj 22 48 receive framesync/frameclock;
-#X text 19 31 current frame #;
-#X floatatom 101 204 0 0 0 0 - - -;
-#X floatatom 234 158 0 0 0 0 - - -;
-#X obj 234 427 pddp/print;
+#X obj 245 175 framesync/fps_ms;
+#X obj 22 88 receive framesync/frameclock;
+#X text 19 71 current frame #;
 #X text 342 3 array to play;
-#X obj 99 169 flatspace/arraysize;
+#X obj 138 149 flatspace/arraysize;
+#X obj 131 598 outlet~;
+#X obj 131 451 -;
+#X obj 273 598 outlet;
+#X obj 131 571 tabplay~ \$1;
+#X msg 301 526 set \$1;
+#X obj 237 407 samplerate~;
+#X obj 237 449 *;
+#X obj 131 487 *;
+#X obj 131 510 %;
+#X msg 212 520 stop;
+#N canvas 289 281 450 300 reset 0;
+#X obj 191 140 delay;
+#X obj 191 119 bang;
+#X obj 128 210 purepd/once;
+#X obj 221 119 + 1;
+#X obj 238 144 receive framesync/reset;
+#X obj 128 11 inlet;
+#X obj 221 11 inlet;
+#X obj 128 250 outlet;
+#X obj 242 250 outlet;
+#X obj 191 178 bang;
+#X obj 13 50 trigger 0 bang 0;
+#X obj 59 82 float;
+#X obj 91 116 -;
+#X text 118 50 if we skipped a frame \, reset;
+#X obj 91 137 select -1;
 #X connect 0 0 9 0;
-#X connect 2 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 16 1;
-#X connect 3 0 30 0;
-#X connect 4 0 6 1;
-#X connect 4 0 8 0;
+#X connect 1 0 0 0;
+#X connect 2 0 7 0;
+#X connect 3 0 0 1;
+#X connect 4 0 9 0;
 #X connect 5 0 2 0;
-#X connect 5 0 33 0;
-#X connect 5 1 3 0;
-#X connect 6 0 7 0;
-#X connect 7 0 23 0;
-#X connect 7 0 31 0;
-#X connect 8 0 7 1;
-#X connect 9 0 24 0;
-#X connect 9 0 33 1;
-#X connect 10 0 26 0;
-#X connect 11 0 13 0;
-#X connect 13 0 19 1;
-#X connect 13 0 14 1;
-#X connect 13 0 20 1;
-#X connect 14 1 15 0;
-#X connect 15 0 19 0;
-#X connect 16 0 17 0;
-#X connect 17 0 18 0;
-#X connect 18 0 20 0;
-#X connect 19 0 6 0;
-#X connect 20 0 15 1;
-#X connect 23 0 1 0;
-#X connect 23 1 21 0;
-#X connect 24 0 23 0;
-#X connect 25 0 5 0;
-#X connect 26 0 25 0;
-#X connect 26 1 9 0;
-#X connect 26 2 13 0;
-#X connect 27 0 14 0;
-#X connect 33 0 16 0;
-#X connect 33 0 29 0;
+#X connect 5 0 1 0;
+#X connect 5 0 10 0;
+#X connect 6 0 3 0;
+#X connect 9 0 2 1;
+#X connect 9 0 8 0;
+#X connect 10 0 11 1;
+#X connect 10 1 11 0;
+#X connect 10 2 12 1;
+#X connect 11 0 12 0;
+#X connect 12 0 14 0;
+#X connect 14 1 9 0;
+#X restore 131 352 pd reset delay;
+#X text 319 598 TODO bang when complated playing sample;
+#X obj 202 50 trigger bang bang bang bang;
+#X connect 0 0 2 0;
+#X connect 1 0 9 1;
+#X connect 1 0 24 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 3 0 30 0;
+#X connect 4 0 6 0;
+#X connect 6 0 7 1;
+#X connect 6 0 12 1;
+#X connect 6 0 19 1;
+#X connect 7 1 8 0;
+#X connect 8 0 28 0;
+#X connect 9 0 10 0;
+#X connect 10 0 11 0;
+#X connect 11 0 12 0;
+#X connect 12 0 8 1;
+#X connect 13 0 28 1;
+#X connect 13 0 1 0;
+#X connect 14 0 7 0;
+#X connect 17 0 9 0;
+#X connect 17 0 26 1;
+#X connect 19 0 25 0;
+#X connect 21 0 18 0;
+#X connect 21 1 20 0;
+#X connect 22 0 21 0;
+#X connect 23 0 24 0;
+#X connect 24 0 25 1;
+#X connect 25 0 26 0;
+#X connect 26 0 21 0;
+#X connect 27 0 21 0;
+#X connect 28 0 19 0;
+#X connect 28 1 27 0;
+#X connect 30 0 23 0;
+#X connect 30 1 17 0;
+#X connect 30 2 2 0;
+#X connect 30 2 13 0;
+#X connect 30 3 6 0;