""

svn path=/trunk/; revision=488

2 files changed, 160 insertions, 154 deletions

diff --git a/externals/grill/vasp/pd-ex/convolve.pd b/externals/grill/vasp/pd-ex/convolve.pd
index b579a8a4..954a5512 100644
--- a/externals/grill/vasp/pd-ex/convolve.pd
+++ b/externals/grill/vasp/pd-ex/convolve.pd
@@ -1,136 +1,142 @@
-#N canvas 410 154 646 423 12;
-#X obj 60 241 bng 50 250 50 0 start_bang empty start 0 -6 160 8 -24198
--1 -1;
-#X text 15 77 load/save/play etc.;
-#X obj 179 125 nbx 8 16 0 1e+08 0 0 len_src empty empty 0 -8 32 12
--225271 -1 -1 4e+06 256;
-#X text 275 137 (defines the size of the result);
-#X obj 177 179 nbx 8 16 0 1e+08 0 0 len_arg empty empty 0 -8 32 12
--225271 -1 -1 4e+06 256;
-#X obj 32 122 wedit buf_src;
-#X obj 30 176 wedit buf_arg;
-#X obj 33 350 wedit buf_res;
-#X text 122 255 start convolution;
-#X obj 177 356 bng 15 250 50 0 empty empty empty 0 -6 32 8 -258699
--1 -1;
-#X obj 201 357 nbx 8 16 0 1e+08 0 0 len_arg empty empty 0 -8 160 12
--261689 -1 -1 4e+06 256;
-#X obj 11 10 cnv 15 600 50 empty empty convolve 10 22 32 24 -260818
--1 0;
-#X text 178 42 http://www.parasitaere-kapazitaeten.net;
-#X text 179 11 fft-based convolution \, (C)2003 Thomas Grill;
-#X text 179 26 needs vasp and wedit;
-#X text 32 329 result buffer;
-#X text 31 102 source buffer;
-#X text 29 157 argument buffer;
-#X text 278 124 length of source (samples);
-#X text 276 178 length of argument (samples);
-#N canvas 0 22 510 318 do 0;
-#X obj 29 215 vasp.u;
-#N canvas 406 75 510 584 convolve 0;
-#X obj 29 195 vasp.!;
-#X obj 107 280 vasp.conv;
-#X obj 107 311 t a a;
-#X obj 185 344 vasp.f?;
-#X obj 188 372 t b f;
-#X obj 108 482 vasp.->;
-#X obj 195 140 vasp.!;
-#X obj 102 170 vasp.f?;
-#X obj 29 131 t a b a;
-#X obj 194 111 vasp;
-#X obj 28 106 vasp;
-#N canvas 0 22 458 308 sf 0;
-#X obj 39 178 outlet;
-#X obj 38 43 inlet;
-#X obj 41 79 vasp.s;
-#X obj 120 43 inlet;
-#X obj 39 118 vasp.f;
-#X connect 1 0 2 0;
-#X connect 2 0 4 0;
-#X connect 3 0 2 1;
-#X connect 3 0 4 1;
-#X connect 4 0 0 0;
-#X restore 194 211 pd sf;
-#N canvas 0 22 452 302 sf 0;
-#X obj 39 178 outlet;
-#X obj 38 43 inlet;
-#X obj 41 79 vasp.s;
-#X obj 120 43 inlet;
-#X obj 39 118 vasp.f;
-#X connect 1 0 2 0;
-#X connect 2 0 4 0;
-#X connect 3 0 2 1;
-#X connect 3 0 4 1;
-#X connect 4 0 0 0;
-#X restore 187 437 pd sf;
-#X obj 107 406 vasp.opt;
-#X obj 210 405 vasp;
-#X obj 26 46 inlet;
-#X obj 132 51 inlet;
-#X obj 221 50 inlet;
-#X obj 313 50 inlet;
-#X obj 107 538 outlet;
-#X text 26 15 bang;
-#X text 126 21 src1;
-#X text 218 20 src2;
-#X text 313 22 dst;
-#X text 10 217 copy to temp;
-#X text 192 158 copy to temp;
-#X text 164 537 dst;
-#X connect 0 0 1 0;
-#X connect 1 0 2 0;
-#X connect 2 0 13 0;
-#X connect 2 1 3 0;
-#X connect 3 0 4 0;
-#X connect 4 0 14 0;
-#X connect 4 1 12 1;
-#X connect 5 1 19 0;
-#X connect 6 0 11 0;
-#X connect 7 0 11 1;
-#X connect 8 0 0 0;
-#X connect 8 1 9 0;
-#X connect 8 2 7 0;
-#X connect 9 0 6 0;
-#X connect 10 0 8 0;
-#X connect 11 0 1 1;
-#X connect 12 0 5 1;
-#X connect 13 0 5 0;
-#X connect 14 0 12 0;
-#X connect 15 0 10 0;
-#X connect 16 0 10 1;
-#X connect 17 0 9 1;
-#X connect 18 0 14 1;
-#X restore 28 186 pd convolve;
-#X obj 26 52 t b b;
-#X obj 43 127 vasp.f;
-#X msg 43 94 vasp buf_src;
-#X msg 154 93 vasp buf_arg;
-#X msg 267 92 vasp buf_res;
-#X obj 306 220 table buf_src 10;
-#X obj 307 242 table buf_arg 10;
-#X obj 307 264 table buf_res 10;
-#X obj 26 23 r start_bang;
-#X obj 143 21 r len_src;
-#X obj 229 24 r len_arg;
-#X obj 153 126 vasp.f;
-#X obj 27 278 outlet;
-#X obj 29 251 vasp.f?;
-#X text 85 215 update buffer;
-#X connect 0 0 15 0;
-#X connect 1 0 0 0;
-#X connect 2 0 1 0;
-#X connect 2 1 4 0;
-#X connect 2 1 5 0;
-#X connect 2 1 6 0;
-#X connect 3 0 1 1;
-#X connect 4 0 3 0;
-#X connect 5 0 13 0;
-#X connect 6 0 1 3;
-#X connect 10 0 2 0;
-#X connect 11 0 3 1;
-#X connect 12 0 13 1;
-#X connect 13 0 1 2;
-#X connect 15 0 14 0;
-#X restore 177 324 pd do;
-#X connect 20 0 9 0;
-#X connect 20 0 10 0;
+#N canvas 292 80 642 419 12;

