fixed bug where it wouldn't output last frame number; made it use new [fps] object with no inlets/outlets

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

1 files changed, 40 insertions, 40 deletions

diff --git a/frameclock.pd b/frameclock.pd
index 8f1c422..a432cdf 100644
--- a/frameclock.pd
+++ b/frameclock.pd
@@ -1,14 +1,14 @@
-#N canvas 596 173 724 462 10;
+#N canvas 596 173 727 505 10;
 #X obj 155 147 tgl 35 0 \$0-tgl \$0-tgl-receive run 5 7 0 14 -233017
 -33289 -33289 0 1;
 #X obj 305 346 moses 0;
 #X obj 163 256 float;
-#X msg 160 49 0;
+#X msg 150 49 0;
 #X obj 120 147 bng 35 250 50 0 empty empty reset 4 17 0 10 -262144
 -4160 -258113;
-#X obj 344 426 outlet;
+#X obj 327 434 outlet;
 #X obj 190 147 nbx 5 35 -1 1e+37 0 0 \$0-numbox \$0-numbox-receive
-empty 0 -8 0 16 -233017 -33289 -33289 0 256;
+empty 0 -8 0 16 -233017 -33289 -33289 100 256;
 #X obj 363 1 inlet;
 #N canvas 524 22 450 300 color 0;
 #X obj 161 16 inlet;
@@ -25,21 +25,15 @@ empty 0 -8 0 16 -233017 -33289 -33289 0 256;
 #X connect 4 0 2 0;
 #X connect 5 0 2 0;
 #X connect 6 0 5 0;
-#X restore 526 369 pd color;
+#X restore 526 279 pd color;
 #X obj 363 64 purepd/float_argument \$1 1000;
 #X obj 344 366 moses;
-#X obj 551 113 /;
-#X msg 551 91 1 \$1;
 #X text 402 2 total frames;
-#X obj 551 3 inlet;
-#X text 593 4 frames per second;
 #X obj 433 19 loadbang;
 #X obj 433 39 trigger bang bang;
 #X obj 155 217 metro;
-#X obj 551 134 * 1000;
-#X floatatom 559 164 5 0 0 0 - - -;
-#X obj 123 139 hsl 154 8 0 200 0 0 \$0-hsl \$0-hsl-receive empty -2
--8 0 10 -262130 -1 -1 0 1;
+#X obj 123 139 hsl 154 8 0 100 0 0 \$0-hsl \$0-hsl-receive empty -2
+-8 0 10 -262130 -1 -1 15300 1;
 #X msg 371 88 range 0 \$1;
 #X obj 435 337 bang;
 #X msg 490 20 bang;
@@ -47,40 +41,46 @@ empty 0 -8 0 16 -233017 -33289 -33289 0 256;
 #X obj 190 50 receive \$0-hsl;
 #X obj 93 333 send \$0-hsl-receive;
 #X obj 190 97 int;
-#X obj 526 346 receive \$0-tgl;
-#X obj 526 392 send \$0-tgl-receive;
+#X obj 526 256 receive \$0-tgl;
+#X obj 526 302 send \$0-tgl-receive;
 #X msg 93 310 set \$1;
-#X obj 551 64 framesync/fps \$2;
-#X connect 0 0 18 0;
+#X obj 375 434 send framesync/frameclock;
+#X text 377 379 output the last frame# from the right outlet;
+#X msg 150 97 set 0;
+#X obj 28 198 send framesync/reset;
+#X obj 571 24 framesync/fps \$2;
+#X obj 555 64 framesync/fps_ms;
+#X connect 0 0 14 0;
 #X connect 1 1 10 0;
 #X connect 2 0 1 0;
-#X connect 2 0 31 0;
+#X connect 2 0 25 0;
+#X connect 3 0 22 0;
 #X connect 3 0 28 0;
 #X connect 4 0 3 0;
+#X connect 4 0 29 0;
 #X connect 6 0 2 1;
 #X connect 7 0 9 0;
-#X connect 8 0 30 0;
+#X connect 8 0 24 0;
 #X connect 9 0 10 1;
-#X connect 9 0 22 0;
+#X connect 9 0 16 0;
 #X connect 10 0 5 0;
-#X connect 10 0 25 0;
-#X connect 10 1 23 0;
-#X connect 11 0 19 0;
-#X connect 12 0 11 0;
-#X connect 14 0 32 0;
-#X connect 16 0 17 0;
-#X connect 17 0 9 0;
-#X connect 17 1 32 0;
-#X connect 18 0 2 0;
-#X connect 19 0 18 1;
-#X connect 19 0 20 0;
-#X connect 22 0 21 0;
-#X connect 23 0 0 0;
-#X connect 24 0 17 0;
-#X connect 25 0 28 0;
-#X connect 26 0 28 0;
-#X connect 28 0 6 0;
-#X connect 29 0 8 0;
-#X connect 31 0 27 0;
-#X connect 32 0 12 0;
+#X connect 10 0 19 0;
+#X connect 10 0 26 0;
+#X connect 10 1 17 0;
+#X connect 10 1 26 0;
+#X connect 10 1 5 0;
+#X connect 12 0 13 0;
+#X connect 13 0 9 0;
+#X connect 13 1 31 0;
+#X connect 14 0 2 0;
+#X connect 16 0 15 0;
+#X connect 17 0 0 0;
+#X connect 18 0 13 0;
+#X connect 19 0 22 0;
+#X connect 20 0 22 0;
+#X connect 22 0 6 0;
+#X connect 23 0 8 0;
+#X connect 25 0 21 0;
+#X connect 28 0 15 0;
+#X connect 31 0 14 1;
 #X coords 0 -1 1 1 159 62 1 120 120;