merged in relevant changes from the v0-40 pd-extended release branch

svn path=/trunk/externals/mapping/; revision=10266

1 files changed, 113 insertions, 95 deletions

diff --git a/autoscale.pd b/autoscale.pd
index 192636c..7170125 100644
--- a/autoscale.pd
+++ b/autoscale.pd
@@ -1,63 +1,86 @@
-#N canvas 411 85 761 507 10;
-#X obj 634 5 import mapping;
-#X obj 5 20 inlet;
-#X obj 112 424 outlet;
-#X obj 112 153 trigger float float float bang bang;
-#X obj 112 321 expr (($f1 - $f2) * (($f5 - $f4) / ($f3 - $f2))) + $f4
+#N canvas 137 61 702 488 10;
+#X obj 35 20 inlet;
+#X obj 184 424 outlet;
+#X obj 184 321 expr (($f1 - $f2) * (($f5 - $f4) / ($f3 - $f2))) + $f4
 ;
 #X text 2 446 (C) Copyright 2004 Hans-Christoph Steiner <hans@at.or.at>
 ;
 #X text 219 461 released under the GNU GPL;
 #X text 417 458 $Author: eighthave $;
-#X obj 368 20 inlet;
-#X obj 469 20 inlet;
-#X text 335 6 output min;
-#X text 436 6 output max;
-#X text 44 21 data to be scaled;
-#X obj 522 20 inlet reset;
-#N canvas 0 22 454 304 output 0;
-#X obj 32 24 inlet;
-#X obj 334 24 inlet;
-#X obj 22 273 outlet;
-#X obj 338 274 outlet;
-#X text 78 273 min;
-#X text 74 25 min;
-#X text 380 26 max;
-#X text 386 274 max;
-#X obj 69 54 loadbang;
-#X obj 37 167 expr if ($f1 == $f2 \, 0 \, $f1) \; if ($f1 == $f2 \,
+#X obj 398 20 inlet;
+#X obj 499 20 inlet;
+#X text 365 6 output min;
+#X text 466 6 output max;
+#X text 74 21 data to be scaled;
+#X obj 552 20 inlet reset;
+#N canvas 691 127 484 377 output 0;
+#X obj 6 23 inlet;
+#X obj 294 25 inlet;
+#X obj 6 330 outlet;
+#X obj 177 333 outlet;
+#X text 62 330 min;
+#X text 48 24 min;
+#X text 340 27 max;
+#X text 225 333 max;
+#X obj 38 53 loadbang;
+#X obj 6 276 expr if ($f1 == $f2 \, 0 \, $f1) \; if ($f1 == $f2 \,
 1 \, $f2);
-#X obj 235 135 purepd/float_argument \$2 1;
-#X obj 69 77 trigger 0 bang;
-#X text 183 76 [float_argument] doesn't output 0 on;
-#X text 183 88 bang \, so send the 0 here.;
-#X obj 37 135 purepd/float_argument \$1 0;
-#X connect 0 0 14 0;
-#X connect 1 0 10 0;
-#X connect 8 0 11 0;
+#X text 153 71 [float_argument] doesn't output 0 on;
+#X text 156 81 bang \, so send the 0 here.;
+#X obj 26 185 purepd/float_argument \$1 0;
+#X obj 39 243 trigger bang float;
+#X obj 38 76 trigger bang bang;
+#X obj 204 185 purepd/float_argument \$2 1;
+#X floatatom 215 208 5 0 0 0 - - -;
+#X floatatom 36 208 5 0 0 0 - - -;
+#X obj 209 234 print MAX;
+#X obj 107 221 print MIN;
+#X msg 207 163 bang;
+#X obj 48 102 float \$1;
+#X obj 48 123 select 0;
+#X obj 93 144 bang;
+#X msg 48 144 0;
+#X text 124 110 since Pd inits unused vars to 0 \, [float_argument]
+uses 0 to mean no argument for \$1. But we need 0 \, so we have to
+set up this extra test.;
+#X connect 0 0 9 0;
+#X connect 1 0 13 0;
+#X connect 8 0 14 0;
 #X connect 9 0 2 0;
 #X connect 9 1 3 0;
-#X connect 10 0 9 1;
-#X connect 11 0 14 0;
-#X connect 11 1 10 0;
-#X connect 14 0 9 0;
-#X restore 391 286 pd output range;
+#X connect 12 0 9 0;
+#X connect 12 0 17 0;
+#X connect 12 0 19 0;
+#X connect 13 0 9 0;
+#X connect 13 1 9 1;
+#X connect 14 0 12 0;
+#X connect 14 0 21 0;
+#X connect 14 1 15 0;
+#X connect 15 0 9 1;
+#X connect 15 0 16 0;
+#X connect 15 0 18 0;
+#X connect 20 0 15 0;
+#X connect 21 0 22 0;
+#X connect 22 0 24 0;
+#X connect 22 1 23 0;
+#X connect 23 0 12 0;
+#X connect 24 0 12 0;
+#X restore 418 263 pd output range;
 #N canvas 463 201 389 220 track 0;
 #X obj 168 22 inlet;
 #X obj 38 135 outlet;
 #X obj 279 22 inlet;
 #X obj 168 135 outlet;
 #X obj 38 22 inlet;