+#X obj 60 241 bng 50 250 50 0 start_bang empty start 0 -6 128 8 -24198

+-1 -1;

+#X text 15 77 load/save/play etc.;

+#X obj 364 125 nbx 8 16 0 1e+008 0 0 len_src empty empty 0 -8 128 12

+-225271 -1 -1 0 256;

+#X text 367 142 (defines the size of the result);

+#X obj 362 179 nbx 8 16 0 1e+008 0 0 len_arg empty empty 0 -8 128 12

+-225271 -1 -1 0 256;

+#X obj 24 122 wedit buf_src;

+#X obj 23 176 wedit buf_arg;

+#X obj 33 350 wedit buf_res;

+#X text 122 255 start convolution;

+#X obj 177 356 bng 15 250 50 0 empty empty empty 0 -6 0 8 -258699 -1

+-1;

+#X obj 201 357 nbx 8 16 0 1e+008 0 0 len_arg empty empty 0 -8 128 12

+-261689 -1 -1 3.21297e+006 256;

+#X obj 11 10 cnv 15 600 50 empty empty convolve 10 22 0 24 -260818

+-1 0;

+#X text 202 41 http://www.parasitaere-kapazitaeten.net;

+#X text 203 10 fft-based convolution \, (C)2003 Thomas Grill;

+#X text 203 25 needs vasp and wedit;

+#X text 32 329 result buffer;

+#X text 140 121 source buffer;

+#X text 137 175 argument buffer;

+#N canvas 0 0 470 320 do 0;

+#X obj 29 215 vasp.u;

+#N canvas 406 75 399 494 convolve 0;

+#X obj 57 343 vasp.conv;

+#X obj 199 183 vasp.!;

