Removed fftw_plan from xtraction functions. Created new init function xtract_init_fft() for creating plans, which have global scope. Updated examples to reflect the change. New configure option: --with-fft_optimisation (0 = FFTW_ESTIMATE, 1 = FFTW_MEASURE, 2 = FFTW_PATIENT).

1 files changed, 15 insertions, 15 deletions

diff --git a/examples/puredata/xtract/f0.pd b/examples/puredata/xtract/f0.pd
index 47dc649..6ea0714 100644
--- a/examples/puredata/xtract/f0.pd
+++ b/examples/puredata/xtract/f0.pd
@@ -53,7 +53,7 @@
 #X connect 4 0 3 0;
 #X connect 4 0 1 1;
 #X restore 587 66 pd noise;
-#N canvas 135 136 496 580 pda 0;
+#N canvas 554 114 496 580 pda 0;
 #X obj 99 100 xtract~ f0;
 #X obj 197 6 inlet~;
 #X msg 361 203 list \$1;
@@ -79,7 +79,6 @@
 #X msg 60 48 list \$1;
 #X obj 274 59 r \$0-window-gen;
 #X obj 274 80 a_hann 2048;
-#X obj 147 195 xtract~ spectrum;
 #X obj 148 222 xtract~ peak_spectrum;
 #X obj 149 315 xtract~ lowest_value;
 #X obj 150 243 a_blockswap~ 2048;
@@ -87,15 +86,16 @@
 #X obj 358 150 / 2048;
 #X msg 358 171 \$1 10;
 #X obj 356 105 r \$0-peak-args;
+#X obj 147 195 xtract~ spectrum 2048;
 #X connect 0 0 2 0;
 #X connect 0 0 8 0;
 #X connect 0 0 9 0;
 #X connect 0 0 11 0;
 #X connect 1 0 19 0;
-#X connect 2 0 27 1;
-#X connect 3 0 25 0;
+#X connect 2 0 26 1;
+#X connect 3 0 32 0;
 #X connect 4 0 22 0;
-#X connect 7 0 27 0;
+#X connect 7 0 26 0;
 #X connect 8 0 9 1;
 #X connect 9 0 12 0;
 #X connect 10 0 12 0;
@@ -112,14 +112,14 @@
 #X connect 22 0 0 1;
 #X connect 23 0 24 0;
 #X connect 24 0 3 1;
-#X connect 25 0 26 0;
-#X connect 26 0 28 0;
-#X connect 27 0 10 0;
-#X connect 28 0 5 0;
+#X connect 25 0 27 0;
+#X connect 26 0 10 0;
+#X connect 27 0 5 0;
+#X connect 28 0 29 0;
 #X connect 29 0 30 0;
-#X connect 30 0 31 0;
-#X connect 31 0 26 1;
-#X connect 32 0 29 0;
+#X connect 30 0 25 1;
+#X connect 31 0 28 0;
+#X connect 32 0 25 0;
 #X restore 357 262 pd pda;
 #N canvas 0 0 596 417 d_saw 0;
 #X obj 382 176 phasor~;
@@ -250,14 +250,14 @@
 #X obj 11 -226 cnv 15 500 200 empty empty PDA_comparison 20 12 0 14
 -261681 -66577 0;
 #X obj 34 -94 hsl 128 15 2 2.05 0 0 \$0-inharmonicity empty fm-inharmonicity
--2 -6 0 8 -225271 -1 -1 800 1;
+-2 -6 0 8 -225271 -1 -1 0 1;
 #X obj 34 -50 hsl 128 15 0 0.5 0 0 \$0-noisiness empty noisiness -2
 -6 0 8 -225271 -1 -1 0 1;
 #X obj 33 -135 hsl 128 15 30 3000 0 0 \$0-fund empty f0 -2 -6 0 8 -225271
--1 -1 300 1;
+-1 -1 0 1;
 #X obj 32 -172 tgl 15 0 \$0-sine empty sine 0 -6 0 8 -225280 -1 -1
 0 1;
-#X obj 73 -172 tgl 15 0 \$0-fm empty fm 0 -6 0 8 -225280 -1 -1 1 1
+#X obj 73 -172 tgl 15 0 \$0-fm empty fm 0 -6 0 8 -225280 -1 -1 0 1
 ;
 #X obj 110 -172 tgl 15 0 \$0-saw empty saw 0 -6 0 8 -225280 -1 -1 0
 1;