Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / grc / blocks / band_reject_filter.xml

diff --git a/grc/blocks/band_reject_filter.xml b/grc/blocks/band_reject_filter.xml
index 3b58f0b51431a1d555c650dcd0e6ddf9a2b6c7de..dd5e7a9d7664a814867dad3ab34b83b7aebabfa5 100644 (file)
--- a/grc/blocks/band_reject_filter.xml
+++ b/grc/blocks/band_reject_filter.xml
@@ -10,8 +10,8 @@
        <import>from gnuradio import gr</import>
        <import>from gnuradio.gr import firdes</import>
        <make>gr.$(type)(#if str($type).startswith('interp') then $interp else $decim#, firdes.band_reject(
-       $gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, firdes.$window, $beta))</make>
-       <callback>set_taps(firdes.band_reject($gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, firdes.$window, $beta))</callback>
+       $gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, $win, $beta))</make>
+       <callback>set_taps(firdes.band_reject($gain, $samp_rate, $low_cutoff_freq, $high_cutoff_freq, $width, $win, $beta))</callback>
        <param>
                <name>FIR Type</name>
                <key>type</key>
@@ -84,27 +84,28 @@
        </param>
        <param>
                <name>Window</name>
-               <key>window</key>
-               <type>enum</type>
+               <key>win</key>
+               <value>firdes.WIN_HAMMING</value>
+               <type>int</type>
                <option>
                        <name>Hamming</name>
-                       <key>WIN_HAMMING</key>
+                       <key>firdes.WIN_HAMMING</key>
                </option>
                <option>
                        <name>Hann</name>
-                       <key>WIN_HANN</key>
+                       <key>firdes.WIN_HANN</key>
                </option>
                <option>
                        <name>Blackman</name>
-                       <key>WIN_BLACKMAN</key>
+                       <key>firdes.WIN_BLACKMAN</key>
                </option>
                <option>
                        <name>Rectangular</name>
-                       <key>WIN_RECTANGULAR</key>
+                       <key>firdes.WIN_RECTANGULAR</key>
                </option>
                <option>
                        <name>Kaiser</name>
-                       <key>WIN_KAISER</key>
+                       <key>firdes.WIN_KAISER</key>
                </option>
        </param>
        <param>