diff options
| author | Johnathan Corgan | 2012-02-14 12:32:52 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-02-14 12:34:47 -0800 |
| commit | f0a1631dad755d5abf28351f07b2bbf7773b37b8 (patch) | |
| tree | 397b02568ddbab1f85646afdd06aee6fd540c99c /grc/blocks/gr_fft_vxx.xml | |
| parent | ef1748e4efc40cc065fb5f1b40d710256dd37efa (diff) | |
| parent | dc266ca38bdc59955f8c8d8a98291f078d7f4377 (diff) | |
| download | gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.gz gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.bz2 gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.zip | |
Merge branch 'master' into safe_align
Conflicts:
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
Diffstat (limited to 'grc/blocks/gr_fft_vxx.xml')
| -rw-r--r-- | grc/blocks/gr_fft_vxx.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/grc/blocks/gr_fft_vxx.xml b/grc/blocks/gr_fft_vxx.xml index d398486ef..565354e41 100644 --- a/grc/blocks/gr_fft_vxx.xml +++ b/grc/blocks/gr_fft_vxx.xml @@ -10,10 +10,11 @@ <import>from gnuradio import gr</import> <import>from gnuradio import window</import> <make>#if $type() == "complex" -gr.fft_vcc($fft_size, $forward, $window, $shift) +gr.fft_vcc($fft_size, $forward, $window, $shift, $nthreads) #else -gr.fft_vfc($fft_size, $forward, $window) +gr.fft_vfc($fft_size, $forward, $window, $nthreads) #end if</make> + <callback>set_nthreads($nthreads)</callback> <param> <name>Input Type</name> <key>type</key> @@ -68,6 +69,12 @@ gr.fft_vfc($fft_size, $forward, $window) <key>False</key> </option> </param> + <param> + <name>Num. Threads</name> + <key>nthreads</key> + <value>1</value> + <type>int</type> + </param> <sink> <name>in</name> <type>$type</type> |