Skip to content
Browse files

Fixed the broken, ineffective fade parameter of s_playtable and allow…

… separate values for fade-in and fade-out with the one fade-parameter as two element list. Files affected by this fix have been updated as well (playtable2 and looper)
  • Loading branch information...
1 parent eb57802 commit e7aad803c954c385e0f386d9c4007e93b3056b30 @footils footils committed Jan 26, 2012
Showing with 120 additions and 102 deletions.
  1. +18 −18 rj/s_looper-help.pd
  2. +11 −11 rj/s_looper.pd
  3. +22 −18 rj/s_playtable-help.pd
  4. +60 −50 rj/s_playtable.pd
  5. +9 −5 rj/s_playtable2-help.pd
View
36 rj/s_looper-help.pd
@@ -32,7 +32,6 @@ it specifies. Then it start playing part <part> and stops after <duration>
parts.;
#X msg 183 284 sr 22050;
#X msg 589 307 playdiv 32 \$1 1;
-#X text 239 334 adjust fade-in time (default 2ms);
#X text 155 83 Args: <NAME> <soundfile to autoload>;
#X obj 729 275 hradio 15 1 0 8 empty empty empty 0 -8 0 10 -262144
-1 -1 0;
@@ -41,16 +40,17 @@ parts.;
#X text 533 73 The "playdiv" message:;
#X text 461 434 sample file info;
#X msg 185 306 sr 44100;
-#X obj 82 52 s_looper;
#X obj 93 389 s_looper \$0-mysample filenotfound.wav;
#X msg 186 334 fade 0;
#X msg 186 355 info;
#X text 237 355 print info to last outlet;
-#X connect 0 0 36 0;
-#X connect 2 0 36 0;
-#X connect 3 0 36 0;
+#X obj 82 52 s_looper;
+#X text 239 334 adjust fade time (default 2ms);
+#X connect 0 0 34 0;
+#X connect 2 0 34 0;
+#X connect 3 0 34 0;
#X connect 4 0 3 0;
-#X connect 5 0 36 0;
+#X connect 5 0 34 0;
#X connect 6 0 26 0;
#X connect 7 0 6 0;
#X connect 8 0 7 0;
@@ -61,15 +61,15 @@ parts.;
#X connect 12 3 13 0;
#X connect 15 0 16 0;
#X connect 16 0 7 1;
-#X connect 18 0 36 0;
-#X connect 25 0 36 0;
-#X connect 26 0 36 0;
-#X connect 29 0 30 0;
-#X connect 30 0 36 0;
-#X connect 34 0 36 0;
-#X connect 36 0 1 0;
-#X connect 36 1 1 1;
-#X connect 36 2 17 0;
-#X connect 36 3 12 0;
-#X connect 37 0 36 0;
-#X connect 38 0 36 0;
+#X connect 18 0 34 0;
+#X connect 25 0 34 0;
+#X connect 26 0 34 0;
+#X connect 28 0 29 0;
+#X connect 29 0 34 0;
+#X connect 33 0 34 0;
+#X connect 34 0 1 0;
+#X connect 34 1 1 1;
+#X connect 34 2 17 0;
+#X connect 34 3 12 0;
+#X connect 35 0 34 0;
+#X connect 36 0 34 0;
View
22 rj/s_looper.pd
@@ -94,7 +94,6 @@ play only one division.;
#X obj 248 423 r \$0-sr;
#X msg 248 445 sr \$1;
#X obj 314 420 r \$0-fade;
-#X msg 314 443 fade \$1;
#X msg 652 318 sr \$1 \, info;
#X obj 579 356 u_samplebank2 \$0-sample \$2;
#X obj 609 49 u_loader s_looper-\$1 \$0;
@@ -117,6 +116,7 @@ License along with this program. If not \, see <http://www.gnu.org/licenses/>.
#X text 60 325 See the file LICENSE.txt for the full license text.
;
#X restore 812 29 pd LICENSE-GPL;
+#X msg 314 443 fade 0 \$1;
#X connect 2 0 0 0;
#X connect 2 1 1 0;
#X connect 6 0 5 0;
@@ -145,7 +145,7 @@ License along with this program. If not \, see <http://www.gnu.org/licenses/>.
#X connect 29 0 30 0;
#X connect 29 0 44 0;
#X connect 30 0 2 1;
-#X connect 31 0 60 0;
+#X connect 31 0 59 0;
#X connect 32 0 33 0;
#X connect 33 0 43 0;
#X connect 34 0 16 1;
@@ -162,14 +162,14 @@ License along with this program. If not \, see <http://www.gnu.org/licenses/>.
#X connect 48 0 26 0;
#X connect 50 0 51 0;
#X connect 52 0 53 0;
-#X connect 53 0 62 0;
-#X connect 54 0 59 0;
+#X connect 53 0 61 0;
+#X connect 54 0 58 0;
#X connect 55 0 56 0;
#X connect 56 0 2 1;
-#X connect 57 0 58 0;
-#X connect 58 0 2 1;
-#X connect 59 0 60 0;
-#X connect 60 0 6 0;
-#X connect 60 0 40 0;
-#X connect 63 0 64 0;
-#X connect 64 0 60 0;
+#X connect 57 0 65 0;
+#X connect 58 0 59 0;
+#X connect 59 0 6 0;
+#X connect 59 0 40 0;
+#X connect 62 0 63 0;
+#X connect 63 0 59 0;
+#X connect 65 0 2 1;
View
40 rj/s_playtable-help.pd
@@ -1,22 +1,22 @@
#N canvas 289 87 888 636 10;
-#X obj 634 443 openpanel;
-#X obj 633 518 table play-samp;
-#X msg 634 464 read -resize \$1 play-samp;
-#X obj 634 490 soundfiler;
-#X obj 634 416 bng 20 250 50 0 empty empty open-sample 0 -6 1 10 -262144
+#X obj 664 443 openpanel;
+#X obj 663 518 table play-samp;
+#X msg 664 464 read -resize \$1 play-samp;
+#X obj 664 490 soundfiler;
+#X obj 664 416 bng 20 250 50 0 empty empty open-sample 0 -6 1 10 -262144
-1 -1;
-#X obj 122 554 soundoutput;
+#X obj 122 584 soundoutput;
#X msg 158 209 play-samp 0.5 2;
#X text 356 235 original gain \, original pitch \, start at 500 ms
;
#X msg 171 261 play-samp 1 1 500 250;
#X msg 167 238 play-samp 1 1 500;
#X msg 178 355 bang;
#X text 220 355 repeat last instruction;
-#X obj 240 534 spigot;
-#X obj 295 535 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
+#X obj 240 564 spigot;
+#X obj 295 565 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
1;
-#X obj 240 562 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+#X obj 240 592 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
-1 -1;
#X msg 177 319 play-samp 0.8 -1 8000 8000;
#X text 175 295 attenuated \, reversed \, starting at 8000ms \, playing
@@ -25,7 +25,7 @@ for 8000ms;
(ms)> <duration (ms)> <looping 0/1>;
#X text 301 180 original gain \, original pitch \, start at 0 \, play
for 8000ms;
-#X text 237 514 last outlet: bang at end of duration;
+#X text 237 544 last outlet: bang at end of duration;
#X text 355 259 original gain \, original pitch \, start at 500 ms
\, play for 250ms;
#X msg 122 158 play-samp;
@@ -40,12 +40,14 @@ of:;
is doen by resampling;
#X msg 142 183 play-samp 1 1 0 8000;
#X text 203 158 play all with original gain and original pitch;
-#X obj 122 493 s_playtable;
-#X msg 220 491 stop;
-#X text 266 494 stop playing;
-#X msg 270 462 fade \$1;
-#X floatatom 270 444 5 0 0 0 - - -;
-#X text 341 464 fade in/out time (default is 2msec);
+#X obj 122 523 s_playtable;
+#X msg 220 521 stop;
+#X text 266 524 stop playing;
+#X floatatom 270 454 5 0 0 0 - - -;
+#X msg 270 492 fade \$1 \$2;
+#X text 336 471 fade in & out time (default is 0 ms \, 2 ms);
+#X floatatom 323 453 5 0 0 0 - - -;
+#X obj 270 472 pack 0 2;
#X connect 0 0 2 0;
#X connect 2 0 3 0;
#X connect 4 0 0 0;
@@ -65,5 +67,7 @@ is doen by resampling;
#X connect 31 0 5 1;
#X connect 31 1 12 0;
#X connect 32 0 31 1;
-#X connect 34 0 31 1;
-#X connect 35 0 34 0;
+#X connect 34 0 38 0;
+#X connect 35 0 31 1;
+#X connect 37 0 38 1;
+#X connect 38 0 35 0;
View
110 rj/s_playtable.pd
@@ -1,27 +1,27 @@
-#N canvas 95 136 635 630 10;
+#N canvas 645 218 635 630 10;
#X obj 456 76 inlet;
#X obj 36 36 inlet;
#X obj 36 591 outlet~;
#X obj 36 461 tabread4~;
#X obj 36 301 list prepend set;
#X obj 36 331 list trim;
#X obj 51 431 vline~;
-#N canvas 223 211 1064 786 trigger-sample 0;
-#X text 40 165 Wait for the;
-#X text 38 179 cutoff to finish;
+#N canvas 216 211 1064 786 trigger-sample 0;
+#X text 20 165 Wait for the;
+#X text 18 179 cutoff to finish;
#X text 83 435 set the upper line~ to start;
#X text 82 454 at the first sample and go;
#X text 81 475 forever (until the next trigger);
-#X obj 142 202 t b b;
+#X obj 122 202 t b b;
#X obj 299 645 s \$0-phase;
-#X obj 142 315 s \$0-cutoff;
-#X obj 142 52 inlet;
-#X obj 169 142 s \$0-cutoff;
-#X text 36 143 cut the sound off;
-#X obj 142 266 f;
+#X obj 122 315 s \$0-cutoff;
+#X obj 122 52 inlet;
+#X obj 149 142 s \$0-cutoff;
+#X text 16 143 cut the sound off;
+#X obj 122 266 f;
#X obj 264 52 inlet;
-#X obj 142 82 t b b;
-#X text 269 32 gain;
+#X obj 122 82 t b b;
+#X text 267 30 gain;
#X obj 314 52 inlet;
#X text 313 30 transpos;
#X obj 299 465 * 1e+07;
@@ -35,7 +35,7 @@
#X obj 299 307 < 0;
#X obj 299 331 select 0 1;
#X obj 299 285 f;
-#X obj 142 172 delay 2;
+#X obj 122 172 delay 2;
#X obj 416 52 inlet;
#X text 413 32 start;
#X obj 633 85 inlet;
@@ -67,23 +67,25 @@
#X obj 299 495 pack 0 2.205e+08;
#X msg 299 525 1 0 \, \$2 \$1;
#X obj 709 115 r \$0-stop;
-#X obj 169 112 pack 0 2;
-#X obj 187 52 r \$0-fade;
+#X obj 149 112 pack 0 2;
#X obj 678 365 s \$0-cutoff;
#X obj 678 335 pack 0 2;
-#X obj 723 305 r \$0-fade;
-#X obj 748 52 r \$0-fade;
#X obj 341 185 swap 1;
#X obj 341 210 /;
-#X obj 187 82 t f f;
+#X obj 167 82 t f f;
#X obj 416 134 t f f;
#X obj 748 82 t f f;
#X obj 678 205 t f f;
#X obj 709 145 t f f;
+#X obj 167 52 r \$0-fade-out;
+#X obj 122 290 pack 0 0;
+#X obj 175 265 r \$0-fade-in;
+#X obj 723 305 r \$0-fade-out;
+#X obj 748 52 r \$0-fade-out;
#X connect 5 0 11 0;
#X connect 5 1 27 0;
#X connect 8 0 13 0;
-#X connect 11 0 7 0;
+#X connect 11 0 71 0;
#X connect 12 0 11 1;
#X connect 13 0 28 0;
#X connect 13 1 60 0;
@@ -96,7 +98,7 @@
#X connect 22 0 21 0;
#X connect 23 0 22 1;
#X connect 24 0 27 1;
-#X connect 24 1 66 0;
+#X connect 24 1 63 0;
#X connect 25 0 26 0;
#X connect 26 0 18 0;
#X connect 26 1 22 0;
@@ -108,10 +110,10 @@
#X connect 32 1 34 1;
#X connect 33 0 34 0;
#X connect 34 0 6 0;
-#X connect 35 0 69 0;
+#X connect 35 0 66 0;
#X connect 38 0 48 0;
#X connect 38 1 43 0;
-#X connect 39 0 71 0;
+#X connect 39 0 68 0;
#X connect 43 0 39 0;
#X connect 44 0 42 0;
#X connect 45 0 46 0;
@@ -129,25 +131,27 @@
#X connect 56 0 57 1;
#X connect 57 0 58 0;
#X connect 58 0 32 0;
-#X connect 59 0 72 0;
+#X connect 59 0 69 0;
#X connect 60 0 9 0;
-#X connect 61 0 68 0;
-#X connect 63 0 62 0;
-#X connect 64 0 63 1;
-#X connect 65 0 70 0;
-#X connect 66 0 67 0;
-#X connect 66 1 67 1;
-#X connect 67 0 19 0;
-#X connect 68 0 28 1;
-#X connect 68 1 60 1;
-#X connect 69 0 33 1;
-#X connect 69 1 46 1;
-#X connect 70 0 43 1;
-#X connect 70 1 44 1;
-#X connect 71 0 63 0;
-#X connect 71 1 44 0;
-#X connect 72 0 39 0;
-#X connect 72 1 44 0;
+#X connect 62 0 61 0;
+#X connect 63 0 64 0;
+#X connect 63 1 64 1;
+#X connect 64 0 19 0;
+#X connect 65 0 28 1;
+#X connect 65 1 60 1;
+#X connect 66 0 33 1;
+#X connect 66 1 46 1;
+#X connect 67 0 43 1;
+#X connect 67 1 44 1;
+#X connect 68 0 62 0;
+#X connect 68 1 44 0;
+#X connect 69 0 39 0;
+#X connect 69 1 44 0;
+#X connect 70 0 65 0;
+#X connect 71 0 7 0;
+#X connect 72 0 71 1;
+#X connect 73 0 62 1;
+#X connect 74 0 67 0;
#X restore 55 236 pd trigger-sample;
#X obj 51 501 r \$0-cutoff;
#X obj 36 561 *~;
@@ -218,33 +222,39 @@ loop(0/1);
#X obj 80 290 s \$0-stop;
#X msg 80 268 stop;
#X obj 80 247 delay 2;
-#X obj 151 201 r \$0-fade;
#X obj 155 249 pack 0 2;
+#X obj 151 201 r \$0-fade-out;
#X connect 0 0 1 0;
#X connect 1 0 3 0;
#X connect 3 0 5 0;
#X connect 3 1 2 0;
#X connect 5 0 8 0;
-#X connect 5 0 10 0;
+#X connect 5 0 9 0;
#X connect 7 0 6 0;
#X connect 8 0 7 0;
-#X connect 9 0 8 1;
-#X connect 9 0 10 1;
-#X connect 10 0 4 0;
+#X connect 9 0 4 0;
+#X connect 10 0 8 1;
+#X connect 10 0 9 1;
#X restore 456 136 pd stop;
#X obj 51 371 r \$0-stop;
#N canvas 0 22 492 417 fade 0;
#X obj 80 49 inlet;
#X obj 80 74 list trim;
#X obj 147 131 outlet;
-#X obj 80 101 route stop;
-#X obj 80 187 s \$0-fade;
-#X obj 80 161 max 0;
+#X obj 80 101 route fade;
+#X obj 80 238 max 0;
+#X obj 80 264 s \$0-fade-in;
+#X obj 80 167 unpack 0 0;
+#X obj 172 238 max 0;
+#X obj 172 264 s \$0-fade-out;
#X connect 0 0 1 0;
#X connect 1 0 3 0;
-#X connect 3 0 5 0;
+#X connect 3 0 6 0;
#X connect 3 1 2 0;
-#X connect 5 0 4 0;
+#X connect 4 0 5 0;
+#X connect 6 0 4 0;
+#X connect 6 1 7 0;
+#X connect 7 0 8 0;
#X restore 456 166 pd fade;
#N canvas 228 198 627 317 LICENSE-BSD 0;
#X text 121 56 This software is copyrighted by Miller Puckette \, Reality
View
14 rj/s_playtable2-help.pd
@@ -49,9 +49,11 @@ of:;
#X text 617 630 does this automatically for you.;
#X text 301 180 original gain \, original pitch \, start at 0 \, play
for 8000ms;
-#X msg 280 461 fade \$1;
-#X floatatom 280 443 5 0 0 0 - - -;
-#X text 344 452 fade in/out time (default is 2msec);
+#X floatatom 277 445 5 0 0 0 - - -;
+#X msg 277 483 fade \$1 \$2;
+#X text 343 462 fade in & out time (default is 0 ms \, 2 ms);
+#X floatatom 330 444 5 0 0 0 - - -;
+#X obj 277 463 pack 0 2;
#X connect 0 0 29 0;
#X connect 2 0 0 0;
#X connect 4 0 33 0;
@@ -71,5 +73,7 @@ for 8000ms;
#X connect 33 0 3 0;
#X connect 33 1 3 1;
#X connect 33 2 10 0;
-#X connect 38 0 33 1;
-#X connect 39 0 38 0;
+#X connect 38 0 42 0;
+#X connect 39 0 33 1;
+#X connect 41 0 42 1;
+#X connect 42 0 39 0;

0 comments on commit e7aad80

Please sign in to comment.
Something went wrong with that request. Please try again.