diff options
-rw-r--r-- | gr-fft/include/gnuradio/fft/fft.h | 3 | ||||
-rw-r--r-- | gr-fft/lib/fft.cc | 12 | ||||
-rw-r--r-- | gr-fft/lib/fft_vfc_fftw.cc | 1 | ||||
-rw-r--r-- | gr-fft/lib/fft_vfc_fftw.h | 1 |
4 files changed, 3 insertions, 14 deletions
diff --git a/gr-fft/include/gnuradio/fft/fft.h b/gr-fft/include/gnuradio/fft/fft.h index 84d02b3730..94dda11adb 100644 --- a/gr-fft/include/gnuradio/fft/fft.h +++ b/gr-fft/include/gnuradio/fft/fft.h @@ -66,7 +66,6 @@ public: */ class FFT_API fft_complex { - const int d_fft_size; int d_nthreads; volk::vector<gr_complex> d_inbuf; volk::vector<gr_complex> d_outbuf; @@ -113,7 +112,6 @@ public: */ class FFT_API fft_real_fwd { - const int d_fft_size; int d_nthreads; volk::vector<float> d_inbuf; volk::vector<gr_complex> d_outbuf; @@ -160,7 +158,6 @@ public: */ class FFT_API fft_real_rev { - const int d_fft_size; int d_nthreads; volk::vector<gr_complex> d_inbuf; volk::vector<float> d_outbuf; diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc index e787f2f950..d97c2b3ed6 100644 --- a/gr-fft/lib/fft.cc +++ b/gr-fft/lib/fft.cc @@ -156,7 +156,7 @@ static void export_wisdom() // ---------------------------------------------------------------- fft_complex::fft_complex(int fft_size, bool forward, int nthreads) - : d_fft_size(fft_size), d_nthreads(nthreads), d_inbuf(fft_size), d_outbuf(fft_size) + : d_nthreads(nthreads), d_inbuf(fft_size), d_outbuf(fft_size) { // Hold global mutex during plan construction and destruction. planner::scoped_lock lock(planner::mutex()); @@ -211,10 +211,7 @@ void fft_complex::execute() { fftwf_execute((fftwf_plan)d_plan); } // ---------------------------------------------------------------- fft_real_fwd::fft_real_fwd(int fft_size, int nthreads) - : d_fft_size(fft_size), - d_nthreads(nthreads), - d_inbuf(fft_size), - d_outbuf(fft_size / 2 + 1) + : d_nthreads(nthreads), d_inbuf(fft_size), d_outbuf(fft_size / 2 + 1) { // Hold global mutex during plan construction and destruction. planner::scoped_lock lock(planner::mutex()); @@ -269,10 +266,7 @@ void fft_real_fwd::execute() { fftwf_execute((fftwf_plan)d_plan); } // ---------------------------------------------------------------- fft_real_rev::fft_real_rev(int fft_size, int nthreads) - : d_fft_size(fft_size), - d_nthreads(nthreads), - d_inbuf(fft_size / 2 + 1), - d_outbuf(fft_size) + : d_nthreads(nthreads), d_inbuf(fft_size / 2 + 1), d_outbuf(fft_size) { // Hold global mutex during plan construction and destruction. planner::scoped_lock lock(planner::mutex()); diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc index 320d90fcc8..2cbaec3a7d 100644 --- a/gr-fft/lib/fft_vfc_fftw.cc +++ b/gr-fft/lib/fft_vfc_fftw.cc @@ -47,7 +47,6 @@ fft_vfc_fftw::fft_vfc_fftw(int fft_size, io_signature::make(1, 1, fft_size * sizeof(float)), io_signature::make(1, 1, fft_size * sizeof(gr_complex))), d_fft_size(fft_size), - d_forward(forward), d_fft(fft_size, forward, nthreads) { if (!set_window(window)) diff --git a/gr-fft/lib/fft_vfc_fftw.h b/gr-fft/lib/fft_vfc_fftw.h index acee4c38bf..2e7ba3b5f9 100644 --- a/gr-fft/lib/fft_vfc_fftw.h +++ b/gr-fft/lib/fft_vfc_fftw.h @@ -33,7 +33,6 @@ class FFT_API fft_vfc_fftw : public fft_vfc { private: const unsigned int d_fft_size; - const bool d_forward; fft_complex d_fft; std::vector<float> d_window; |