Changed the function of some of the sample_ inlets

svn path=/trunk/externals/tof/; revision=13577

4 files changed, 86 insertions, 90 deletions

diff --git a/tof/sample_granule~-help.pd b/tof/sample_granule~-help.pd
index 36baa30..85f89f6 100644
--- a/tof/sample_granule~-help.pd
+++ b/tof/sample_granule~-help.pd
@@ -4,17 +4,12 @@
 -1;
 #X obj 41 164 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
-#X floatatom 122 301 5 0 0 0 - - -;
-#X obj 219 357 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
+#X floatatom 185 401 5 0 0 0 - - -;
 #X text 45 128 Inlet 1 \, bang: Play sample once;
 #X text 60 161 Inlet 1 \, float: Start/stop playing looped sample;
-#X text 243 328 Inlet 3 \, float: Duration in ms;
-#X text 244 352 Inlet 3 \, bang: Reset to orginal duration;
-#X text 160 299 Inlet 2 \, float: Pitch (1=normal);
-#X msg 200 330 10000;
+#X text 223 399 Inlet 2 \, float: Pitch (1=normal);
 #X text 27 63 Tags: Sound Sample Play;
-#X obj 95 495 dac~;
+#X obj 100 549 dac~;
 #X text 29 32 Description: Pitchshifts or timestretches a sample with
 the granular method;
 #X text 166 191 Inlet 1 \, grain float: Configure grain length (# of
@@ -22,21 +17,25 @@ samples);
 #X msg 63 195 grain 360;
 #X msg 77 214 grain 7056;
 #X msg 93 238 grain 1764;
-#X obj 41 446 sample_granule~ smpgranu;
+#X obj 46 500 sample_granule~ smpgranu;
 #X obj 437 51 openpanel;
 #X msg 441 78 read \$1;
 #X obj 445 26 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
-#X connect 1 0 18 0;
-#X connect 2 0 18 0;
-#X connect 3 0 18 1;
-#X connect 4 0 18 2;
-#X connect 10 0 18 2;
-#X connect 15 0 18 0;
-#X connect 16 0 18 0;
-#X connect 17 0 18 0;
-#X connect 18 0 12 0;
-#X connect 18 1 12 1;
-#X connect 19 0 20 0;
-#X connect 20 0 0 0;
-#X connect 21 0 19 0;
+#X text 214 268 Inlet 1 \, duration float: Set duration in ms;
+#X text 206 297 Inlet 1 \, duration: Reset the duration;
+#X msg 136 296 duration;
+#X msg 118 270 duration 10000;
+#X connect 1 0 14 0;
+#X connect 2 0 14 0;
+#X connect 3 0 14 1;
+#X connect 11 0 14 0;
+#X connect 12 0 14 0;
+#X connect 13 0 14 0;
+#X connect 14 0 8 0;
+#X connect 14 1 8 1;
+#X connect 15 0 16 0;
+#X connect 16 0 0 0;
+#X connect 17 0 15 0;
+#X connect 20 0 14 0;
+#X connect 21 0 14 0;
diff --git a/tof/sample_granule~.pd b/tof/sample_granule~.pd
index caeece2..acadf44 100644
--- a/tof/sample_granule~.pd
+++ b/tof/sample_granule~.pd
@@ -5,7 +5,6 @@
 #X obj 86 625 *~;
 #X obj 240 629 *~;
 #X obj 243 -49 inlet pitch;
-#X obj 423 -50 inlet duration;
 #X obj 22 146 sig~ 1;
 #N canvas 1026 60 1278 964 grains 0;
 #X obj 272 634 outlet~;
@@ -190,7 +189,6 @@
 #X obj 583 386 s \$0-sampstart;
 #X obj 676 386 s \$0-samplength;
 #X obj 500 385 s \$0-sampend;
-#X obj 61 66 route bang float grain;
 #N canvas 0 0 842 452 parse_sample 0;
 #X obj 392 336 outlet end;
 #X obj 493 335 outlet start;