+#X obj 108 191 vasp.f?;

+#X obj 198 154 vasp;

+#X obj 28 69 vasp;

+#N canvas 0 0 458 308 sf 0;

+#X obj 39 178 outlet;

+#X obj 38 43 inlet;

+#X obj 41 79 vasp.s;

+#X obj 120 43 inlet;

+#X obj 39 118 vasp.f;

+#X connect 1 0 2 0;

+#X connect 2 0 4 0;

+#X connect 3 0 2 1;

+#X connect 3 0 4 1;

+#X connect 4 0 0 0;

+#X restore 197 254 pd sf;

+#X obj 59 380 vasp.opt;

+#X obj 68 227 vasp;

+#X obj 29 39 inlet;

+#X obj 132 51 inlet;

+#X obj 221 50 inlet;

+#X obj 313 50 inlet;

+#X obj 45 458 outlet;

+#X text 26 15 bang;

+#X text 126 21 src1;

+#X text 218 20 src2;

+#X text 313 22 dst;

+#X text 196 201 copy to temp;

+#X text 102 457 dst;

+#N canvas 0 0 454 304 sf 0;

+#X obj 39 178 outlet;

+#X obj 38 43 inlet;

+#X obj 41 79 vasp.s;

+#X obj 120 43 inlet;

+#X obj 39 118 vasp.f;

+#X connect 1 0 2 0;

+#X connect 2 0 4 0;

+#X connect 3 0 2 1;

+#X connect 3 0 4 1;

+#X connect 4 0 0 0;

+#X restore 68 255 pd sf;

+#X obj 30 296 vasp.->;

+#X obj 31 408 vasp.radio;

+#X obj 29 94 t a b a;

+#X connect 0 0 6 0;

+#X connect 1 0 5 0;

+#X connect 2 0 5 1;

+#X connect 2 0 19 1;

+#X connect 3 0 1 0;

+#X connect 4 0 22 0;

+#X connect 5 0 0 1;

+#X connect 6 0 21 0;

+#X connect 7 0 19 0;

+#X connect 8 0 4 0;

+#X connect 9 0 4 1;

+#X connect 10 0 3 1;

+#X connect 11 0 7 1;

+#X connect 19 0 20 1;

+#X connect 20 1 0 0;

+#X connect 21 1 12 0;

+#X connect 22 0 20 0;

+#X connect 22 1 3 0;

+#X connect 22 1 7 0;

+#X connect 22 2 2 0;

+#X restore 28 186 pd convolve;

+#X obj 26 52 t b b;

+#X msg 154 93 vasp buf_arg;

+#X msg 267 92 vasp buf_res;

+#X obj 306 220 table buf_src 10;

+#X obj 307 242 table buf_arg 10;

+#X obj 307 264 table buf_res 10;

+#X obj 26 23 r start_bang;

+#X obj 143 21 r len_src;

+#X obj 229 24 r len_arg;

+#X obj 27 278 outlet;

+#X obj 29 251 vasp.f?;

+#X text 85 215 update buffer;

+#X obj 147 159 vasp.f;

+#X obj 43 157 vasp.f;

+#X msg 45 93 vasp buf_src;

+#X obj 141 51 r off_src;

+#X obj 227 54 r off_arg;

+#X obj 43 125 vasp.o;

+#X obj 147 127 vasp.o;

+#X connect 0 0 12 0;

+#X connect 1 0 0 0;

+#X connect 2 0 1 0;

+#X connect 2 1 3 0;

+#X connect 2 1 4 0;

+#X connect 2 1 16 0;

+#X connect 3 0 20 0;

+#X connect 4 0 1 3;

+#X connect 8 0 2 0;

+#X connect 9 0 15 1;

+#X connect 10 0 14 1;

+#X connect 12 0 11 0;

+#X connect 14 0 1 2;

+#X connect 15 0 1 1;

+#X connect 16 0 19 0;

+#X connect 17 0 19 1;

+#X connect 18 0 20 1;

+#X connect 19 0 15 0;

+#X connect 20 0 14 0;

+#X restore 177 324 pd do;

