diff options
31 files changed, 1193 insertions, 532 deletions
diff --git a/externals/grill/vasp/pd-ex/enhance.pd b/externals/grill/vasp/pd-ex/enhance.pd new file mode 100644 index 00000000..05e8ef8a --- /dev/null +++ b/externals/grill/vasp/pd-ex/enhance.pd @@ -0,0 +1,478 @@ +#N canvas 215 47 982 666 12; +#X obj 85 323 nbx 6 18 -100 0 0 1 empty empty spectral_gate(dB) 0 -8 +0 12 -225271 -1 -1 -18 256; +#X obj 85 366 nbx 7 18 -10000 10000 0 1 empty empty transpose(cents) +0 -8 0 12 -225271 -1 -1 0 256; +#X obj 463 303 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 744 304 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#N canvas 0 22 476 326 save 0; +#X obj 30 198 soundfiler; +#X obj 30 134 symbol; +#X obj 29 106 savepanel; +#X obj 32 8 inlet; +#X obj 27 232 outlet; +#X obj 30 42 route new again; +#X obj 29 73 t b; +#X obj 84 73 t b; +#X msg 27 169 write -bytes 3 -wave \$1 dst; +#X connect 0 0 4 0; +#X connect 1 0 8 0; +#X connect 2 0 1 0; +#X connect 3 0 5 0; +#X connect 5 0 6 0; +#X connect 5 1 7 0; +#X connect 6 0 2 0; +#X connect 7 0 1 0; +#X connect 8 0 0 0; +#X restore 744 275 pd save; +#N canvas 205 58 359 496 open 0; +#X obj 19 96 openpanel; +#X obj 21 6 inlet; +#X obj 15 390 outlet; +#X obj 20 123 symbol; +#X obj 17 345 vasp.u; +#X obj 17 233 t b; +#X obj 22 33 route new again; +#X obj 19 66 t b; +#X obj 74 66 t b; +#X msg 16 281 vasp src; +#X obj 74 230 s \$0-srclen; +#X obj 15 313 vasp.opt; +#X obj 18 192 sndfiler; +#X msg 19 152 read -resize \$1 src; +#X connect 0 0 3 0; +#X connect 1 0 6 0; +#X connect 3 0 13 0; +#X connect 4 0 2 0; +#X connect 5 0 9 0; +#X connect 6 0 7 0; +#X connect 6 1 8 0; +#X connect 7 0 0 0; +#X connect 8 0 3 0; +#X connect 9 0 11 0; +#X connect 11 0 4 0; +#X connect 12 0 5 0; +#X connect 12 0 10 0; +#X connect 13 0 12 0; +#X restore 463 275 pd open; +#X msg 396 247 stop; +#N canvas 0 22 450 300 graph10 0; +#X array src 5.99654e+06 float 0; +#X coords 0 1 5.99654e+06 -1 600 150 1; +#X restore 322 20 graph; +#X msg 462 247 new; +#X msg 497 247 again; +#X msg 743 247 new; +#X msg 776 247 again; +#X msg 347 247 play; +#X obj 8 9 cnv 15 300 48 empty empty enhance 5 14 0 20 -233017 -66577 +0; +#X obj 18 108 bng 25 250 50 0 empty empty do! 0 -6 0 12 -24198 -1 -1 +; +#X obj 107 115 nbx 12 18 0 1e+08 0 1 empty empty length(frames) 0 -8 +0 12 -225271 -1 -1 1e+06 256; +#X obj 347 222 cnv 15 100 20 empty empty play_src 5 8 0 10 -261681 +-66577 0; +#X obj 462 222 cnv 15 100 20 empty empty read_src 5 8 0 10 -261681 +-66577 0; +#X obj 742 222 cnv 15 100 20 empty empty write_dst 5 8 0 10 -261681 +-66577 0; +#N canvas 0 22 450 300 graph10 0; +#X array dst 1e+06 float 0; +#X coords 0 1 999999 -1 600 150 1; +#X restore 324 392 graph; +#X msg 678 248 stop; +#X msg 629 248 play; +#X obj 629 223 cnv 15 100 20 empty empty play_dst 5 8 0 10 -261681 +-66577 0; +#N canvas 0 22 519 371 playsrc 0; +#X obj 17 274 dac~; +#X obj 19 21 inlet; +#X obj 17 49 route play; +#X obj 18 197 tabplay~ src; +#X obj 338 23 r \$0-srclen; +#X obj 166 22 r \$0-offs; +#X obj 249 22 r \$0-len; +#X obj 338 48 t b f; +#X obj 166 94 *; +#X obj 248 93 *; +#X obj 75 132 pack 0 0; +#X obj 19 81 t b; +#X obj 77 105 loadbang; +#X obj 113 274 outlet; +#X obj 19 159 any; +#X obj 18 237 *~; +#X obj 451 21 inlet; +#X obj 451 50 pack 0 30; +#X obj 451 78 line~; +#X connect 1 0 2 0; +#X connect 2 0 11 0; +#X connect 2 1 3 0; +#X connect 3 0 15 0; +#X connect 3 1 13 0; +#X connect 4 0 7 0; +#X connect 5 0 8 0; +#X connect 6 0 9 0; +#X connect 7 0 8 0; +#X connect 7 0 9 0; +#X connect 7 1 8 1; +#X connect 7 1 9 1; +#X connect 8 0 10 0; +#X connect 9 0 10 1; +#X connect 10 0 14 1; +#X connect 11 0 14 0; +#X connect 12 0 10 0; +#X connect 14 0 3 0; +#X connect 15 0 0 0; +#X connect 15 0 0 1; +#X connect 16 0 17 0; +#X connect 17 0 18 0; +#X connect 18 0 15 1; +#X restore 347 275 pd playsrc; +#N canvas 0 22 499 351 playdst 0; +#X obj 23 199 dac~; +#X obj 19 21 inlet; +#X obj 22 51 route play; +#X obj 21 83 tabplay~ dst; +#X obj 113 200 outlet; +#X obj 27 147 *~; +#X obj 171 27 inlet; +#X obj 171 56 pack 0 30; +#X obj 171 84 line~; +#X connect 1 0 2 0; +#X connect 2 0 3 0; +#X connect 2 1 3 0; +#X connect 3 0 5 0; +#X connect 3 1 4 0; +#X connect 5 0 0 0; +#X connect 5 0 0 1; +#X connect 6 0 7 0; +#X connect 7 0 8 0; +#X connect 8 0 5 1; +#X restore 629 276 pd playdst; +#N canvas 249 202 587 530 copy 0; +#X obj 27 26 inlet; +#X obj 27 51 t b b; +#X obj 316 19 inlet; +#X obj 25 361 outlet; +#X obj 26 81 vasp src; +#X obj 26 229 vasp.f; +#X obj 26 201 vasp.o; +#X obj 128 31 r \$0-offs; +#X obj 211 31 r \$0-len; +#X obj 316 87 f 1e+06; +#X obj 366 21 loadbang; +#X obj 84 169 *; +#X obj 117 169 *; +#X obj 82 139 vasp.f?; +#X obj 27 109 t a a; +#X obj 27 259 vasp.sync; +#X obj 26 328 vasp.f -1; +#X text 167 288 copy src to dst; +#X text 108 328 take all dst; +#X text 307 213 resize dst buffer; +#X obj 26 287 vasp.-> @detach 1; +#X text 340 139 set to zero; +#X obj 184 140 vasp.= 0 @ref dst @detach 1; +#X obj 183 194 vasp.s @detach 1; +#X connect 0 0 1 0; +#X connect 1 0 4 0; +#X connect 1 1 22 0; +#X connect 2 0 9 0; +#X connect 4 0 14 0; +#X connect 5 0 15 0; +#X connect 6 0 5 0; +#X connect 7 0 11 1; +#X connect 8 0 12 1; +#X connect 9 0 23 1; +#X connect 10 0 9 0; +#X connect 11 0 6 1; +#X connect 12 0 5 1; +#X connect 13 0 11 0; +#X connect 13 0 12 0; +#X connect 14 0 6 0; +#X connect 14 1 13 0; +#X connect 15 0 20 0; +#X connect 15 1 20 1; +#X connect 16 0 3 0; +#X connect 20 1 16 0; +#X connect 22 0 23 0; +#X connect 23 0 15 1; +#X restore 18 159 pd copy; +#X text 82 155 copy and resize; +#X obj 323 170 hsl 600 15 0 1 0 1 \$0-r2 empty empty -2 -6 0 8 -262131 +-1 -1 51900 0; +#X obj 323 5 hsl 600 15 0 1 0 1 \$0-r1 empty empty -2 -6 0 8 -262131 +-1 -1 34600 0; +#N canvas 148 330 313 273 sel 0; +#X obj 30 25 r \$0-r1; +#X obj 110 25 r \$0-r2; +#X obj 30 100 min; +#X obj 113 100 max; +#X obj 30 53 t f f; +#X obj 110 50 t b b f; +#X obj 113 130 -; +#X obj 27 190 s \$0-offs; +#X obj 113 190 s \$0-len; +#X obj 114 161 * -1; +#X connect 0 0 4 0; +#X connect 1 0 5 0; +#X connect 2 0 6 0; +#X connect 2 0 7 0; +#X connect 3 0 6 1; +#X connect 4 0 2 0; +#X connect 4 1 3 0; +#X connect 5 0 2 0; +#X connect 5 1 3 0; +#X connect 5 2 3 1; +#X connect 5 2 2 1; +#X connect 6 0 9 0; +#X connect 9 0 8 0; +#X restore 872 223 pd sel; +#X obj 85 410 nbx 7 18 0.01 10 1 1 empty empty power 0 -8 0 12 -225271 +-1 -1 1.37078 256; +#X obj 346 302 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X obj 628 302 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X text 165 324 -100... no gate; +#N canvas 0 22 482 332 normalize 0; +#X obj 127 29 loadbang; +#X msg 127 54 detach 1; +#X text 120 75 no attributes yet; +#X obj 39 115 vasp.opt; +#X obj 38 149 vasp.u; +#X obj 39 32 inlet; +#X obj 38 184 outlet; +#X connect 0 0 1 0; +#X connect 1 0 3 0; +#X connect 3 0 4 0; +#X connect 4 0 6 0; +#X connect 5 0 3 0; +#X restore 18 575 pd normalize; +#X obj 608 245 vsl 15 70 0.01 10 1 1 empty empty empty 0 -8 0 8 -262144 +-1 -1 4400 1; +#X obj 324 247 vsl 15 70 0.01 10 1 1 empty empty empty 0 -8 0 8 -262144 +-1 -1 5600 1; +#X text 11 37 (C)2007 Thomas Grill; +#N canvas 293 22 655 744 enhance 0; +#X obj 27 137 vasp.split 2; +#X obj 31 415 vasp.join 2; +#X obj 27 74 vasp.cfft @detach 1; +#X obj 33 471 vasp.c!fft @detach 1; +#X obj 25 13 inlet; +#X obj 91 230 * 0.01; +#X obj 302 17 inlet; +#X obj 26 107 vasp.polar @detach 1; +#X obj 33 442 vasp.rect @detach 1; +#X obj 29 321 vasp.gate @detach 1; +#X obj 30 386 vasp.sync; +#X obj 91 208 vasp.max? @detach 1; +#X obj 381 17 inlet; +#X obj 437 692 outlet; +#N canvas 238 212 484 334 non0 0; +#X obj 58 254 outlet; +#X obj 60 158 / 1; +#X obj 26 11 inlet; +#X obj 26 39 t a a; +#X obj 234 77 vasp.f?; +#X obj 46 98 vasp.!= 0 @detach 1; +#X obj 27 124 vasp.sum?; +#X obj 60 195 rmstodb; +#X obj 60 225 - 100; +#X obj 47 71 vasp.!; +#X connect 1 0 7 0; +#X connect 2 0 3 0; +#X connect 3 0 6 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 connect 7 0 8 0; +#X connect 8 0 0 0; +#X connect 9 0 5 0; +#X restore 436 660 pd non0; +#X obj 34 511 vasp.n 0; +#X obj 302 45 + 100; +#X obj 300 76 dbtorms; +#N canvas 445 282 498 348 cplx 0; +#X obj 19 229 vasp.join; +#X obj 19 73 t a b a; +#X obj 149 137 vasp.f?; +#X obj 19 14 inlet; +#X obj 19 258 outlet; +#X text 216 135 get length of source; +#X text 225 181 make immediate; +#X text 225 196 initialized to 0; +#X text 101 230 make complex vasp; +#X obj 87 176 vasp.! @detach 1; +#X obj 19 203 vasp.sync; +#X connect 0 0 4 0; +#X connect 1 0 10 0; +#X connect 1 1 9 0; +#X connect 1 2 2 0; +#X connect 2 0 9 1; +#X connect 3 0 1 0; +#X connect 9 0 10 1; +#X connect 10 0 0 0; +#X connect 10 1 0 1; +#X restore 27 43 pd cplx; +#X text 281 166 resample; +#X text 146 230 find spectral peak; +#X text 203 320 gate spectrum below threshold; +#X text 107 387 wait for threads to finish; +#X text 193 75 FFT; +#X text 195 100 -> polar; +#X text 192 439 -> cartesian; +#X text 202 467 inverse FFT; +#X text 440 637 get spectral density; +#X obj 28 168 vasp.xtilt 1 @detach 1 @inter 2; +#X obj 30 347 vasp.pow @detach 1; +#X obj 441 21 inlet; +#X text 194 347 treat spectrum exponentially; +#X obj 28 238 t a a; +#X obj 28 288 vasp; +#X obj 89 257 t b f; +#X obj 381 51 / -1200; +#X obj 381 77 t b f; +#X obj 382 129 pow; +#X msg 382 103 2; +#X obj 73 542 t a a; +#X obj 74 640 vasp.* @detach 1; +#X obj 108 573 vasp.flp; +#X obj 33 678 outlet; +#X connect 0 0 28 0; +#X connect 0 1 10 1; +#X connect 1 0 8 0; +#X connect 2 0 7 0; +#X connect 3 0 15 0; +#X connect 4 0 18 0; +#X connect 5 0 34 0; +#X connect 6 0 16 0; +#X connect 7 0 0 0; +#X connect 8 0 3 0; +#X connect 9 0 29 0; +#X connect 10 0 1 0; +#X connect 10 1 1 1; +#X connect 11 0 5 0; +#X connect 12 0 35 0; +#X connect 14 0 13 0; +#X connect 15 0 42 0; +#X connect 16 0 17 0; +#X connect 17 0 5 1; +#X connect 18 0 2 0; +#X connect 28 0 32 0; +#X connect 29 0 10 0; +#X connect 29 0 14 0; +#X connect 30 0 29 1; +#X connect 32 0 11 0; +#X connect 32 1 33 1; +#X connect 33 0 9 0; +#X connect 34 0 33 0; +#X connect 34 1 9 1; +#X connect 35 0 36 0; +#X connect 36 0 38 0; +#X connect 36 1 37 1; +#X connect 37 0 28 1; +#X connect 38 0 37 0; +#X connect 39 0 40 0; +#X connect 39 1 41 0; +#X connect 40 0 42 0; +#X restore 17 440 pd enhance; +#N canvas 0 22 501 392 expand 0; +#X obj 41 33 inlet; +#X obj 41 313 outlet; +#X obj 42 64 t a a; +#X obj 76 93 vasp.!; +#X obj 41 280 vasp.* @detach 1; +#X obj 41 247 vasp.sync; +#X obj 77 167 vasp.flp @detach 1; +#X obj 218 35 inlet; +#X obj 76 202 vasp.pow @detach 1; +#X obj 376 37 inlet; +#X text 229 165 make a smooth volume curve; +#X obj 77 136 vasp.abs @detach 1; +#X connect 0 0 2 0; +#X connect 2 0 5 0; +#X connect 2 1 3 0; +#X connect 3 0 11 0; +#X connect 4 0 1 0; +#X connect 5 0 4 0; +#X connect 5 1 4 1; +#X connect 6 0 8 0; +#X connect 7 0 6 1; +#X connect 8 0 5 1; +#X connect 9 0 8 1; +#X connect 11 0 6 0; +#X restore 18 275 pd expand; +#X obj 82 204 nbx 7 18 1 1e+06 1 1 empty empty low_pass_(samples) 0 +-8 0 12 -225271 -1 -1 220.673 256; +#X obj 82 240 nbx 7 18 -3 5 0 1 empty empty power 0 -8 0 12 -225271 +-1 -1 0 256; +#N canvas 0 22 517 408 expand 0; +#X obj 41 33 inlet; +#X obj 41 313 outlet; +#X obj 42 64 t a a; +#X obj 76 93 vasp.!; +#X obj 41 280 vasp.* @detach 1; +#X obj 41 247 vasp.sync; +#X obj 77 167 vasp.flp @detach 1; +#X obj 218 35 inlet; +#X obj 76 202 vasp.pow @detach 1; +#X obj 376 37 inlet; +#X text 229 165 make a smooth volume curve; +#X obj 77 136 vasp.abs @detach 1; +#X connect 0 0 2 0; +#X connect 2 0 5 0; +#X connect 2 1 3 0; +#X connect 3 0 11 0; +#X connect 4 0 1 0; +#X connect 5 0 4 0; +#X connect 5 1 4 1; +#X connect 6 0 8 0; +#X connect 7 0 6 1; +#X connect 8 0 5 1; +#X connect 9 0 8 1; +#X connect 11 0 6 0; +#X restore 18 546 pd expand; +#X obj 84 482 nbx 7 18 1 1e+06 1 1 empty empty low_pass_(samples) 0 +-8 0 12 -225271 -1 -1 5633.54 256; +#X obj 84 518 nbx 7 18 -3 10 0 1 empty empty power 0 -8 0 12 -225271 +-1 -1 3 256; +#X obj 17 614 bng 25 250 50 0 empty empty ready 0 -6 0 12 -24198 -1 +-1; +#X text 172 240 0... no change; +#X text 172 519 0... no change; +#X text 174 410 1... no change; +#X connect 0 0 38 1; +#X connect 1 0 38 2; +#X connect 4 0 3 0; +#X connect 5 0 2 0; +#X connect 6 0 23 0; +#X connect 8 0 5 0; +#X connect 9 0 5 0; +#X connect 10 0 4 0; +#X connect 11 0 4 0; +#X connect 12 0 23 0; +#X connect 14 0 25 0; +#X connect 15 0 25 1; +#X connect 20 0 24 0; +#X connect 21 0 24 0; +#X connect 23 0 31 0; +#X connect 24 0 32 0; +#X connect 25 0 39 0; +#X connect 30 0 38 3; +#X connect 31 0 12 0; +#X connect 32 0 21 0; +#X connect 34 0 45 0; +#X connect 35 0 24 1; +#X connect 36 0 23 1; +#X connect 38 0 42 0; +#X connect 39 0 38 0; +#X connect 40 0 39 1; +#X connect 41 0 39 2; +#X connect 42 0 34 0; +#X connect 43 0 42 1; +#X connect 44 0 42 2; diff --git a/externals/grill/vasp/pd-ex/freeze1.pd b/externals/grill/vasp/pd-ex/freeze.pd index e2e485eb..bc9aaa41 100644 --- a/externals/grill/vasp/pd-ex/freeze1.pd +++ b/externals/grill/vasp/pd-ex/freeze.pd @@ -1,11 +1,10 @@ -#N canvas 4 72 962 506 12; -#N canvas 293 22 619 708 freeze 0; +#N canvas 268 127 978 522 12; +#N canvas 293 22 643 732 freeze 0; #X obj 27 137 vasp.split 2; #X obj 30 463 vasp.join 2; #X obj 27 74 vasp.cfft @detach 1; #X obj 32 519 vasp.c!fft @detach 1; #X obj 25 13 inlet; -#X obj 32 617 outlet; #X obj 91 230 * 0.01; #X obj 302 17 inlet; #X obj 26 107 vasp.polar @detach 1; @@ -16,7 +15,7 @@ #X obj 91 208 vasp.max? @detach 1; #X obj 381 17 inlet; #X obj 167 619 outlet; -#N canvas 238 212 476 326 non0 0; +#N canvas 238 212 484 334 non0 0; #X obj 58 254 outlet; #X obj 60 158 / 1; #X obj 26 11 inlet; @@ -40,9 +39,8 @@ #X restore 164 553 pd non0; #X obj 32 564 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 490 340 cplx 0; +#N canvas 445 282 498 348 cplx 0; #X obj 19 229 vasp.join; #X obj 19 73 t a b a; #X obj 149 137 vasp.f?; @@ -78,60 +76,61 @@ #X obj 30 347 vasp.pow @detach 1; #X obj 441 21 inlet; #X text 194 347 treat spectrum exponentially; -#X obj 398 444 loadbang; -#X msg 398 469 detach 1; -#X text 105 591 normalize result; -#X text 391 490 no attributes yet; #X obj 28 238 t a a; #X obj 28 288 vasp; #X obj 89 257 t b f; #X obj 95 399 vasp.* 3.14159 @detach 1; -#X obj 32 591 vasp/opt; -#X connect 0 0 32 0; -#X connect 0 1 11 0; -#X connect 1 0 9 0; -#X connect 2 0 8 0; -#X connect 3 0 17 0; -#X connect 4 0 21 0; -#X connect 6 0 42 0; -#X connect 7 0 18 0; -#X connect 8 0 0 0; -#X connect 9 0 3 0; -#X connect 10 0 33 0; -#X connect 11 0 43 0; -#X connect 12 0 1 0; -#X connect 12 1 1 1; -#X connect 13 0 6 0; -#X connect 14 0 19 0; -#X connect 16 0 15 0; -#X connect 17 0 44 0; -#X connect 18 0 20 0; -#X connect 19 0 32 1; -#X connect 20 0 6 1; -#X connect 21 0 2 0; -#X connect 32 0 40 0; -#X connect 33 0 12 0; -#X connect 33 0 16 0; -#X connect 34 0 33 1; -#X connect 36 0 37 0; -#X connect 37 0 44 0; -#X connect 40 0 13 0; -#X connect 40 1 41 1; -#X connect 41 0 10 0; -#X connect 42 0 41 0; -#X connect 42 1 10 1; -#X connect 43 0 12 1; -#X connect 44 0 5 0; +#X obj 381 51 / -1200; +#X obj 381 77 t b f; +#X obj 382 129 pow; +#X msg 382 103 2; +#X obj 33 617 vasp.u; +#X connect 0 0 30 0; +#X connect 0 1 10 0; +#X connect 1 0 8 0; +#X connect 2 0 7 0; +#X connect 3 0 16 0; +#X connect 4 0 19 0; +#X connect 5 0 36 0; +#X connect 6 0 17 0; +#X connect 7 0 0 0; +#X connect 8 0 3 0; +#X connect 9 0 31 0; +#X connect 10 0 37 0; +#X connect 11 0 1 0; +#X connect 11 1 1 1; +#X connect 12 0 5 0; +#X connect 13 0 38 0; +#X connect 15 0 14 0; +#X connect 16 0 42 0; +#X connect 17 0 18 0; +#X connect 18 0 5 1; +#X connect 19 0 2 0; +#X connect 30 0 34 0; +#X connect 31 0 11 0; +#X connect 31 0 15 0; +#X connect 32 0 31 1; +#X connect 34 0 12 0; +#X connect 34 1 35 1; +#X connect 35 0 9 0; +#X connect 36 0 35 0; +#X connect 36 1 9 1; +#X connect 37 0 11 1; +#X connect 38 0 39 0; +#X connect 39 0 41 0; +#X connect 39 1 40 1; +#X connect 40 0 30 1; +#X connect 41 0 40 0; #X restore 18 331 pd freeze; -#X obj 104 214 nbx 6 18 -100 0 0 1 empty empty spectral_gate(dB) 0 --8 0 12 -225271 -1 -1 -20 256; -#X obj 104 257 nbx 7 18 -10000 10000 0 1 empty empty transpose(cents) +#X obj 73 210 nbx 6 18 -100 0 0 1 empty empty spectral_gate(dB) 0 -8 +0 12 -225271 -1 -1 -95 256; +#X obj 73 253 nbx 7 18 -10000 10000 0 1 empty empty transpose(cents) 0 -8 0 12 -225271 -1 -1 0 256; #X obj 448 278 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 729 279 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#N canvas 0 22 472 322 save 0; +#N canvas 0 22 476 326 save 0; #X obj 30 198 soundfiler; #X obj 30 134 symbol; #X obj 29 106 savepanel; @@ -151,8 +150,7 @@ #X connect 7 0 1 0; #X connect 8 0 0 0; #X restore 729 250 pd save; -#N canvas 205 58 339 476 open 0; -#X obj 18 192 soundfiler; +#N canvas 205 58 359 496 open 0; #X obj 19 96 openpanel; #X obj 21 6 inlet; #X obj 15 390 outlet; @@ -162,29 +160,30 @@ #X obj 22 33 route new again; #X obj 19 66 t b; #X obj 74 66 t b; -#X msg 19 152 read -resize \$1 src; #X msg 16 281 vasp src; #X obj 74 230 s \$0-srclen; -#X obj 15 313 vasp/opt; -#X connect 0 0 6 0; -#X connect 0 0 12 0; -#X connect 1 0 4 0; -#X connect 2 0 7 0; -#X connect 4 0 10 0; -#X connect 5 0 3 0; -#X connect 6 0 11 0; -#X connect 7 0 8 0; -#X connect 7 1 9 0; -#X connect 8 0 1 0; -#X connect 9 0 4 0; -#X connect 10 0 0 0; -#X connect 11 0 13 0; -#X connect 13 0 5 0; +#X obj 15 313 vasp.opt; +#X obj 18 192 sndfiler; +#X msg 19 152 read -resize \$1 src; +#X connect 0 0 3 0; +#X connect 1 0 6 0; +#X connect 3 0 13 0; +#X connect 4 0 2 0; +#X connect 5 0 9 0; +#X connect 6 0 7 0; +#X connect 6 1 8 0; +#X connect 7 0 0 0; +#X connect 8 0 3 0; +#X connect 9 0 11 0; +#X connect 11 0 4 0; +#X connect 12 0 5 0; +#X connect 12 0 10 0; +#X connect 13 0 12 0; #X restore 448 250 pd open; #X msg 381 222 stop; #N canvas 0 22 450 300 graph10 0; -#X array src 165888 float 0; -#X coords 0 1 165887 -1 600 150 1; +#X array src 2.2491e+07 float 0; +#X coords 0 1 2.2491e+07 -1 600 150 1; #X restore 322 20 graph; #X msg 447 222 new; #X msg 482 222 again; @@ -194,12 +193,12 @@ #X obj 8 9 cnv 15 300 48 empty empty freeze 5 14 0 20 -233017 -66577 0; #X text 128 13 make static sound; -#X obj 18 108 bng 25 250 50 0 empty empty empty 0 -6 0 8 -24198 -1 --1; +#X obj 18 108 bng 25 250 50 0 empty empty do! 0 -6 0 12 -24198 -1 -1 +; #X obj 107 115 nbx 12 18 0 1e+08 0 1 empty empty length(frames) 0 -8 0 12 -225271 -1 -1 1e+06 256; -#X obj 85 368 nbx 9 14 -1e+37 1e+37 0 0 empty empty spectral_density(dB) -0 -6 0 10 -262131 -1 -1 0 256; +#X obj 19 375 nbx 9 14 -1e+37 1e+37 0 0 empty empty spectral_density(dB) +0 -6 0 10 -262131 -1 -1 -33.6745 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 @@ -214,8 +213,8 @@ #X msg 614 223 play; #X obj 614 198 cnv 15 100 20 empty empty play_dst 5 8 0 10 -261681 -66577 0; -#N canvas 0 22 507 359 playsrc 0; -#X obj 18 245 dac~; +#N canvas 0 22 519 371 playsrc 0; +#X obj 17 274 dac~; #X obj 19 21 inlet; #X obj 17 49 route play; #X obj 18 197 tabplay~ src; @@ -227,15 +226,18 @@ #X obj 248 93 *; #X obj 75 132 pack 0 0; #X obj 19 81 t b; -#X obj 19 159 lister; #X obj 77 105 loadbang; -#X obj 109 239 outlet; +#X obj 113 274 outlet; +#X obj 19 159 any; +#X obj 18 237 *~; +#X obj 451 21 inlet; +#X obj 451 50 pack 0 30; +#X obj 451 78 line~; #X connect 1 0 2 0; #X connect 2 0 11 0; #X connect 2 1 3 0; -#X connect 3 0 0 0; -#X connect 3 0 0 1; -#X connect 3 1 14 0; +#X connect 3 0 15 0; +#X connect 3 1 13 0; #X connect 4 0 7 0; #X connect 5 0 8 0; #X connect 6 0 9 0; @@ -245,25 +247,38 @@ #X connect 7 1 9 1; #X connect 8 0 10 0; #X connect 9 0 10 1; -#X connect 10 0 12 1; -#X connect 11 0 12 0; -#X connect 12 0 3 0; -#X connect 13 0 10 0; +#X connect 10 0 14 1; +#X connect 11 0 14 0; +#X connect 12 0 10 0; +#X connect 14 0 3 0; +#X connect 15 0 0 0; +#X connect 15 0 0 1; +#X connect 16 0 17 0; +#X connect 17 0 18 0; +#X connect 18 0 15 1; #X restore 332 250 pd playsrc; -#N canvas 0 22 487 339 playdst 0; -#X obj 21 118 dac~; +#N canvas 0 22 499 351 playdst 0; +#X obj 23 199 dac~; #X obj 19 21 inlet; #X obj 22 51 route play; #X obj 21 83 tabplay~ dst; -#X obj 98 118 outlet; +#X obj 113 200 outlet; +#X obj 27 147 *~; +#X obj 171 27 inlet; +#X obj 171 56 pack 0 30; +#X obj 171 84 line~; #X connect 1 0 2 0; #X connect 2 0 3 0; #X connect 2 1 3 0; -#X connect 3 0 0 0; -#X connect 3 0 0 1; +#X connect 3 0 5 0; #X connect 3 1 4 0; +#X connect 5 0 0 0; +#X connect 5 0 0 1; +#X connect 6 0 7 0; +#X connect 7 0 8 0; +#X connect 8 0 5 1; #X restore 614 251 pd playdst; -#N canvas 249 202 555 498 copy 0; +#N canvas 249 202 571 514 copy 0; #X obj 27 26 inlet; #X obj 27 51 t b b; #X obj 316 19 inlet; @@ -314,10 +329,10 @@ #X restore 18 159 pd copy; #X text 85 160 copy and resize; #X obj 323 170 hsl 600 15 0 1 0 1 \$0-r2 empty empty -2 -6 0 8 -262131 --1 -1 52000 1; +-1 -1 12800 0; #X obj 323 5 hsl 600 15 0 1 0 1 \$0-r1 empty empty -2 -6 0 8 -262131 --1 -1 28800 1; -#N canvas 148 330 305 265 sel 0; +-1 -1 0 0; +#N canvas 148 330 313 273 sel 0; #X obj 30 25 r \$0-r1; #X obj 110 25 r \$0-r2; #X obj 30 100 min; @@ -342,21 +357,38 @@ #X connect 6 0 9 0; #X connect 9 0 8 0; #X restore 871 198 pd sel; -#X text 125 31 (C)2002 Thomas Grill; -#X text 19 89 do!; -#X obj 104 301 nbx 7 18 0 3 0 1 empty empty power 0 -8 0 12 -225271 --1 -1 1 256; -#X text 10 35 (needs zexy!); -#X obj 18 410 vasp.u; -#X text 76 412 update graphics; -#X obj 28 381 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --1; +#X obj 73 297 nbx 7 18 0.01 10 1 1 empty empty power 0 -8 0 12 -225271 +-1 -1 0.873788 256; #X obj 331 277 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 613 277 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; -#X connect 0 0 37 0; -#X connect 0 1 18 0; +#X text 11 37 (C)2002-2007 Thomas Grill; +#X text 153 210 -100... no gate; +#X text 162 296 1... no power; +#X obj 18 426 bng 25 250 50 0 empty empty normalize 0 -6 0 12 -24198 +-1 -1; +#N canvas 0 22 458 308 normalize 0; +#X obj 127 29 loadbang; +#X msg 127 54 detach 1; +#X text 120 75 no attributes yet; +#X obj 39 115 vasp.opt; +#X obj 38 149 vasp.u; +#X obj 39 32 inlet; +#X obj 40 82 vasp dst; +#X obj 40 56 t b; +#X connect 0 0 1 0; +#X connect 1 0 3 0; +#X connect 3 0 4 0; +#X connect 5 0 7 0; +#X connect 6 0 3 0; +#X connect 7 0 6 0; +#X restore 18 454 pd normalize; +#X obj 593 220 vsl 15 70 0.01 10 1 1 empty empty empty 0 -8 0 8 -262144 +-1 -1 4900 1; +#X obj 309 222 vsl 15 70 0.01 10 1 1 empty empty empty 0 -8 0 8 -262144 +-1 -1 4900 1; +#X connect 0 0 18 0; #X connect 1 0 0 1; #X connect 2 0 0 2; #X connect 5 0 4 0; @@ -371,10 +403,12 @@ #X connect 17 0 28 1; #X connect 23 0 27 0; #X connect 24 0 27 0; -#X connect 26 0 40 0; -#X connect 27 0 41 0; +#X connect 26 0 34 0; +#X connect 27 0 35 0; #X connect 28 0 0 0; -#X connect 35 0 0 3; -#X connect 39 0 37 0; -#X connect 40 0 13 0; -#X connect 41 0 24 0; +#X connect 33 0 0 3; +#X connect 34 0 13 0; +#X connect 35 0 24 0; +#X connect 39 0 40 0; +#X connect 41 0 27 1; +#X connect 42 0 26 1; diff --git a/externals/grill/vasp/pd-ex/frqmax.pd b/externals/grill/vasp/pd-ex/frqmax.pd index 0f0f3c52..f34fb297 100644 --- a/externals/grill/vasp/pd-ex/frqmax.pd +++ b/externals/grill/vasp/pd-ex/frqmax.pd @@ -1,188 +1,336 @@ -#N canvas 67 28 756 590 12;
-#N canvas 0 0 450 300 graph1 0;
-#X array array1 10000 float 0;
-#X coords 0 1 9999 -1 300 140 1;
-#X restore 403 192 graph;
-#X msg 23 156 vasp array1;
-#X text 127 156 buffer to analyze;
-#X obj 23 417 vasp.??;
-#X obj 24 84 nbx 5 18 -100 0 0 1 \$0-thresh empty empty 0 -6 1152 14
--225271 -1 -1 -5 256;
-#X text 84 415 print list omitting zero values;
-#X obj 22 502 print F;
-#X obj 46 532 print V;
-#N canvas 383 238 314 291 mag 0;
-#X obj 37 34 inlet;
-#X obj 39 214 outlet;
-#N canvas 403 262 454 304 rfft 0;
-#X obj 38 100 vasp.rfft;
-#X obj 28 138 vasp.lower;
-#X obj 114 138 vasp.upper;
-#X obj 42 228 vasp.polar;
-#X obj 43 170 vasp.sync;
-#X obj 42 197 vasp.join;
-#X obj 42 262 vasp.re;
-#X text 112 262 get magnitude only;
-#X text 119 102 real FFT;
-#X text 132 156 separate real and imag part;
-#X text 133 229 make polar representation;
-#X obj 39 20 inlet;
-#X obj 38 62 vasp.!;
-#X text 97 64 make temporary buffer;
-#X obj 41 305 outlet;
-#X connect 0 0 1 0;
-#X connect 0 0 2 0;
-#X connect 1 0 4 0;
-#X connect 2 0 4 1;
-#X connect 3 0 6 0;
-#X connect 4 0 5 0;
-#X connect 4 1 5 1;
-#X connect 5 0 3 0;
-#X connect 6 0 14 0;
-#X connect 11 0 12 0;
-#X connect 12 0 0 0;
-#X restore 100 151 pd rfft;
-#N canvas 0 0 454 344 cfft 0;
-#X obj 39 187 vasp.polar;
-#X obj 39 221 vasp.re;
-#X text 109 221 get magnitude only;
-#X text 130 188 make polar representation;
-#X obj 38 42 vasp.!;
-#X obj 38 154 vasp.cfft;
-#X obj 40 253 vasp.lower;
-#X obj 37 100 vasp.sync;
-#X text 169 56 make temporary buffers;
-#X obj 101 44 vasp.!;
-#X obj 102 71 vasp.= 0;
-#X text 119 154 complex FFT;
-#X obj 37 128 vasp.join;
-#X obj 35 11 inlet;
-#X obj 37 291 outlet;
-#X connect 0 0 1 0;
-#X connect 1 0 6 0;
-#X connect 4 0 7 0;
-#X connect 5 0 0 0;
-#X connect 6 0 14 0;
-#X connect 7 0 12 0;
-#X connect 7 1 12 1;
-#X connect 9 0 10 0;
-#X connect 10 0 7 1;
-#X connect 12 0 5 0;
-#X connect 13 0 4 0;
-#X connect 13 0 9 0;
-#X restore 38 88 pd cfft;
-#X text 105 89 complex method;
-#X text 165 147 real method;
-#X text 166 167 (off by one bin?);
-#X connect 0 0 3 0;
-#X connect 3 0 1 0;
-#X restore 24 185 pd mag;
-#X text 77 186 get spectral magnitude;
-#X obj 11 10 cnv 15 700 50 empty empty fftmax 10 22 0 24 -260818 -1
-0;
-#X text 183 41 http://www.parasitaere-kapazitaeten.net;
-#X text 184 25 needs vasp and zexy;
-#X text 184 10 get loudest frequencies \, (C)2003 Thomas Grill;
-#N canvas 0 0 478 370 load 0;
-#X obj 30 100 openpanel;
-#X obj 31 254 pack s s s s;
-#X obj 28 130 t b b s b;
-#X obj 30 22 inlet;
-#X obj 31 313 soundfiler;
-#X obj 29 74 t b s;
-#X text 80 21 input message with target buffer;
-#X obj 107 213 symbol array1;
-#X obj 31 284 route list;
-#X obj 51 189 symbol -resize;
-#X obj 28 159 symbol read;
-#X connect 0 0 2 0;
-#X connect 1 0 8 0;
-#X connect 2 0 10 0;
-#X connect 2 1 9 0;
-#X connect 2 2 1 2;
-#X connect 2 3 7 0;
-#X connect 3 0 5 0;
-#X connect 5 0 0 0;
-#X connect 5 1 7 1;
-#X connect 7 0 1 3;
-#X connect 8 0 4 0;
-#X connect 9 0 1 1;
-#X connect 10 0 1 0;
-#X restore 410 144 pd load;
-#X msg 410 114 array1;
-#X text 442 85 load file into buffer;
-#X obj 410 83 bng 25 250 50 0 empty empty empty 0 -6 0 8 -225271 -1
--1;
-#X obj 125 259 vasp.max?;
-#X text 103 383 discriminate lower values;
-#X obj 125 350 *;
-#X obj 156 299 + 100;
-#X obj 156 322 dbtorms;
-#X obj 23 382 vasp.gate;
-#X obj 23 215 t a a;
-#N canvas 0 0 355 310 ny 0;
-#X obj 33 128 samplerate~;
-#X obj 33 69 vasp.f?;
-#X obj 32 39 inlet;
-#X obj 32 171 /;
-#X obj 32 97 t b f;
-#X obj 32 244 outlet;
-#X obj 33 208 / 2;
-#X connect 0 0 3 0;
-#X connect 1 0 4 0;
-#X connect 2 0 1 0;
-#X connect 3 0 6 0;
-#X connect 4 0 0 0;
-#X connect 4 1 3 1;
-#X connect 6 0 5 0;
-#X restore 68 258 pd ny;
-#X obj 22 459 mtx_mul 0;
-#X text 89 502 frequencies;
-#X text 108 533 associated values (should be calculated to decibels)
-;
-#X text 102 84 threshold in dB (eg. -6);
-#N canvas 0 0 458 308 testsig 0;
-#X msg 30 107 vasp array1;
-#X obj 29 256 vasp.u;
-#X obj 93 168 samplerate~;
-#X obj 29 227 vasp.osc 441;
-#X obj 33 45 nbx 5 18 0 100000 0 0 empty empty empty 0 -6 0 14 -225271
--1 -1 434 256;
-#X obj 116 45 bng 25 250 50 0 empty empty empty 0 -6 0 8 -261689 -1
--1;
-#X obj 92 193 / 100;
-#X obj 94 138 t b f;
-#X text 31 10 set frequency \, then bang to synthesize;
-#X connect 0 0 3 0;
-#X connect 2 0 6 0;
-#X connect 3 0 1 0;
-#X connect 4 0 7 0;
-#X connect 5 0 0 0;
-#X connect 6 0 3 1;
-#X connect 7 0 2 0;
-#X connect 7 1 6 1;
-#X restore 498 431 pd testsig;
-#X text 499 409 create a test signal;
-#X obj 23 121 bng 25 250 50 0 empty empty empty 0 -6 0 8 -225271 -1
--1;
-#X text 55 123 bang to start analysis;
-#X obj 220 258 r \$0-thresh;
-#X text 104 460 scale frequencies;
-#X connect 1 0 8 0;
-#X connect 3 0 26 0;
-#X connect 3 1 7 0;
-#X connect 8 0 24 0;
-#X connect 15 0 14 0;
-#X connect 17 0 15 0;
-#X connect 18 0 20 0;
-#X connect 20 0 23 1;
-#X connect 21 0 22 0;
-#X connect 22 0 20 1;
-#X connect 23 0 3 0;
-#X connect 24 0 23 0;
-#X connect 24 1 18 0;
-#X connect 24 1 25 0;
-#X connect 25 0 26 1;
-#X connect 26 0 6 0;
-#X connect 32 0 1 0;
-#X connect 34 0 21 0;
+#N canvas 530 176 764 598 12; +#N canvas 0 22 450 300 graph1 0; +#X array array1 2.205e+06 float 0; +#X coords 0 1 2.205e+06 -1 300 140 1; +#X restore 403 192 graph; +#X msg 23 156 vasp array1; +#X text 127 156 buffer to analyze; +#X obj 23 417 vasp.??; +#X obj 24 84 nbx 5 18 -100 0 0 1 \$0-thresh empty empty 0 -6 0 14 -225271 +-1 -1 -5 256; +#X text 84 415 print list omitting zero values; +#X obj 22 536 print F; +#X obj 195 535 print V; +#N canvas 383 238 314 291 mag 0; +#X obj 37 34 inlet; +#X obj 39 214 outlet; +#N canvas 403 262 454 304 rfft 0; +#X obj 38 100 vasp.rfft; +#X obj 28 138 vasp.lower; +#X obj 114 138 vasp.upper; +#X obj 42 228 vasp.polar; +#X obj 43 170 vasp.sync; +#X obj 42 197 vasp.join; +#X obj 42 262 vasp.re; +#X text 112 262 get magnitude only; +#X text 119 102 real FFT; +#X text 132 156 separate real and imag part; +#X text 133 229 make polar representation; +#X obj 39 20 inlet; +#X obj 38 62 vasp.!; +#X text 97 64 make temporary buffer; +#X obj 41 305 outlet; +#X connect 0 0 1 0; +#X connect 0 0 2 0; +#X connect 1 0 4 0; +#X connect 2 0 4 1; +#X connect 3 0 6 0; +#X connect 4 0 5 0; +#X connect 4 1 5 1; +#X connect 5 0 3 0; +#X connect 6 0 14 0; +#X connect 11 0 12 0; +#X connect 12 0 0 0; +#X restore 100 151 pd rfft; +#N canvas 0 22 454 344 cfft 0; +#X obj 39 187 vasp.polar; +#X obj 39 221 vasp.re; +#X text 109 221 get magnitude only; +#X text 130 188 make polar representation; +#X obj 38 42 vasp.!; +#X obj 38 154 vasp.cfft; +#X obj 40 253 vasp.lower; +#X obj 37 100 vasp.sync; +#X text 169 56 make temporary buffers; +#X obj 101 44 vasp.!; +#X obj 102 71 vasp.= 0; +#X text 119 154 complex FFT; +#X obj 37 128 vasp.join; +#X obj 35 11 inlet; +#X obj 37 291 outlet; +#X connect 0 0 1 0; +#X connect 1 0 6 0; +#X connect 4 0 7 0; +#X connect 5 0 0 0; +#X connect 6 0 14 0; +#X connect 7 0 12 0; +#X connect 7 1 12 1; +#X connect 9 0 10 0; +#X connect 10 0 7 1; +#X connect 12 0 5 0; +#X connect 13 0 4 0; +#X connect 13 0 9 0; +#X restore 38 88 pd cfft; +#X text 105 89 complex method; +#X text 165 147 real method; +#X text 166 167 (off by one bin?); +#X connect 0 0 3 0; +#X connect 3 0 1 0; +#X restore 24 185 pd mag; +#X text 77 186 get spectral magnitude; +#X obj 11 10 cnv 15 700 50 empty empty fftmax 10 22 0 24 -260818 -1 +0; +#N canvas 0 22 478 370 load 0; +#X obj 30 100 openpanel; +#X obj 31 254 pack s s s s; +#X obj 28 130 t b b s b; +#X obj 30 22 inlet; +#X obj 31 313 soundfiler; +#X obj 29 74 t b s; +#X text 80 21 input message with target buffer; +#X obj 107 213 symbol array1; +#X obj 31 284 route list; +#X obj 51 189 symbol -resize; +#X obj 28 159 symbol read; +#X connect 0 0 2 0; +#X connect 1 0 8 0; +#X connect 2 0 10 0; +#X connect 2 1 9 0; +#X connect 2 2 1 2; +#X connect 2 3 7 0; +#X connect 3 0 5 0; +#X connect 5 0 0 0; +#X connect 5 1 7 1; +#X connect 7 0 1 3; +#X connect 8 0 4 0; +#X connect 9 0 1 1; +#X connect 10 0 1 0; +#X restore 410 144 pd load; +#X msg 410 114 array1; +#X text 442 85 load file into buffer; +#X obj 410 83 bng 25 250 50 0 empty empty empty 0 -6 0 8 -225271 -1 +-1; +#X obj 125 259 vasp.max?; +#X text 103 383 discriminate lower values; +#X obj 125 350 *; +#X obj 156 299 + 100; +#X obj 156 322 dbtorms; +#X obj 23 382 vasp.gate; +#X obj 23 215 t a a; +#N canvas 0 22 359 314 ny 0; +#X obj 33 128 samplerate~; +#X obj 33 69 vasp.f?; +#X obj 32 39 inlet; +#X obj 32 171 /; +#X obj 32 97 t b f; +#X obj 32 244 outlet; +#X obj 33 208 / 2; +#X connect 0 0 3 0; +#X connect 1 0 4 0; +#X connect 2 0 1 0; +#X connect 3 0 6 0; +#X connect 4 0 0 0; +#X connect 4 1 3 1; +#X connect 6 0 5 0; +#X restore 65 258 pd ny; +#X text 89 536 frequencies; +#X text 102 84 threshold in dB (eg. -6); +#N canvas 0 22 466 316 testsig 0; +#X msg 30 107 vasp array1; +#X obj 29 256 vasp.u; +#X obj 93 168 samplerate~; +#X obj 29 227 vasp.osc 441; +#X obj 92 193 / 100; +#X obj 94 138 t b f; +#X text 31 10 set frequency \, then bang to synthesize; +#X obj 31 71 route bang; +#X obj 31 41 inlet; +#X connect 0 0 3 0; +#X connect 2 0 4 0; +#X connect 3 0 1 0; +#X connect 4 0 3 1; +#X connect 5 0 2 0; +#X connect 5 1 4 1; +#X connect 7 0 0 0; +#X connect 7 1 5 0; +#X connect 8 0 7 0; +#X restore 498 468 pd testsig; +#X text 496 392 create a test signal; +#X obj 23 121 bng 25 250 50 0 empty empty empty 0 -6 0 8 -258699 -1 +-1; +#X text 51 119 bang to start analysis; +#X obj 220 258 r \$0-thresh; +#X text 183 14 get loudest frequencies \, (C)2003-2007 Thomas Grill +; +#X text 184 34 http://grrrr.org; +#X obj 545 438 nbx 5 18 0 100000 0 0 empty empty frequency 0 -6 0 14 +-225271 -1 -1 0 256; +#X obj 498 432 bng 25 250 50 0 empty empty make! 0 -6 0 8 -261689 -1 +-1; +#N canvas 0 22 454 304 db 0; +#X obj 45 34 inlet; +#X obj 44 192 outlet; +#X obj 45 96 log; +#X obj 45 121 / 2.302; +#X text 114 122 ln 10; +#X obj 45 156 * 20; +#X connect 0 0 2 0; +#X connect 2 0 3 0; +#X connect 3 0 5 0; +#X connect 5 0 1 0; +#X restore 289 497 pd db; +#X obj 116 495 *; +#N canvas 0 22 458 308 list-map 0; +#N canvas 0 22 454 304 serial 0; +#X obj 65 38 inlet; +#X obj 53 227 outlet; +#X obj 38 180 list split 1; +#X obj 38 97 until; +#X obj 38 135 list append; +#X obj 64 64 t b l; +#X obj 182 130 bang; +#X connect 0 0 5 0; +#X connect 2 0 1 0; +#X connect 2 1 4 1; +#X connect 2 2 6 0; +#X connect 3 0 4 0; +#X connect 4 0 2 0; +#X connect 5 0 3 0; +#X connect 5 1 4 1; +#X connect 6 0 3 1; +#X restore 76 106 pd serial; +#N canvas 676 218 470 320 synth 0; +#X obj 55 34 inlet; +#X obj 107 266 outlet; +#X obj 200 37 inlet reset; +#X obj 55 61 route bang; +#X obj 134 99 t b a; +#X obj 197 64 t b b b; +#X obj 105 239 spigot; +#X msg 250 171 0; +#X msg 68 161 1; +#X obj 50 102 t b b b; +#X obj 185 169 list; +#X obj 126 166 any; +#X connect 0 0 3 0; +#X connect 2 0 5 0; +#X connect 3 0 9 0; +#X connect 3 1 4 0; +#X connect 4 0 11 0; +#X connect 4 1 10 1; +#X connect 5 0 10 0; +#X connect 5 1 10 1; +#X connect 5 2 7 0; +#X connect 6 0 1 0; +#X connect 7 0 6 1; +#X connect 8 0 6 1; +#X connect 9 0 7 0; +#X connect 9 1 11 0; +#X connect 9 2 8 0; +#X connect 10 0 11 1; +#X connect 11 0 10 0; +#X connect 11 0 6 0; +#X restore 59 196 pd synth; +#X obj 61 66 t b l b; +#X obj 61 31 inlet list-in; +#X obj 56 239 outlet list-out; +#X obj 261 242 outlet map-in; +#X obj 281 29 inlet map-out; +#X connect 0 0 5 0; +#X connect 1 0 4 0; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 2 2 1 1; +#X connect 3 0 2 0; +#X connect 6 0 1 0; +#X restore 23 495 pd list-map; +#N canvas 0 22 462 312 list-map 0; +#N canvas 0 22 454 304 serial 0; +#X obj 65 38 inlet; +#X obj 53 227 outlet; +#X obj 38 180 list split 1; +#X obj 38 97 until; +#X obj 38 135 list append; +#X obj 64 64 t b l; +#X obj 182 130 bang; +#X connect 0 0 5 0; +#X connect 2 0 1 0; +#X connect 2 1 4 1; +#X connect 2 2 6 0; +#X connect 3 0 4 0; +#X connect 4 0 2 0; +#X connect 5 0 3 0; +#X connect 5 1 4 1; +#X connect 6 0 3 1; +#X restore 76 106 pd serial; +#N canvas 676 218 474 324 synth 0; +#X obj 55 34 inlet; +#X obj 107 266 outlet; +#X obj 200 37 inlet reset; +#X obj 55 61 route bang; +#X obj 197 64 t b b b; +#X obj 105 239 spigot; +#X msg 250 171 0; +#X msg 68 161 1; +#X obj 50 102 t b b b; +#X obj 185 169 list; +#X obj 126 166 any; +#X obj 134 99 t b l; +#X connect 0 0 3 0; +#X connect 2 0 4 0; +#X connect 3 0 8 0; +#X connect 3 1 11 0; +#X connect 4 0 9 0; +#X connect 4 1 9 1; +#X connect 4 2 6 0; +#X connect 5 0 1 0; +#X connect 6 0 5 1; +#X connect 7 0 5 1; +#X connect 8 0 6 0; +#X connect 8 1 10 0; +#X connect 8 2 7 0; +#X connect 9 0 10 1; +#X connect 10 0 9 0; +#X connect 10 0 5 0; +#X connect 11 0 10 0; +#X connect 11 1 9 1; +#X restore 59 196 pd synth; +#X obj 61 66 t b l b; +#X obj 61 31 inlet list-in; +#X obj 56 239 outlet list-out; +#X obj 261 242 outlet map-in; +#X obj 281 29 inlet map-out; +#X connect 0 0 5 0; +#X connect 1 0 4 0; +#X connect 2 0 1 0; +#X connect 2 1 0 0; +#X connect 2 2 1 1; +#X connect 3 0 2 0; +#X connect 6 0 1 0; +#X restore 195 497 pd list-map; +#X text 257 536 dB; +#X connect 1 0 8 0; +#X connect 3 0 36 0; +#X connect 3 1 37 0; +#X connect 8 0 21 0; +#X connect 12 0 11 0; +#X connect 14 0 12 0; +#X connect 15 0 17 0; +#X connect 17 0 20 1; +#X connect 18 0 19 0; +#X connect 19 0 17 1; +#X connect 20 0 3 0; +#X connect 21 0 20 0; +#X connect 21 1 15 0; +#X connect 21 1 22 0; +#X connect 22 0 35 1; +#X connect 27 0 1 0; +#X connect 29 0 18 0; +#X connect 32 0 25 0; +#X connect 33 0 25 0; +#X connect 34 0 37 1; +#X connect 35 0 36 1; +#X connect 36 0 6 0; +#X connect 36 1 35 0; +#X connect 37 0 7 0; +#X connect 37 1 34 0; diff --git a/externals/grill/vasp/pd-help/vasp_fhp.pd b/externals/grill/vasp/pd-help/vasp_fhp.pd index 9b5eff80..4f385e2c 100644 --- a/externals/grill/vasp/pd-help/vasp_fhp.pd +++ b/externals/grill/vasp/pd-help/vasp_fhp.pd @@ -1,89 +1,88 @@ -#N canvas 47 54 891 554 10;
-#X obj 71 32 cnv 15 15 15 empty empty vasp.fhp 0 10 1 14 -262144 -1
-0;
-#X obj 76 247 vasp.update;
-#X obj 76 224 vasp.* 0.5;
-#X obj 401 449 dac~;
-#X obj 401 405 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
--1;
-#X text 423 404 play;
-#N canvas 40 55 281 170 clear_buffer 0;
-#X obj 54 79 vasp.update;
-#X obj 54 56 vasp.= 0;
-#X obj 54 26 inlet;
-#X obj 54 108 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 1152
-8 -262144 -1 -1;
-#X connect 0 0 3 0;
-#X connect 1 0 0 0;
-#X connect 2 0 1 0;
-#X restore 533 449 pd clear_buffer;
-#X text 180 178 generate white noise;
-#X obj 76 201 vasp.noise;
-#X obj 76 270 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 1152
-8 -262144 -1 -1;
-#X obj 77 391 vasp.update;
-#X obj 77 414 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 1152
-8 -262144 -1 -1;
-#N canvas 92 108 341 266 init 0;
-#X obj 110 180 s \$0-sample-length;
-#X msg 177 126 resize \$1;
-#X obj 177 79 loadbang;
-#X msg 177 100 88200;
-#X obj 177 148 s buffhp;
-#X connect 1 0 4 0;
-#X connect 2 0 3 0;
-#X connect 3 0 1 0;
-#X connect 3 0 0 0;
-#X restore 672 447 pd init;
-#N canvas 0 0 458 308 Hz_to_period_length 0;
-#X floatatom 125 242 0 0 0;
-#X obj 125 142 t b f;
-#X text 158 223 period length in samples (float);
-#X floatatom 125 80 0 0 0;
-#X obj 125 206 / 1;
-#X text 170 79 frequency in Hz;
-#X obj 53 142 samplerate~;
-#X obj 53 119 loadbang;
-#X floatatom 125 175 5 0 0;
-#X connect 1 0 8 0;
-#X connect 1 1 4 1;
-#X connect 3 0 1 0;
-#X connect 4 0 0 0;
-#X connect 6 0 8 0;
-#X connect 7 0 6 0;
-#X connect 8 0 4 0;
-#X restore 78 457 pd Hz_to_period_length;
-#X text 71 63 vasp high pass filter (FIR);
-#X text 70 78 first argument: cutoff frequency in period length;
-#X text 70 92 second argument: q-factor from 1 to infinite (integer)
-default 1;
-#X text 70 119 right inlet: cutoff and q-factor (list);
-#X obj 421 188 wavedisplay-simple buffhp \$0;
-#X msg 76 179 vasp buffhp;
-#X msg 77 330 vasp buffhp;
-#X floatatom 201 298 5 0 0;
-#X floatatom 260 298 5 0 0;
-#X text 195 278 cutoff;
-#X text 261 277 q-factor;
-#X obj 201 345 pack;
-#X obj 401 426 tabplay~ buffhp;
-#X msg 533 426 vasp buffhp;
-#X obj 260 319 t b f;
-#X obj 77 366 vasp.fhp 220;
-#X obj 78 503 VASP-HELP;
-#X connect 1 0 9 0;
-#X connect 2 0 1 0;
-#X connect 4 0 26 0;
-#X connect 8 0 2 0;
-#X connect 10 0 11 0;
-#X connect 19 0 8 0;
-#X connect 20 0 29 0;
-#X connect 21 0 25 0;
-#X connect 22 0 28 0;
-#X connect 25 0 29 1;
-#X connect 26 0 3 0;
-#X connect 26 0 3 1;
-#X connect 27 0 6 0;
-#X connect 28 0 25 0;
-#X connect 28 1 25 1;
-#X connect 29 0 10 0;
+#N canvas 47 54 895 558 10; +#X obj 71 32 cnv 15 15 15 empty empty vasp.fhp 0 10 1 14 -262144 -1 +0; +#X obj 76 247 vasp.update; +#X obj 76 224 vasp.* 0.5; +#X obj 401 449 dac~; +#X obj 401 405 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X text 423 404 play; +#N canvas 40 55 281 170 clear_buffer 0; +#X obj 54 79 vasp.update; +#X obj 54 56 vasp.= 0; +#X obj 54 26 inlet; +#X obj 54 108 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 0 8 +-262144 -1 -1; +#X connect 0 0 3 0; +#X connect 1 0 0 0; +#X connect 2 0 1 0; +#X restore 533 449 pd clear_buffer; +#X text 180 178 generate white noise; +#X obj 76 201 vasp.noise; +#X obj 76 270 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 0 8 +-262144 -1 -1; +#X obj 77 391 vasp.update; +#X obj 77 414 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 0 8 +-262144 -1 -1; +#N canvas 92 108 341 266 init 0; +#X obj 110 180 s \$0-sample-length; +#X msg 177 126 resize \$1; +#X obj 177 79 loadbang; +#X msg 177 100 88200; +#X obj 177 148 s buffhp; +#X connect 1 0 4 0; +#X connect 2 0 3 0; +#X connect 3 0 1 0; +#X connect 3 0 0 0; +#X restore 672 447 pd init; +#N canvas 0 22 458 308 Hz_to_period_length 0; +#X floatatom 125 242 0 0 0 0 - - -; +#X obj 125 142 t b f; +#X text 158 223 period length in samples (float); +#X floatatom 125 80 0 0 0 0 - - -; +#X obj 125 206 / 1; +#X text 170 79 frequency in Hz; +#X obj 53 142 samplerate~; +#X obj 53 119 loadbang; +#X floatatom 125 175 5 0 0 0 - - -; +#X connect 1 0 8 0; +#X connect 1 1 4 1; +#X connect 3 0 1 0; +#X connect 4 0 0 0; +#X connect 6 0 8 0; +#X connect 7 0 6 0; +#X connect 8 0 4 0; +#X restore 78 457 pd Hz_to_period_length; +#X text 71 63 vasp high pass filter (FIR); +#X text 70 78 first argument: cutoff frequency in period length; +#X obj 421 188 wavedisplay-simple buffhp \$0; +#X msg 76 179 vasp buffhp; +#X msg 77 330 vasp buffhp; +#X floatatom 201 298 5 0 0 0 - - -; +#X floatatom 260 298 5 0 0 0 - - -; +#X text 195 278 cutoff; +#X obj 201 345 pack; +#X obj 401 426 tabplay~ buffhp; +#X msg 533 426 vasp buffhp; +#X obj 260 319 t b f; +#X obj 77 366 vasp.fhp 220; +#X obj 78 503 VASP-HELP; +#X text 70 92 second argument: repetitions (integer) \, default 1; +#X text 70 119 right inlet: cutoff and repetitions (list); +#X text 261 277 repetitions; +#X connect 1 0 9 0; +#X connect 2 0 1 0; +#X connect 4 0 23 0; +#X connect 8 0 2 0; +#X connect 10 0 11 0; +#X connect 17 0 8 0; +#X connect 18 0 26 0; +#X connect 19 0 22 0; +#X connect 20 0 25 0; +#X connect 22 0 26 1; +#X connect 23 0 3 0; +#X connect 23 0 3 1; +#X connect 24 0 6 0; +#X connect 25 0 22 0; +#X connect 25 1 22 1; +#X connect 26 0 10 0; diff --git a/externals/grill/vasp/pd-help/vasp_flp.pd b/externals/grill/vasp/pd-help/vasp_flp.pd index ab720f99..39852da6 100644 --- a/externals/grill/vasp/pd-help/vasp_flp.pd +++ b/externals/grill/vasp/pd-help/vasp_flp.pd @@ -1,86 +1,85 @@ -#N canvas 47 54 883 546 10;
-#X obj 71 32 cnv 15 15 15 empty empty vasp.flp 0 10 1 14 -262144 -1
-0;
-#X obj 76 247 vasp.update;
-#X obj 76 224 vasp.* 0.5;
-#X obj 401 449 dac~;
-#X obj 401 405 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1
--1;
-#X text 423 404 play;
-#N canvas 40 55 281 170 clear_buffer 0;
-#X obj 54 79 vasp.update;
-#X obj 54 56 vasp.= 0;
-#X obj 54 26 inlet;
-#X obj 54 108 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 1152
-8 -262144 -1 -1;
-#X connect 0 0 3 0;
-#X connect 1 0 0 0;
-#X connect 2 0 1 0;
-#X restore 533 449 pd clear_buffer;
-#X text 180 178 generate white noise;
-#X obj 76 201 vasp.noise;
-#X obj 76 270 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 1152
-8 -262144 -1 -1;
-#N canvas 92 108 343 268 init 0;
-#X obj 110 180 s \$0-sample-length;
-#X msg 177 126 resize \$1;
-#X obj 177 79 loadbang;
-#X msg 177 100 88200;
-#X obj 177 148 s bufflp;
-#X connect 1 0 4 0;
-#X connect 2 0 3 0;
-#X connect 3 0 1 0;
-#X connect 3 0 0 0;
-#X restore 672 447 pd init;
-#N canvas 0 0 456 306 Hz_to_period_length 0;
-#X floatatom 125 242 0 0 0;
-#X obj 125 142 t b f;
-#X text 158 223 period length in samples (float);
-#X floatatom 125 80 0 0 0;
-#X obj 125 206 / 1;
-#X text 170 79 frequency in Hz;
-#X obj 53 142 samplerate~;
-#X obj 53 119 loadbang;
-#X floatatom 125 175 5 0 0;
-#X connect 1 0 8 0;
-#X connect 1 1 4 1;
-#X connect 3 0 1 0;
-#X connect 4 0 0 0;
-#X connect 6 0 8 0;
-#X connect 7 0 6 0;
-#X connect 8 0 4 0;
-#X restore 78 457 pd Hz_to_period_length;
-#X text 70 78 first argument: cutoff frequency in period length;
-#X text 70 92 second argument: q-factor from 1 to infinite (integer)
-default 1;
-#X text 70 119 right inlet: cutoff and q-factor (list);
-#X text 71 63 vasp low pass filter (FIR);
-#X msg 76 179 vasp bufflp;
-#X obj 428 165 wavedisplay-simple bufflp \$0;
-#X msg 533 426 vasp bufflp;
-#X obj 401 426 tabplay~ bufflp;
-#X obj 78 496 VASP-HELP;
-#X obj 77 371 vasp.update;
-#X obj 77 394 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 1152
-8 -262144 -1 -1;
-#X floatatom 201 298 5 0 0;
-#X floatatom 260 298 5 0 0;
-#X text 195 278 cutoff;
-#X text 261 277 q-factor;
-#X obj 201 318 pack;
-#X msg 77 297 vasp bufflp;
-#X obj 77 347 vasp.flp 220;
-#X connect 1 0 9 0;
-#X connect 2 0 1 0;
-#X connect 4 0 19 0;
-#X connect 8 0 2 0;
-#X connect 16 0 8 0;
-#X connect 18 0 6 0;
-#X connect 19 0 3 0;
-#X connect 19 0 3 1;
-#X connect 21 0 22 0;
-#X connect 23 0 27 0;
-#X connect 24 0 27 1;
-#X connect 27 0 29 1;
-#X connect 28 0 29 0;
-#X connect 29 0 21 0;
+#N canvas 47 54 887 550 10; +#X obj 71 32 cnv 15 15 15 empty empty vasp.flp 0 10 1 14 -262144 -1 +0; +#X obj 76 247 vasp.update; +#X obj 76 224 vasp.* 0.5; +#X obj 401 449 dac~; +#X obj 401 405 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 +-1; +#X text 423 404 play; +#N canvas 40 55 281 170 clear_buffer 0; +#X obj 54 79 vasp.update; +#X obj 54 56 vasp.= 0; +#X obj 54 26 inlet; +#X obj 54 108 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 0 8 +-262144 -1 -1; +#X connect 0 0 3 0; +#X connect 1 0 0 0; +#X connect 2 0 1 0; +#X restore 533 449 pd clear_buffer; +#X text 180 178 generate white noise; +#X obj 76 201 vasp.noise; +#X obj 76 270 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 0 8 +-262144 -1 -1; +#N canvas 92 108 343 268 init 0; +#X obj 110 180 s \$0-sample-length; +#X msg 177 126 resize \$1; +#X obj 177 79 loadbang; +#X msg 177 100 88200; +#X obj 177 148 s bufflp; +#X connect 1 0 4 0; +#X connect 2 0 3 0; +#X connect 3 0 1 0; +#X connect 3 0 0 0; +#X restore 672 447 pd init; +#N canvas 0 22 460 310 Hz_to_period_length 0; +#X floatatom 125 242 0 0 0 0 - - -; +#X obj 125 142 t b f; +#X text 158 223 period length in samples (float); +#X floatatom 125 80 0 0 0 0 - - -; +#X obj 125 206 / 1; +#X text 170 79 frequency in Hz; +#X obj 53 142 samplerate~; +#X obj 53 119 loadbang; +#X floatatom 125 175 5 0 0 0 - - -; +#X connect 1 0 8 0; +#X connect 1 1 4 1; +#X connect 3 0 1 0; +#X connect 4 0 0 0; +#X connect 6 0 8 0; +#X connect 7 0 6 0; +#X connect 8 0 4 0; +#X restore 78 457 pd Hz_to_period_length; +#X text 70 78 first argument: cutoff frequency in period length; +#X msg 76 179 vasp bufflp; +#X obj 428 165 wavedisplay-simple bufflp \$0; +#X msg 533 426 vasp bufflp; +#X obj 401 426 tabplay~ bufflp; +#X obj 78 496 VASP-HELP; +#X obj 77 371 vasp.update; +#X obj 77 394 bng 15 250 50 0 \$0-draw_display empty empty 0 -6 0 8 +-262144 -1 -1; +#X floatatom 201 298 5 0 0 0 - - -; +#X floatatom 260 298 5 0 0 0 - - -; +#X text 195 278 cutoff; +#X obj 201 318 pack; +#X msg 77 297 vasp bufflp; +#X obj 77 347 vasp.flp 220; +#X text 261 277 repetitions; +#X text 71 63 vasp passive low pass filter (FIR); +#X text 70 92 second argument: repetitions (integer) \, default 1; +#X text 70 119 right inlet: cutoff and repetitions (list); +#X connect 1 0 9 0; +#X connect 2 0 1 0; +#X connect 4 0 16 0; +#X connect 8 0 2 0; +#X connect 13 0 8 0; +#X connect 15 0 6 0; +#X connect 16 0 3 0; +#X connect 16 0 3 1; +#X connect 18 0 19 0; +#X connect 20 0 23 0; +#X connect 21 0 23 1; +#X connect 23 0 25 1; +#X connect 24 0 25 0; +#X connect 25 0 18 0; diff --git a/externals/grill/vasp/pd-ex/granular1.pd b/externals/grill/vasp/pd-test/granular1.pd index 2ef369f9..2ef369f9 100755..100644 --- a/externals/grill/vasp/pd-ex/granular1.pd +++ b/externals/grill/vasp/pd-test/granular1.pd diff --git a/externals/grill/vasp/pd-ex/granular2.pd b/externals/grill/vasp/pd-test/granular2.pd index cfea7d6c..cfea7d6c 100644 --- a/externals/grill/vasp/pd-ex/granular2.pd +++ b/externals/grill/vasp/pd-test/granular2.pd diff --git a/externals/grill/vasp/pd/VASP-HELP.pd b/externals/grill/vasp/pd/VASP-HELP.pd index 787dc60a..4e6dad90 100644 --- a/externals/grill/vasp/pd/VASP-HELP.pd +++ b/externals/grill/vasp/pd/VASP-HELP.pd @@ -372,7 +372,7 @@ 0;
#X obj 89 61 cnv 2 2 2 empty 14-15-r empty 20 12 64 14 -225271 -262144
0;
-#X text 54 90 vasp modular - vector assembling signal processor ©2002
+#X text 54 90 vasp modular - vector assembling signal processor ©2002-2007
thomas grill;
#X text 54 123 vasp is a library of objects for max/msp and pd \, containing
functions to generate and modify vectors as well as buffer content
diff --git a/externals/grill/vasp/source/classes.h b/externals/grill/vasp/source/classes.h index 7ce64c74..9096b3f8 100644 --- a/externals/grill/vasp/source/classes.h +++ b/externals/grill/vasp/source/classes.h @@ -271,7 +271,7 @@ protected: \ } \ virtual V m_help() { post("%s - " help,thisName()); } \ }; \ -FLEXT_LIB(name ",vasp",vasp_##op) + FLEXT_LIB(name ", vasp_" #op,vasp_##op) #define VASP_BINARY(name,op,to,def,help) \ @@ -290,7 +290,7 @@ protected: \ } \ virtual V m_help() { post("%s - " help,thisName()); } \ }; \ -FLEXT_LIB_V(name ",vasp",vasp_##op) +FLEXT_LIB_V(name ", vasp_" #op,vasp_##op) #define VASP_ANYOP(name,op,args,to,def,help) \ @@ -309,7 +309,10 @@ protected: \ } \ virtual V m_help() { post("%s - " help,thisName()); } \ }; \ -FLEXT_LIB_V(name ",vasp",vasp_##op) +FLEXT_LIB_V(name ", vasp_" #op,vasp_##op) + +#define VASP_LIB(name,cl) FLEXT_LIB(name ", " #cl,cl); +#define VASP_LIB_V(name,cl) FLEXT_LIB_V(name ", " #cl,cl); #define VASP__SETUP(op) FLEXT_SETUP(vasp_##op); diff --git a/externals/grill/vasp/source/main.cpp b/externals/grill/vasp/source/main.cpp index a6588df7..38febd4a 100644 --- a/externals/grill/vasp/source/main.cpp +++ b/externals/grill/vasp/source/main.cpp @@ -22,7 +22,7 @@ static V vasp_main() post("-----------------------------------------"); post(" VASP modular %s ",VASP_VERSION); post(" vector assembling signal processor "); - post(" (C)2002-2005 Thomas Grill "); + post(" (C)2002-2007 Thomas Grill "); #ifdef FLEXT_DEBUG post(" DEBUG BUILD - " __DATE__ " " __TIME__); #endif diff --git a/externals/grill/vasp/source/obj_chns.cpp b/externals/grill/vasp/source/obj_chns.cpp index e5293118..1e7dfb67 100755 --- a/externals/grill/vasp/source/obj_chns.cpp +++ b/externals/grill/vasp/source/obj_chns.cpp @@ -68,7 +68,7 @@ private: FLEXT_ATTRGET_I(ix); }; -FLEXT_LIB_V("vasp.channel vasp.c, vasp",vasp_channel) +VASP_LIB_V("vasp.channel vasp.c",vasp_channel) @@ -111,7 +111,7 @@ public: virtual V m_help() { post("%s - Get channel index of 0th vector in vasp",thisName()); } }; -FLEXT_LIB("vasp.channel? vasp.c?, vasp",vasp_qchannel) +VASP_LIB("vasp.channel? vasp.c?",vasp_qchannel) /*! \class vasp_qchannels @@ -154,7 +154,7 @@ public: virtual V m_help() { post("%s - Get channel index of 0th vector in vasp",thisName()); } }; -FLEXT_LIB("vasp.channels?, vasp",vasp_qchannels) +VASP_LIB("vasp.channels?",vasp_qchannels) diff --git a/externals/grill/vasp/source/obj_frames.cpp b/externals/grill/vasp/source/obj_frames.cpp index 8cc406c6..875bcdc6 100644 --- a/externals/grill/vasp/source/obj_frames.cpp +++ b/externals/grill/vasp/source/obj_frames.cpp @@ -77,7 +77,7 @@ private: FLEXT_ATTRGET_I(frms); }; -FLEXT_LIB_V("vasp.frames vasp.f, vasp",vasp_frames) +VASP_LIB_V("vasp.frames vasp.f",vasp_frames) @@ -113,7 +113,7 @@ public: virtual V m_help() { post("%s - Raise/lower a vasp's frame count",thisName()); } }; -FLEXT_LIB_V("vasp.frames+ vasp.f+, vasp",vasp_dframes) +VASP_LIB_V("vasp.frames+ vasp.f+",vasp_dframes) @@ -166,7 +166,7 @@ protected: FLEXT_ATTRGET_F(factor); }; -FLEXT_LIB_V("vasp.frames* vasp.f*, vasp",vasp_mframes) +VASP_LIB_V("vasp.frames* vasp.f*",vasp_mframes) @@ -199,7 +199,7 @@ public: virtual V m_help() { post("%s - Divide a vasp's frame count",thisName()); } }; -FLEXT_LIB_V("vasp.frames/ vasp.f/, vasp",vasp_rframes) +VASP_LIB_V("vasp.frames/ vasp.f/",vasp_rframes) @@ -236,6 +236,6 @@ public: virtual V m_help() { post("%s - Get a vasp's frame count",thisName()); } }; -FLEXT_LIB("vasp.frames? vasp.f?, vasp",vasp_qframes) +VASP_LIB("vasp.frames? vasp.f?",vasp_qframes) diff --git a/externals/grill/vasp/source/obj_imm.cpp b/externals/grill/vasp/source/obj_imm.cpp index 52b0e89e..258d5049 100644 --- a/externals/grill/vasp/source/obj_imm.cpp +++ b/externals/grill/vasp/source/obj_imm.cpp @@ -118,6 +118,6 @@ private: FLEXT_ATTRVAR_B(zero); }; -FLEXT_LIB_V("vasp.imm vasp.!, vasp",vasp_imm) +VASP_LIB_V("vasp.imm vasp.!",vasp_imm) diff --git a/externals/grill/vasp/source/obj_offs.cpp b/externals/grill/vasp/source/obj_offs.cpp index 9efa2fb5..6e1a584e 100644 --- a/externals/grill/vasp/source/obj_offs.cpp +++ b/externals/grill/vasp/source/obj_offs.cpp @@ -76,7 +76,7 @@ private: FLEXT_ATTRGET_I(offs); }; -FLEXT_LIB_V("vasp.offset vasp.o, vasp",vasp_offset) +VASP_LIB_V("vasp.offset vasp.o",vasp_offset) @@ -112,7 +112,7 @@ public: virtual V m_help() { post("%s - Shift a vasp's offset(s) into the vector buffers",thisName()); } }; -FLEXT_LIB_V("vasp.offset+ vasp.o+, vasp",vasp_doffset) +VASP_LIB_V("vasp.offset+ vasp.o+",vasp_doffset) @@ -175,5 +175,5 @@ public: virtual V m_help() { post("%s - Get a single vectored vasp's offset into the buffer",thisName()); } }; -FLEXT_LIB("vasp.offset? vasp.o?, vasp",vasp_qoffset) +VASP_LIB("vasp.offset? vasp.o?",vasp_qoffset) diff --git a/externals/grill/vasp/source/obj_part.cpp b/externals/grill/vasp/source/obj_part.cpp index 1db6ec42..59c79db3 100644 --- a/externals/grill/vasp/source/obj_part.cpp +++ b/externals/grill/vasp/source/obj_part.cpp @@ -110,6 +110,6 @@ protected: FLEXT_CALLVAR_V(m_getpart,m_setpart); }; -FLEXT_LIB_V("vasp.part, vasp",vasp_part) +VASP_LIB_V("vasp.part",vasp_part) diff --git a/externals/grill/vasp/source/obj_peaks.cpp b/externals/grill/vasp/source/obj_peaks.cpp index be83348b..2a22979b 100644 --- a/externals/grill/vasp/source/obj_peaks.cpp +++ b/externals/grill/vasp/source/obj_peaks.cpp @@ -114,6 +114,6 @@ private: FLEXT_ATTRGET_I(peaks); }; -FLEXT_LIB_V("vasp.peaks?, vasp",vasp_qpeaks) +VASP_LIB_V("vasp.peaks?",vasp_qpeaks) diff --git a/externals/grill/vasp/source/obj_q.cpp b/externals/grill/vasp/source/obj_q.cpp index 7b10bab9..9756f4a4 100644 --- a/externals/grill/vasp/source/obj_q.cpp +++ b/externals/grill/vasp/source/obj_q.cpp @@ -59,7 +59,7 @@ public: virtual V m_help() { post("%s - Get list of samples of a vasp vector",thisName()); } }; -FLEXT_LIB("vasp.list vasp.?, vasp",vasp_list) +VASP_LIB("vasp.list vasp.?",vasp_list) @@ -120,5 +120,5 @@ public: virtual V m_help() { post("%s - Get list of non-zero samples of a vasp vector",thisName()); } }; -FLEXT_LIB("vasp.nonzero vasp.??, vasp",vasp_nonzero) +VASP_LIB("vasp.nonzero vasp.??",vasp_nonzero) diff --git a/externals/grill/vasp/source/obj_radio.cpp b/externals/grill/vasp/source/obj_radio.cpp index 435060ad..8932e801 100644 --- a/externals/grill/vasp/source/obj_radio.cpp +++ b/externals/grill/vasp/source/obj_radio.cpp @@ -49,7 +49,7 @@ private: FLEXT_CALLBACK_A(m_any); }; -FLEXT_LIB("vasp.radio, vasp",vasp_radio) +VASP_LIB("vasp.radio",vasp_radio) V vasp_radio::m_any(const t_symbol *s,I argc,const t_atom *argv) diff --git a/externals/grill/vasp/source/obj_size.cpp b/externals/grill/vasp/source/obj_size.cpp index 99d05860..af4ba62e 100644 --- a/externals/grill/vasp/source/obj_size.cpp +++ b/externals/grill/vasp/source/obj_size.cpp @@ -81,7 +81,7 @@ private: FLEXT_ATTRVAR_B(zero); }; -FLEXT_LIB_V("vasp.size vasp.s, vasp",vasp_size) +VASP_LIB_V("vasp.size vasp.s",vasp_size) @@ -117,7 +117,7 @@ public: virtual V m_help() { post("%s - Increase the size of the vector buffers",thisName()); } }; -FLEXT_LIB_V("vasp.size+ vasp.s+, vasp",vasp_dsize) +VASP_LIB_V("vasp.size+ vasp.s+",vasp_dsize) @@ -170,7 +170,7 @@ protected: FLEXT_ATTRGET_F(factor); }; -FLEXT_LIB_V("vasp.size* vasp.s*, vasp",vasp_msize) +VASP_LIB_V("vasp.size* vasp.s*",vasp_msize) @@ -203,7 +203,7 @@ public: virtual V m_help() { post("%s - Divide the size of the vector buffers",thisName()); } }; -FLEXT_LIB_V("vasp.size/ vasp.s/, vasp",vasp_rsize) +VASP_LIB_V("vasp.size/ vasp.s/",vasp_rsize) @@ -261,5 +261,5 @@ public: virtual V m_help() { post("%s - Get the buffer size of a vector",thisName()); } }; -FLEXT_LIB("vasp.size? vasp.s?, vasp",vasp_qsize) +VASP_LIB("vasp.size? vasp.s?",vasp_qsize) diff --git a/externals/grill/vasp/source/obj_split.cpp b/externals/grill/vasp/source/obj_split.cpp index c39a15ca..341179d4 100644 --- a/externals/grill/vasp/source/obj_split.cpp +++ b/externals/grill/vasp/source/obj_split.cpp @@ -72,7 +72,7 @@ public: virtual V m_help() { post("%s - Split a vasp into its vectors",thisName()); } }; -FLEXT_LIB_V("vasp.split, vasp",vasp_split) +VASP_LIB_V("vasp.split",vasp_split) /*! \class vasp_join @@ -155,7 +155,7 @@ private: FLEXT_CALLBACK(m_reset) }; -FLEXT_LIB_V("vasp.join, vasp",vasp_join) +VASP_LIB_V("vasp.join",vasp_join) @@ -212,7 +212,7 @@ public: virtual V m_help() { post("%s - Spit out vectors of a vasp",thisName()); } }; -FLEXT_LIB_V("vasp.spit, vasp",vasp_spit) +VASP_LIB_V("vasp.spit",vasp_spit) /*! \class vasp_gather @@ -284,7 +284,7 @@ private: FLEXT_CALLBACK_V(m_add) }; -FLEXT_LIB_V("vasp.gather, vasp",vasp_gather) +VASP_LIB_V("vasp.gather",vasp_gather) diff --git a/externals/grill/vasp/source/obj_sync.cpp b/externals/grill/vasp/source/obj_sync.cpp index bfb02515..b6ad0963 100644 --- a/externals/grill/vasp/source/obj_sync.cpp +++ b/externals/grill/vasp/source/obj_sync.cpp @@ -125,6 +125,6 @@ private: FLEXT_CALLBACK(m_reset) }; -FLEXT_LIB_V("vasp.sync, vasp",vasp_sync) +VASP_LIB_V("vasp.sync",vasp_sync) diff --git a/externals/grill/vasp/source/obj_vasp.cpp b/externals/grill/vasp/source/obj_vasp.cpp index fa6958cc..9b8cfb5d 100644 --- a/externals/grill/vasp/source/obj_vasp.cpp +++ b/externals/grill/vasp/source/obj_vasp.cpp @@ -62,7 +62,7 @@ private: FLEXT_CALLBACK_V(a_radio); }; -FLEXT_LIB_V("vasp, vasp",vasp_v) +VASP_LIB_V("vasp",vasp_v) @@ -98,7 +98,7 @@ public: virtual V m_help() { post("%s - Update graphics of a vasp",thisName()); } }; -FLEXT_LIB("vasp.update vasp.u, vasp",vasp_update) +VASP_LIB("vasp.update vasp.u",vasp_update) @@ -151,7 +151,7 @@ public: virtual V m_help() { post("%s - Check vasp dimensions",thisName()); } }; -FLEXT_LIB("vasp.check vasp.chk, vasp",vasp_check) +VASP_LIB("vasp.check vasp.chk",vasp_check) @@ -201,5 +201,5 @@ public: virtual V m_help() { post("%s - Output a vasp multiple times",thisName()); } }; -FLEXT_LIB_V("vasp.multi vasp.m, vasp",vasp_multi) +VASP_LIB_V("vasp.multi vasp.m",vasp_multi) diff --git a/externals/grill/vasp/source/obj_vecs.cpp b/externals/grill/vasp/source/obj_vecs.cpp index 27ed7290..d056189e 100644 --- a/externals/grill/vasp/source/obj_vecs.cpp +++ b/externals/grill/vasp/source/obj_vecs.cpp @@ -66,7 +66,7 @@ private: FLEXT_ATTRGET_I(ix); }; -FLEXT_LIB_V("vasp.vector vasp.n, vasp",vasp_vector) +VASP_LIB_V("vasp.vector vasp.n",vasp_vector) @@ -105,7 +105,7 @@ public: virtual V m_help() { post("%s - Get number of vectors of a vasp",thisName()); } }; -FLEXT_LIB("vasp.vectors? vasp.n?, vasp",vasp_qvectors) +VASP_LIB("vasp.vectors? vasp.n?",vasp_qvectors) diff --git a/externals/grill/vasp/source/ops_arith.cpp b/externals/grill/vasp/source/ops_arith.cpp index 0358bc22..eb05f8a0 100644 --- a/externals/grill/vasp/source/ops_arith.cpp +++ b/externals/grill/vasp/source/ops_arith.cpp @@ -75,5 +75,5 @@ public: virtual V m_help() { post("%s - Get the sum of a vasp's sample values",thisName()); } }; -FLEXT_LIB("vasp.sum?, vasp",vasp_qsum) +VASP_LIB("vasp.sum?",vasp_qsum) diff --git a/externals/grill/vasp/source/ops_assign.cpp b/externals/grill/vasp/source/ops_assign.cpp index 534e0da4..e0adc444 100644 --- a/externals/grill/vasp/source/ops_assign.cpp +++ b/externals/grill/vasp/source/ops_assign.cpp @@ -75,7 +75,7 @@ public: virtual V m_help() { post("%s - Copies the triggering vasp to the argument vasp",thisName()); } }; -FLEXT_LIB_V("vasp.copy vasp.->, vasp",vasp_copy) +VASP_LIB_V("vasp.copy vasp.->",vasp_copy) class vasp_ccopy: @@ -90,6 +90,6 @@ public: virtual V m_help() { post("%s - Copies complex pairs of the triggering vasp to the argument vasp",thisName()); } }; -FLEXT_LIB_V("vasp.ccopy vasp.c->, vasp",vasp_ccopy) +VASP_LIB_V("vasp.ccopy vasp.c->",vasp_ccopy) diff --git a/externals/grill/vasp/source/ops_cmp.cpp b/externals/grill/vasp/source/ops_cmp.cpp index f2c2ac4d..34b7a98a 100644 --- a/externals/grill/vasp/source/ops_cmp.cpp +++ b/externals/grill/vasp/source/ops_cmp.cpp @@ -39,7 +39,7 @@ VASP_BINARY("vasp.rmax",rmax,true,VASP_ARG_R(0),"assigns the maximum of the radi // -------------------------------------------------------------- -VASP_UNARY("vasp, vasp.minmax",minmax,true,"compare two vectors, assign the lower values to the first and the higher to the second one") +VASP_UNARY("vasp.minmax",minmax,true,"compare two vectors, assign the lower values to the first and the higher to the second one") diff --git a/externals/grill/vasp/source/ops_feature.cpp b/externals/grill/vasp/source/ops_feature.cpp index 44d106bd..89e3a156 100644 --- a/externals/grill/vasp/source/ops_feature.cpp +++ b/externals/grill/vasp/source/ops_feature.cpp @@ -171,7 +171,7 @@ public: virtual V m_help() { post("%s - Get non-zero values only for peaks",thisName()); } }; -FLEXT_LIB_V("vasp.peaks, vasp",vasp_peaks) +VASP_LIB_V("vasp.peaks",vasp_peaks) class vasp_valleys: @@ -188,7 +188,7 @@ public: virtual V m_help() { post("%s - Get non-zero values only for values",thisName()); } }; -FLEXT_LIB_V("vasp.valleys, vasp",vasp_valleys) +VASP_LIB_V("vasp.valleys",vasp_valleys) class vasp_rpeaks: @@ -205,7 +205,7 @@ public: virtual V m_help() { post("%s - Get non-zero values only for peaks of the complex radius",thisName()); } }; -FLEXT_LIB_V("vasp.rpeaks, vasp",vasp_rpeaks) +VASP_LIB_V("vasp.rpeaks",vasp_rpeaks) class vasp_rvalleys: @@ -222,5 +222,5 @@ public: virtual V m_help() { post("%s - Get non-zero values only for valleys of the complex radius",thisName()); } }; -FLEXT_LIB_V("vasp.rvalleys, vasp",vasp_rvalleys) +VASP_LIB_V("vasp.rvalleys",vasp_rvalleys) diff --git a/externals/grill/vasp/source/ops_qminmax.cpp b/externals/grill/vasp/source/ops_qminmax.cpp index 70e2680d..22ae6128 100644 --- a/externals/grill/vasp/source/ops_qminmax.cpp +++ b/externals/grill/vasp/source/ops_qminmax.cpp @@ -68,7 +68,7 @@ public: virtual V m_help() { post("%s - Get a vasp's minimum sample value",thisName()); } }; -FLEXT_LIB("vasp.min?, vasp",vasp_qmin) +VASP_LIB("vasp.min?",vasp_qmin) /*! \class vasp_qamin @@ -100,7 +100,7 @@ public: virtual V m_help() { post("%s - Get a vasp's minimum absolute sample value",thisName()); } }; -FLEXT_LIB("vasp.amin?, vasp",vasp_qamin) +VASP_LIB("vasp.amin?",vasp_qamin) @@ -133,7 +133,7 @@ public: virtual V m_help() { post("%s - Get a vasp's maximum sample value",thisName()); } }; -FLEXT_LIB("vasp.max?, vasp",vasp_qmax) +VASP_LIB("vasp.max?",vasp_qmax) @@ -166,7 +166,7 @@ public: virtual V m_help() { post("%s - Get a vasp's maximum absolute sample value",thisName()); } }; -FLEXT_LIB("vasp.amax?, vasp",vasp_qamax) +VASP_LIB("vasp.amax?",vasp_qamax) @@ -227,7 +227,7 @@ public: virtual V m_help() { post("%s - Get a vasp's minimum complex radius",thisName()); } }; -FLEXT_LIB("vasp.rmin?, vasp",vasp_qrmin) +VASP_LIB("vasp.rmin?",vasp_qrmin) @@ -260,7 +260,7 @@ public: virtual V m_help() { post("%s - Get a vasp's maximum complex radius",thisName()); } }; -FLEXT_LIB("vasp.rmax?, vasp",vasp_qrmax) +VASP_LIB("vasp.rmax?",vasp_qrmax) diff --git a/externals/grill/vasp/source/ops_rearr.cpp b/externals/grill/vasp/source/ops_rearr.cpp index a17eb03c..fc86b327 100644 --- a/externals/grill/vasp/source/ops_rearr.cpp +++ b/externals/grill/vasp/source/ops_rearr.cpp @@ -140,7 +140,7 @@ protected: private: FLEXT_ATTRVAR_E(fill,xs_fill) }; -FLEXT_LIB_V("vasp.shift, vasp",vasp_shift) +VASP_LIB_V("vasp.shift",vasp_shift) class vasp_xshift: @@ -159,7 +159,7 @@ public: virtual V m_help() { post("%s - Shifts buffer data symmetrically (in two halves)",thisName()); } }; -FLEXT_LIB_V("vasp.xshift, vasp",vasp_xshift) +VASP_LIB_V("vasp.xshift",vasp_xshift) inline int rotation(int ij, int n,OpParam &p) { return (ij+n-p.sh.ish)%n; } diff --git a/externals/grill/vasp/source/ops_resmp.cpp b/externals/grill/vasp/source/ops_resmp.cpp index 41466bf3..b37dd8dc 100644 --- a/externals/grill/vasp/source/ops_resmp.cpp +++ b/externals/grill/vasp/source/ops_resmp.cpp @@ -251,7 +251,7 @@ private: FLEXT_ATTRVAR_E(fill,xt_fill) FLEXT_ATTRVAR_E(inter,xt_inter) }; -FLEXT_LIB_V("vasp.tilt, vasp",vasp_tilt) +VASP_LIB_V("vasp.tilt",vasp_tilt) class vasp_xtilt: @@ -270,6 +270,6 @@ public: virtual V m_help() { post("%s - Resamples buffer data symmetrically (in two halves)",thisName()); } }; -FLEXT_LIB_V("vasp.xtilt, vasp",vasp_xtilt) +VASP_LIB_V("vasp.xtilt",vasp_xtilt) diff --git a/externals/grill/vasp/source/ops_search.cpp b/externals/grill/vasp/source/ops_search.cpp index 0157d469..cf7e7df3 100644 --- a/externals/grill/vasp/source/ops_search.cpp +++ b/externals/grill/vasp/source/ops_search.cpp @@ -191,7 +191,7 @@ public: virtual V m_help() { post("%s - Define starting point by searching for given value",thisName()); } }; -FLEXT_LIB_V("vasp.offset= vasp.o=, vasp",vasp_soffset) +VASP_LIB_V("vasp.offset= vasp.o=",vasp_soffset) class vasp_sframes: @@ -208,6 +208,6 @@ public: virtual V m_help() { post("%s - Define vasp frame length by searching for given value",thisName()); } }; -FLEXT_LIB_V("vasp.frames= vasp.f=, vasp",vasp_sframes) +VASP_LIB_V("vasp.frames= vasp.f=",vasp_sframes) |