@@ -361,7 +359,7 @@
 #X connect 10 0 0 0;
 #X connect 10 1 11 0;
 #X connect 11 0 7 1;
-#X restore 407 95 pd speed;
+#X restore 378 165 pd speed;
 #N canvas 0 0 787 526 hanning 0;
 #X obj 325 180 samplerate~;
 #X obj 325 207 * 0.016;
@@ -401,27 +399,28 @@
 #X connect 16 4 15 0;
 #X restore 617 98 pd hanning;
 #X obj 617 57 loadbang;
-#X connect 0 0 12 0;
+#X obj 61 66 route bang float grain duration;
+#X connect 0 0 16 0;
 #X connect 3 0 1 0;
 #X connect 4 0 2 0;
-#X connect 5 0 7 0;
-#X connect 5 0 14 2;
-#X connect 6 0 15 0;
-#X connect 7 0 8 1;
-#X connect 8 0 3 0;
-#X connect 8 1 4 0;
-#X connect 12 0 14 0;
-#X connect 12 1 14 1;
-#X connect 12 2 8 3;
-#X connect 12 3 13 0;
-#X connect 13 0 15 1;
-#X connect 13 1 8 2;
-#X connect 13 2 11 0;
-#X connect 13 3 9 0;
-#X connect 13 4 10 0;
-#X connect 14 0 8 0;
-#X connect 14 1 4 1;
-#X connect 14 1 3 1;
-#X connect 14 2 13 0;
-#X connect 15 0 14 3;
-#X connect 17 0 16 0;
+#X connect 5 0 6 0;
+#X connect 5 0 12 2;
+#X connect 6 0 7 1;
+#X connect 7 0 3 0;
+#X connect 7 1 4 0;
+#X connect 11 0 13 1;
+#X connect 11 1 7 2;
+#X connect 11 2 10 0;
+#X connect 11 3 8 0;
+#X connect 11 4 9 0;
+#X connect 12 0 7 0;
+#X connect 12 1 4 1;
+#X connect 12 1 3 1;
+#X connect 12 2 11 0;
+#X connect 13 0 12 3;
+#X connect 15 0 14 0;
+#X connect 16 0 12 0;
+#X connect 16 1 12 1;
+#X connect 16 2 7 3;
+#X connect 16 3 13 0;
+#X connect 16 4 11 0;
diff --git a/tof/sample_shifft~-help.pd b/tof/sample_shifft~-help.pd
index ef6fbd9..b7d3c4e 100644
--- a/tof/sample_shifft~-help.pd
+++ b/tof/sample_shifft~-help.pd
@@ -1,27 +1,26 @@
-#N canvas 101 260 679 377 10;
-#X obj 87 331 dac~;
-#X obj 28 158 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
+#N canvas 109 159 710 482 10;
+#X obj 87 407 dac~;
+#X obj 28 181 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
-#X obj 44 193 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 44 216 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
 1;
-#X floatatom 95 224 5 0 0 0 - - -;
-#X obj 192 280 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
--1 -1;
-#X text 48 157 Inlet 1 \, bang: Play sample once;
-#X text 63 190 Inlet 1 \, float: Start/stop playing looped sample;
-#X text 216 251 Inlet 3 \, float: Duration in ms;
-#X text 217 275 Inlet 3 \, bang: Reset to orginal duration;
+#X floatatom 175 331 5 0 0 0 - - -;
+#X text 48 180 Inlet 1 \, bang: Play sample once;
+#X text 63 213 Inlet 1 \, float: Start/stop playing looped sample;
 #X text 34 28 Description: Pitchshifts or timestretches a sample with
 the FFT method;
 #X text 32 58 Tags: Sound Sample Play;
 #X obj 458 120 tof/sample smpfft amen.wav;