+#X obj 267 125 nbx 8 16 0 1e+008 0 0 off_src empty empty 0 -8 128 12

+-225271 -1 -1 0 256;

+#X obj 265 179 nbx 8 16 0 1e+008 0 0 off_arg empty empty 0 -8 128 12

+-225271 -1 -1 0 256;

+#X text 383 103 length;

+#X text 288 100 offset;

+#X text 286 78 range in samples;

+#X connect 18 0 9 0;

+#X connect 18 0 10 0;

diff --git a/externals/grill/vasp/pd-ex/freeze1.pd b/externals/grill/vasp/pd-ex/freeze1.pd
index c24eeb61..0e1cbd7d 100644
--- a/externals/grill/vasp/pd-ex/freeze1.pd
+++ b/externals/grill/vasp/pd-ex/freeze1.pd
@@ -1,5 +1,5 @@
-#N canvas 33 61 975 511 12;

-#N canvas 387 42 567 656 freeze 0;

+#N canvas 33 61 977 513 12;

+#N canvas 387 42 569 658 freeze 0;

 #X obj 26 130 vasp.split 2;

 #X obj 27 404 vasp.join 2;

 #X obj 27 74 vasp.cfft @detach 1;

@@ -17,27 +17,27 @@
 #X obj 381 17 inlet;

 #X obj 162 591 outlet;

 #X obj 29 536 vasp.opt;

-#N canvas 0 0 456 306 non0 0;

-#X obj 26 162 outlet;

-#X obj 27 105 length;

-#X obj 28 133 / 1;

+#N canvas 238 212 458 308 non0 0;

+#X obj 58 187 outlet;

+#X obj 60 158 / 1;

 #X obj 26 21 inlet;

 #X obj 26 49 t a a;

-#X obj 179 80 vasp.f?;

-#X obj 26 80 vasp.?? @detach 1;

-#X connect 1 0 2 0;

-#X connect 2 0 0 0;

-#X connect 3 0 4 0;

-#X connect 4 0 6 0;

-#X connect 4 1 5 0;

-#X connect 5 0 2 1;

-#X connect 6 0 1 0;

+#X obj 234 77 vasp.f?;

+#X obj 26 80 vasp.!= 0 @detach 1;

+#X obj 27 109 vasp.sum?;

+#X connect 1 0 0 0;

+#X connect 2 0 3 0;

+#X connect 3 0 5 0;

+#X connect 3 1 4 0;

+#X connect 4 0 1 1;

+#X connect 5 0 6 0;

+#X connect 6 1 1 0;

 #X restore 161 498 pd non0;

 #X obj 29 509 vasp.n 0;

 #X obj 302 45 + 100;

 #X obj 326 117 expr pow(2. \, -$f1/1200);

 #X obj 300 76 dbtorms;

-#N canvas 445 282 474 324 cplx 0;

+#N canvas 445 282 476 326 cplx 0;

 #X obj 19 229 vasp.join;

 #X obj 19 73 t a b a;

 #X obj 149 137 vasp.f?;

@@ -186,7 +186,7 @@
 #X obj 105 115 nbx 12 18 0 1e+008 0 1 empty empty length(frames) 0

 -8 0 12 -225271 -1 -1 1e+006 256;

 #X obj 85 368 nbx 9 14 -1e+037 1e+037 0 0 empty empty spectral_density

-0 -6 0 10 -262131 -1 -1 0.009812 256;

+0 -6 0 10 -262131 -1 -1 0 256;

 #X obj 332 197 cnv 15 100 20 empty empty play_src 5 8 0 10 -261681

 -66577 0;

 #X obj 447 197 cnv 15 100 20 empty empty read_src 5 8 0 10 -261681

@@ -250,7 +250,7 @@
 #X connect 3 0 0 1;

 #X connect 3 1 4 0;

 #X restore 614 251 pd playdst;

-#N canvas 249 202 527 470 copy 0;

+#N canvas 249 202 529 472 copy 0;

 #X obj 27 26 inlet;

 #X obj 27 51 t b b;

 #X obj 316 19 inlet;