svn path=/trunk/abstractions/jmmmp/; revision=11872

3 files changed, 23 insertions, 21 deletions

diff --git a/clock-help.pd b/clock-help.pd
index 02a926b..37063bc 100644
--- a/clock-help.pd
+++ b/clock-help.pd
@@ -10,9 +10,9 @@
 #X text 260 50 Inlets;

 #X text 260 70 - On / Off;

 #X text 260 120 Outlets;

-#X text 260 190 - On / Off;

-#X text 260 210 - Reset;

-#X text 260 170 GUI;

+#X text 260 210 - On / Off;

+#X text 260 230 - Reset;

+#X text 260 190 GUI;

 #X text 260 90 - Set / Reset;

 #X text 117 99 Set + Reset;

 #X obj 26 139 clock;

@@ -22,6 +22,7 @@
 #X text 64 169 Seconds;

 #X text 260 140 - Second count (Float);

 #X text 12 247 Related objects: [stoppuhr] [uhr];

+#X text 260 159 - GUI output;

 #X connect 1 0 15 0;

 #X connect 2 0 15 1;

 #X connect 3 0 15 1;

diff --git a/clock.pd b/clock.pd
index e473f33..a8bf822 100644
--- a/clock.pd
+++ b/clock.pd
@@ -56,18 +56,17 @@
 #X restore 104 194 pd inside;

 #X msg 162 174 reset;

 #X obj 104 154 metro 1000;

-#X obj 10 100 cnv 15 62 20 empty \$0clock 0:03 5 11 0 14 -99865 -233017

+#X obj 10 100 cnv 15 62 20 empty \$0clock 1:35 5 11 0 14 -99865 -233017

 0;

-#X msg 162 214 label \$1;

-#X obj 162 234 s \$0clock;

+#X msg 202 214 label \$1;

+#X obj 202 234 s \$0clock;

 #X obj 138 80 route float;

-#X obj 73 100 tgl 10 0 empty empty empty 0 -6 0 8 -195568 -1 -1 0 1

+#X obj 73 100 tgl 10 0 empty empty empty 0 -6 0 8 -195568 -1 -1 1 1

 ;

 #X obj 73 110 bng 10 250 50 0 empty empty empty 0 -6 0 8 -195568 -1

 -1;

 #X msg 73 80 set \$1;

-#X text 12 267 (C) 2006 João Pais - jmmmpais@googlemail.com

-;

+#X text 12 267 (C) 2006 João Pais - jmmmpais@googlemail.com;

 #X obj 73 124 t b 0 b;

 #X text 12 4 [clock] - Chronometer with display in seconds;

 #N canvas 0 0 426 446 license 0;

@@ -99,16 +98,19 @@ in the documentation and/or other materials provided with the distribution.
 #X text 270 50 Inlets;

 #X text 270 70 - On / Off;

 #X text 270 120 Outlets;

-#X text 270 190 - On / Off;

-#X text 270 210 - Reset;

-#X text 270 170 GUI;

+#X text 270 210 - On / Off;

+#X text 270 230 - Reset;

+#X text 270 190 GUI;

 #X text 270 90 - Set / Reset;

 #X text 270 140 - Second count (Float);

+#X obj 155 234 outlet;

+#X text 270 160 - GUI output;

 #X connect 0 0 9 0;

 #X connect 1 0 5 0;

 #X connect 1 0 12 0;

 #X connect 3 0 2 0;

 #X connect 3 1 7 0;

+#X connect 3 1 25 0;

 #X connect 4 0 3 2;

 #X connect 5 0 3 0;

 #X connect 7 0 8 0;

diff --git a/oscD.pd b/oscD.pd
index 176d2d8..a2986f0 100644
--- a/oscD.pd
+++ b/oscD.pd
@@ -4,15 +4,13 @@
 #X obj 98 121 outlet;

 #X obj 88 101 dumpOSC \$1;

 #X obj 28 131 nbx 3 13 -1e+037 1e+037 0 0 empty empty empty 0 -6 0

-10 -233017 -1 -1 0 256;

+10 -233017 -1 -1 670 256;

 #X obj 12 171 mod 1000;

 #X obj 66 131 tgl 13 0 empty empty empty 0 -6 0 8 -233017 -1 -1 0 1

 ;

 #X obj 88 151 spigot;

-#X obj 88 171 print oscD;

 #X obj 12 151 f+ 1;

-#X text 12 251 (C) 2006 João Pais - jmmmpais@googlemail.com

-;

+#X text 12 251 (C) 2006 João Pais - jmmmpais@googlemail.com;

 #N canvas 0 0 426 446 license 0;

 #X text 8 47 All rights reserved.;

 #X text 8 227 The names of its contributors may not be used to endorse

@@ -51,14 +49,15 @@ in the documentation and/or other materials provided with the distribution.
 #X obj 66 61 loadbang;

 #X obj 66 81 \$2;

 #X text 196 80 - Printing on / off;

-#X connect 0 0 8 0;

+#X obj 88 171 print oscD \$1;

+#X connect 0 0 7 0;

 #X connect 2 0 1 0;

 #X connect 2 0 0 0;

 #X connect 2 0 6 0;

 #X connect 4 0 3 0;

 #X connect 5 0 6 1;

-#X connect 6 0 7 0;

-#X connect 8 0 4 0;

-#X connect 20 0 21 0;

-#X connect 21 0 5 0;

+#X connect 6 0 22 0;

+#X connect 7 0 4 0;

+#X connect 19 0 20 0;

+#X connect 20 0 5 0;

 #X coords 0 -1 1 1 72 30 1 10 116;