added TODO to add the ability to set the current frame with the first inlet

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

2 files changed, 16 insertions, 11 deletions

diff --git a/frameclock-help.pd b/frameclock-help.pd
index 4005ae5..0e847c8 100644
--- a/frameclock-help.pd
+++ b/frameclock-help.pd
@@ -1,16 +1,19 @@
-#N canvas 496 163 487 404 10;
-#X floatatom 52 241 5 0 0 0 - - -;
+#N canvas 249 258 487 404 10;
+#X floatatom 52 321 5 0 0 0 - - -;
 #X text 51 22 a GUI to generate and control the frame clock \, with
 a default frames-per-second (FPS) of 30 frames/second.;
-#X floatatom 248 239 5 0 0 0 - - -;
+#X floatatom 248 319 5 0 0 0 - - -;
 #X text 49 72 the first argument/inlet sets the total number of frames
 ;
 #X text 49 92 the second argument/inlet sets the frames-per-second
 (FPS);
-#X text 54 306 you can set the current frame by dragging the yellow
+#X text 54 346 you can set the current frame by dragging the yellow
 bar or by clicking in the frame number box \, typing in a number \,
 and hitting enter;
-#X obj 53 169 fsclock 200;
-#X obj 249 167 fsclock 200 24;
-#X connect 6 0 0 0;
-#X connect 7 0 2 0;
+#X obj 249 247 frameclock 200 24;
+#X obj 154 142 frameclock 400;
+#X text 318 134 <-- set total frames;
+#X text 17 135 set current frame -->;
+#X obj 53 249 frameclock 200 29.97;
+#X connect 6 0 2 0;
+#X connect 10 0 0 0;
diff --git a/frameclock.pd b/frameclock.pd
index a432cdf..994e16d 100644
--- a/frameclock.pd
+++ b/frameclock.pd
@@ -8,7 +8,7 @@
 -4160 -258113;
 #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 100 256;
+empty 0 -8 0 16 -233017 -33289 -33289 67 256;
 #X obj 363 1 inlet;
 #N canvas 524 22 450 300 color 0;
 #X obj 161 16 inlet;
@@ -32,8 +32,8 @@ empty 0 -8 0 16 -233017 -33289 -33289 100 256;
 #X obj 433 19 loadbang;
 #X obj 433 39 trigger bang bang;
 #X obj 155 217 metro;
-#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 obj 123 139 hsl 154 8 0 400 0 0 \$0-hsl \$0-hsl-receive empty -2
+-8 0 10 -262130 -1 -1 2600 1;
 #X msg 371 88 range 0 \$1;
 #X obj 435 337 bang;
 #X msg 490 20 bang;
@@ -50,6 +50,8 @@ empty 0 -8 0 16 -233017 -33289 -33289 100 256;
 #X obj 28 198 send framesync/reset;
 #X obj 571 24 framesync/fps \$2;
 #X obj 555 64 framesync/fps_ms;
+#X obj 24 14 inlet;
+#X text 65 13 TODO make first inlet set frame position;
 #X connect 0 0 14 0;
 #X connect 1 1 10 0;
 #X connect 2 0 1 0;