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

3 files changed, 77 insertions, 54 deletions

diff --git a/m-i.pd b/m-i.pd
index 179ec84..246e169 100644
--- a/m-i.pd
+++ b/m-i.pd
@@ -1,16 +1,15 @@
-#N canvas 393 81 445 319 10;

+#N canvas 393 81 487 319 10;

 #X obj 19 135 outlet;

 #X obj 19 54 ctlin \$1;

 #X obj 99 54 inlet midi-sim;

 #X obj 136 104 hsl 50 8 0 127 0 0 empty empty empty -2 -6 0 8 -233017

--1 -1 0 0;

+-1 -1 600 0;

 #X msg 133 83 set \$1;

 #X text 12 10 [m-i] - Automatic conversion of MIDI controller;

 #X text 236 150 Inlets;

 #X text 236 200 Outlets;

 #X text 236 40 Arguments;

 #X text 236 80 - Lower range;

-#X text 236 170 - Controller simulation;

 #X text 236 220 - Scaled float;

 #X text 236 100 - Upper range;

 #N canvas 0 0 426 446 license 0;

@@ -45,21 +44,22 @@ in the documentation and/or other materials provided with the distribution.
 #X obj 133 145 i;

 #X obj 99 225 ctlout \$1;

 #X obj 99 205 spigot \$4;

-#X text 235 120 - MIDI feedback on/off (1/0);

+#X text 235 121 - MIDI feedback on/off (1/0);

 #X text 236 60 - Controller channel;

 #X text 12 271 (C) 2009 João Pais - jmmmpais@googlemail.com;

+#X text 236 170 - Controller simulation (0-127);

 #X connect 1 0 4 0;

+#X connect 1 0 13 0;

 #X connect 1 0 14 0;

-#X connect 1 0 15 0;

-#X connect 1 0 19 0;

+#X connect 1 0 18 0;

 #X connect 2 0 4 0;

+#X connect 2 0 13 0;

 #X connect 2 0 14 0;

-#X connect 2 0 15 0;

-#X connect 2 0 19 0;

-#X connect 3 0 14 0;

-#X connect 3 0 17 0;

+#X connect 2 0 18 0;

+#X connect 3 0 13 0;

+#X connect 3 0 16 0;

 #X connect 4 0 3 0;

-#X connect 14 0 0 0;

-#X connect 17 0 15 0;

-#X connect 19 0 18 0;

+#X connect 13 0 0 0;

+#X connect 16 0 14 0;

+#X connect 18 0 17 0;

 #X coords 0 -1 1 1 59 26 1 131 89;

diff --git a/mat~.pd b/mat~.pd
index c99677c..59448fd 100644
--- a/mat~.pd
+++ b/mat~.pd
@@ -1,22 +1,22 @@
-#N canvas 441 135 457 490 10;

+#N canvas 441 135 457 504 10;

 #X obj 31 109 cnv 15 29 128 empty empty empty 20 12 0 14 -233017 -66577

 0;

-#X obj 19 322 *~;

+#X obj 19 352 *~;

 #X obj 48 302 line~;

 #X msg 48 282 \$1 20;

 #X obj 48 67 inlet Lautstaerke;

 #X obj 19 47 inlet~ Signal;

-#X obj 19 402 outlet~;

+#X obj 19 432 outlet~;

 #X obj 48 262 dbtorms;

 #X obj 98 282 outlet;

 #X obj 48 113 vsl 10 119 0 127 0 0 empty empty empty 0 -8 0 8 -195568

--1 -1 9291 0;

+-1 -1 0 0;

 #X obj 50 138 cnv 1 6 2 empty empty empty 20 12 0 14 -262144 -262144

 0;

-#X obj 29 382 - 100;

+#X obj 29 412 - 100;

 #X obj 34 113 vsl 10 119 -100 12 0 0 empty empty empty 0 -8 0 8 -195568

--1 -262144 8848 0;

-#X obj 29 342 env~ 8820;

+-1 -262144 0 0;

+#X obj 29 372 env~ 8820;

 #X obj 39 87 inlet mute;

 #X obj 71 112 bang;

 #X obj 71 132 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1

@@ -26,8 +26,6 @@
 #X obj 96 170 expr if ($f1 == 0 \, 22 \, 20);

 #X msg 96 190 color \$1;

 #X obj 101 112 init 1;

-#X text 12 427 (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

@@ -53,7 +51,7 @@ in the documentation and/or other materials provided with the distribution.
 ;

 #X text 8 27 jmmmpais@googlemail.com;

 #X text 8 7 Copyright 2006 \, João Pais;

-#X restore 15 445 pd license;

+#X restore 15 475 pd license;

 #X text 11 8 [met~] - Level meter with amplitude control;

 #X text 280 45 Inlets;

 #X text 280 135 Outlets;

@@ -62,12 +60,16 @@ in the documentation and/or other materials provided with the distribution.
 #X text 280 175 - Signal level (0-1);

 #X text 280 105 - Level (0-127);

 #X text 280 85 - Mute / Unmute (bang);

-#X obj 29 362 dbtofad;

+#X obj 29 392 dbtofad;

 #X obj 36 143 cnv 1 6 2 empty empty empty 20 12 0 14 -262144 -262144

 0;