-#X text 133 222 Inlet 2 \, float: Pitch (1=normal);
-#X msg 173 253 10000;
-#X obj 28 296 tof/sample_shifft~ smpfft;
-#X connect 1 0 14 0;
-#X connect 2 0 14 0;
-#X connect 3 0 14 1;
-#X connect 4 0 14 2;
-#X connect 13 0 14 2;
-#X connect 14 0 0 0;
-#X connect 14 1 0 1;
+#X text 213 329 Inlet 2 \, float: Pitch (1=normal);
+#X obj 28 372 tof/sample_shifft~ smpfft;
+#X text 171 239 Inlet 1 \, duration float: Set duration in ms;
+#X text 163 268 Inlet 1 \, duration: Reset the duration;
+#X msg 93 267 duration;
+#X msg 75 241 duration 10000;
+#X connect 1 0 10 0;
+#X connect 2 0 10 0;
+#X connect 3 0 10 1;
+#X connect 10 0 0 0;
+#X connect 10 1 0 1;
+#X connect 13 0 10 0;
+#X connect 14 0 10 0;
diff --git a/tof/sample_shifft~.pd b/tof/sample_shifft~.pd
index 1767e1f..4a74e75 100644
--- a/tof/sample_shifft~.pd
+++ b/tof/sample_shifft~.pd
@@ -4,9 +4,7 @@
 #X obj 224 650 outlet~;
 #X obj 76 615 *~;
 #X obj 230 619 *~;
-#X obj 51 56 route bang float;
 #X obj 233 -59 inlet pitch;
-#X obj 429 1 inlet duration;
 #X obj 669 198 s \$0-samplength;
 #X obj 648 226 s \$0-sampstart;
 #X obj 52 396 sig~ 1;
@@ -609,7 +607,7 @@ shifts the signal to the left or right depending on its argument.)
 #X connect 10 0 0 0;
 #X connect 10 1 11 0;
 #X connect 11 0 7 1;
-#X restore 443 79 pd speed;
+#X restore 220 161 pd speed;
 #N canvas 0 0 892 551 player 0;
 #X obj 702 496 outlet get_sample;
 #X obj 91 29 inlet bang;
@@ -682,24 +680,25 @@ shifts the signal to the left or right depending on its argument.)
 #X connect 23 0 25 0;
 #X connect 24 0 23 0;
 #X restore 75 290 pd player;
-#X connect 0 0 5 0;
+#X obj 52 56 route bang float duration;
+#X connect 0 0 14 0;
 #X connect 3 0 1 0;
 #X connect 4 0 2 0;
-#X connect 5 0 15 0;
-#X connect 5 1 15 1;
-#X connect 5 2 13 0;
-#X connect 6 0 10 0;
-#X connect 6 0 15 2;
-#X connect 7 0 14 0;
-#X connect 10 0 12 1;
-#X connect 12 0 3 0;
-#X connect 12 1 4 0;
-#X connect 13 0 14 1;
-#X connect 13 1 12 2;
-#X connect 13 3 9 0;
-#X connect 13 4 8 0;
-#X connect 14 0 15 3;
-#X connect 15 0 12 0;
-#X connect 15 1 3 1;
-#X connect 15 1 4 1;
-#X connect 15 2 13 0;
+#X connect 5 0 8 0;
+#X connect 5 0 13 2;
+#X connect 8 0 10 1;
+#X connect 10 0 3 0;
+#X connect 10 1 4 0;
+#X connect 11 0 12 1;
+#X connect 11 1 10 2;
+#X connect 11 3 7 0;
+#X connect 11 4 6 0;
+#X connect 12 0 13 3;
+#X connect 13 0 10 0;
+#X connect 13 1 3 1;
+#X connect 13 1 4 1;
+#X connect 13 2 11 0;
+#X connect 14 0 13 0;
+#X connect 14 1 13 1;
+#X connect 14 2 12 0;
+#X connect 14 3 11 0;