From f9fcc6d7c3dc453acd9b34b7bb7a24964ad5db9a Mon Sep 17 00:00:00 2001
From: Josh Morman <jmorman@perspectalabs.com>
Date: Thu, 17 Dec 2020 11:08:41 -0500
Subject: fft: populate window enums under fft.window

Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
---
 gr-fft/python/fft/bindings/window_python.cc | 30 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'gr-fft/python/fft')

diff --git a/gr-fft/python/fft/bindings/window_python.cc b/gr-fft/python/fft/bindings/window_python.cc
index 6d0781fd72..3e9cdeec5e 100644
--- a/gr-fft/python/fft/bindings/window_python.cc
+++ b/gr-fft/python/fft/bindings/window_python.cc
@@ -31,10 +31,23 @@ void bind_window(py::module& m)
 {
     using window = gr::fft::window;
 
+    py::class_<window, std::shared_ptr<window>> window_class(m, "window", D(window));
 
-    py::class_<window, std::shared_ptr<window>>(m, "window", D(window))
+    py::enum_<gr::fft::window::win_type>(window_class, "win_type")
+        .value("WIN_HAMMING", gr::fft::window::WIN_HAMMING)                 // 0
+        .value("WIN_HANN", gr::fft::window::WIN_HANN)                       // 1
+        .value("WIN_BLACKMAN", gr::fft::window::WIN_BLACKMAN)               // 2
+        .value("WIN_RECTANGULAR", gr::fft::window::WIN_RECTANGULAR)         // 3
+        .value("WIN_KAISER", gr::fft::window::WIN_KAISER)                   // 4
+        .value("WIN_BLACKMAN_hARRIS", gr::fft::window::WIN_BLACKMAN_hARRIS) // 5
+        .value("WIN_BLACKMAN_HARRIS", gr::fft::window::WIN_BLACKMAN_HARRIS) // 5
+        .value("WIN_BARTLETT", gr::fft::window::WIN_BARTLETT)               // 6
+        .value("WIN_FLATTOP", gr::fft::window::WIN_FLATTOP)                 // 7
+        .export_values();
 
+    py::implicitly_convertible<int, gr::fft::window::win_type>();
 
+    window_class
         .def_static("max_attenuation",
                     &window::max_attenuation,
                     py::arg("type"),
@@ -180,19 +193,4 @@ void bind_window(py::module& m)
                     D(window, build))
 
         ;
-
-
-    py::enum_<gr::fft::window::win_type>(m, "win_type")
-        .value("WIN_HAMMING", gr::fft::window::WIN_HAMMING)                 // 0
-        .value("WIN_HANN", gr::fft::window::WIN_HANN)                       // 1
-        .value("WIN_BLACKMAN", gr::fft::window::WIN_BLACKMAN)               // 2
-        .value("WIN_RECTANGULAR", gr::fft::window::WIN_RECTANGULAR)         // 3
-        .value("WIN_KAISER", gr::fft::window::WIN_KAISER)                   // 4
-        .value("WIN_BLACKMAN_hARRIS", gr::fft::window::WIN_BLACKMAN_hARRIS) // 5
-        .value("WIN_BLACKMAN_HARRIS", gr::fft::window::WIN_BLACKMAN_HARRIS) // 5
-        .value("WIN_BARTLETT", gr::fft::window::WIN_BARTLETT)               // 6
-        .value("WIN_FLATTOP", gr::fft::window::WIN_FLATTOP)                 // 7
-        .export_values();
-
-    py::implicitly_convertible<int, gr::fft::window::win_type>();
 }
-- 
cgit v1.2.3