+#X obj 48 332 *~;

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

+#X obj 145 328 snaps~;

 #X connect 1 0 6 0;

 #X connect 1 0 13 0;

-#X connect 2 0 1 1;

+#X connect 2 0 33 0;

+#X connect 2 0 33 1;

 #X connect 3 0 2 0;

 #X connect 4 0 9 0;

 #X connect 5 0 1 0;

@@ -75,7 +77,7 @@ in the documentation and/or other materials provided with the distribution.
 #X connect 7 0 8 0;

 #X connect 9 0 17 0;

 #X connect 11 0 12 0;

-#X connect 13 0 32 0;

+#X connect 13 0 31 0;

 #X connect 14 0 15 0;

 #X connect 15 0 16 0;

 #X connect 16 0 18 0;

@@ -86,5 +88,6 @@ in the documentation and/or other materials provided with the distribution.
 #X connect 19 0 20 0;

 #X connect 20 0 12 0;

 #X connect 21 0 16 0;

-#X connect 32 0 11 0;

+#X connect 31 0 11 0;

+#X connect 33 0 1 1;

 #X coords 0 -1 1 1 31 130 1 30 108;

diff --git a/uhr.pd b/uhr.pd
index 4d75f70..22d3a9d 100755
--- a/uhr.pd
+++ b/uhr.pd
@@ -1,22 +1,19 @@
-#N canvas 0 0 340 263 10;

-#X obj 120 87 metrum 1000 1;

-#X obj 120 107 time;

-#X msg 17 149 label \$1;

-#X obj 17 169 s \$0-stunde;

-#X msg 127 149 label \$1;

-#X obj 127 169 s \$0-minute;

-#X obj 102 42 cnv 13 22 13 empty \$0-stunde 9 2 7 0 11 -233017 -1 0

-;

-#X obj 126 42 cnv 13 22 13 empty \$0-minute 40 2 7 0 11 -233017 -1

+#N canvas 262 338 567 316 10;

+#X obj 210 77 metrum 1000 1;

+#X obj 210 97 time;

+#X msg 107 179 label \$1;

+#X obj 77 209 s \$0-stunde;

+#X obj 247 209 s \$0-minute;

+#X obj 102 42 cnv 13 22 13 empty \$0-stunde 07 2 7 0 11 -233017 -1

 0;

-#X obj 150 42 cnv 13 22 13 empty \$0-sek 39 2 7 0 11 -233017 -1 0;

-#X msg 237 149 label \$1;

-#X obj 237 169 s \$0-sek;

-#X obj 237 129 mergefilename;

-#X obj 127 129 mergefilename;

-#X obj 17 129 mergefilename;

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

-;

+#X obj 126 42 cnv 13 22 13 empty \$0-minute 46 2 7 0 11 -233017 -1

+0;

+#X obj 150 42 cnv 13 22 13 empty \$0-sek 08 2 7 0 11 -233017 -1 0;

+#X obj 427 209 s \$0-sek;

+#X obj 377 159 mergefilename;

+#X obj 197 159 mergefilename;

+#X obj 107 159 mergefilename;

+#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

@@ -42,16 +39,39 @@ in the documentation and/or other materials provided with the distribution.
 ;

 #X text 8 27 jmmmpais@googlemail.com;

 #X text 8 7 Copyright 2006 \, João Pais;

-#X restore 15 219 pd license;

+#X restore 15 269 pd license;

 #X text 11 10 [uhr] - Shows the time;

+#X obj 37 129 moses 10;

+#X obj 17 159 mergefilename;

+#X msg 17 180 label 0\$1;

+#X msg 287 179 label \$1;

+#X obj 287 159 mergefilename;

+#X msg 197 179 label 0\$1;

+#X msg 467 179 label \$1;

+#X obj 467 159 mergefilename;

+#X msg 377 179 label 0\$1;

+#X obj 407 129 moses 10;

+#X obj 217 129 moses 10;

 #X connect 0 0 1 0;

-#X connect 1 0 13 0;

-#X connect 1 1 12 0;

-#X connect 1 2 11 0;

+#X connect 1 0 15 0;

+#X connect 1 1 25 0;

+#X connect 1 2 24 0;

 #X connect 2 0 3 0;

-#X connect 4 0 5 0;

-#X connect 9 0 10 0;

-#X connect 11 0 9 0;

-#X connect 12 0 4 0;

-#X connect 13 0 2 0;

+#X connect 9 0 23 0;

+#X connect 10 0 20 0;

+#X connect 11 0 2 0;

+#X connect 15 0 16 0;

+#X connect 15 1 11 0;

+#X connect 16 0 17 0;

+#X connect 17 0 3 0;

+#X connect 18 0 4 0;

+#X connect 19 0 18 0;

+#X connect 20 0 4 0;

+#X connect 21 0 8 0;

+#X connect 22 0 21 0;

+#X connect 23 0 8 0;

+#X connect 24 0 9 0;

+#X connect 24 1 22 0;

+#X connect 25 0 10 0;

+#X connect 25 1 19 0;

 #X coords 0 -1 1 1 74 17 1 100 40;