-#X obj 38 108 track_min;
-#X obj 168 108 track_max;
-#X connect 0 0 6 0;
-#X connect 2 0 6 2;
+#X obj 168 108 mapping/track_max;
+#X obj 38 108 mapping/track_min;
+#X connect 0 0 5 0;
 #X connect 2 0 5 2;
-#X connect 4 0 5 0;
-#X connect 5 0 1 0;
-#X connect 6 0 3 0;
-#X restore 191 290 pd track changes;
-#X obj 370 153 trigger float bang bang;
+#X connect 2 0 6 2;
+#X connect 4 0 6 0;
+#X connect 5 0 3 0;
+#X connect 6 0 1 0;
+#X restore 263 290 pd track changes;
 #N canvas 634 182 466 316 gate 0;
 #X obj 74 268 outlet;
 #X obj 316 266 outlet;
@@ -85,54 +108,49 @@
 #X connect 10 0 5 0;
 #X connect 10 0 6 0;
 #X connect 11 0 10 0;
-#X restore 154 81 pd gate;
-#X obj 522 39 route float bang;
-#X obj 175 424 outlet;
-#X obj 238 424 outlet;
-#X obj 175 398 f;
-#X obj 238 399 f;
+#X restore 184 81 pd gate;
+#X obj 552 39 route float bang;
+#X obj 247 424 outlet;
+#X obj 310 424 outlet;
+#X obj 247 398 f;
+#X obj 310 399 f;
 #X text 417 445 $Revision: 1.6 $$Date: 2006-12-24 06:06:41 $;
-#X text 192 135 track mode;
-#X text 396 136 run mode;
-#X obj 16 224 unpack float float;
-#X obj 16 198 trigger list bang;
-#X obj 5 347 trigger bang bang;
-#X obj 5 60 route save load reset;
-#X msg 200 58 0;
-#X connect 1 0 29 0;
-#X connect 3 0 4 0;
-#X connect 3 1 15 0;
-#X connect 3 2 15 1;
-#X connect 3 3 14 0;
-#X connect 3 4 14 1;
-#X connect 4 0 2 0;
-#X connect 8 0 14 0;
-#X connect 9 0 14 1;
-#X connect 13 0 18 0;
-#X connect 14 0 4 3;
-#X connect 14 1 4 4;
-#X connect 15 0 4 1;
-#X connect 15 0 21 1;
-#X connect 15 1 4 2;
-#X connect 15 1 22 1;
-#X connect 16 0 4 0;
-#X connect 16 1 14 0;
-#X connect 16 2 14 1;
-#X connect 17 0 3 0;
-#X connect 17 1 16 0;
-#X connect 18 0 17 1;
-#X connect 18 1 15 2;
-#X connect 21 0 19 0;
-#X connect 22 0 20 0;
-#X connect 26 0 15 0;
-#X connect 26 1 15 1;
-#X connect 27 0 26 0;
-#X connect 27 1 15 2;
-#X connect 28 0 21 0;
-#X connect 28 1 22 0;
-#X connect 29 0 28 0;
-#X connect 29 1 27 0;
-#X connect 29 1 30 0;
-#X connect 29 2 15 2;
-#X connect 29 3 17 0;
-#X connect 30 0 17 1;
+#X text 264 135 track mode;
+#X text 356 136 run mode;
+#X obj 46 224 unpack float float;
+#X obj 46 198 trigger list bang;
+#X obj 35 347 trigger bang bang;
+#X obj 35 60 route save load reset;
+#X obj 362 153 float;
+#X obj 184 153 trigger float float float;
+#X connect 0 0 26 0;
+#X connect 2 0 1 0;
+#X connect 6 0 12 0;
+#X connect 7 0 12 1;
+#X connect 11 0 15 0;
+#X connect 12 0 2 3;
+#X connect 12 1 2 4;
+#X connect 13 0 2 1;
+#X connect 13 0 18 1;
+#X connect 13 1 2 2;
+#X connect 13 1 19 1;
+#X connect 14 0 28 0;
+#X connect 14 1 27 0;
+#X connect 15 0 14 1;
+#X connect 15 1 13 2;
+#X connect 18 0 16 0;
+#X connect 19 0 17 0;
+#X connect 23 0 13 0;
+#X connect 23 1 13 1;
+#X connect 24 0 23 0;
+#X connect 24 1 13 2;
+#X connect 25 0 18 0;
+#X connect 25 1 19 0;
+#X connect 26 0 25 0;
+#X connect 26 1 24 0;
+#X connect 26 2 13 2;
+#X connect 26 3 14 0;
+#X connect 27 0 2 0;
+#X connect 28 0 2 0;
+#X connect 28 1 13 0;
+#X connect 28 2 13 1;