summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc4
-rw-r--r--gnuradio-core/src/lib/filter/gr_fft_filter_fff.h6
-rw-r--r--gnuradio-core/src/lib/filter/gri_fft_filter_fff.cc (renamed from gnuradio-core/src/lib/filter/gri_fft_filter.cc)14
-rw-r--r--gnuradio-core/src/lib/filter/gri_fft_filter_fff.h (renamed from gnuradio-core/src/lib/filter/gri_fft_filter.h)12
4 files changed, 17 insertions, 19 deletions
diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
index 8a9def19b..08c2c022f 100644
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
@@ -25,7 +25,7 @@
#endif
#include <gr_fft_filter_fff.h>
-#include <gri_fft_filter.h>
+#include <gri_fft_filter_fff.h>
#include <gr_io_signature.h>
#include <assert.h>
#include <stdexcept>
@@ -49,7 +49,7 @@ gr_fft_filter_fff::gr_fft_filter_fff (int decimation, const std::vector<float> &
{
set_history(1);
- d_filter = new gri_fft_filter(decimation, taps);
+ d_filter = new gri_fft_filter_fff(decimation, taps);
d_nsamples = d_filter->set_taps(taps);
set_output_multiple(d_nsamples);
}
diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
index 673d5d4e6..04cb3c8f0 100644
--- a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
+++ b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h
@@ -28,7 +28,7 @@ class gr_fft_filter_fff;
typedef boost::shared_ptr<gr_fft_filter_fff> gr_fft_filter_fff_sptr;
gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps);
-class gri_fft_filter;
+class gri_fft_filter_fff;
/*!
* \brief Fast FFT filter with float input, float output and float taps
@@ -39,11 +39,9 @@ class gr_fft_filter_fff : public gr_sync_decimator
private:
friend gr_fft_filter_fff_sptr gr_make_fft_filter_fff (int decimation, const std::vector<float> &taps);
- int d_ntaps;
int d_nsamples;
- int d_fftsize; // fftsize = ntaps + nsamples - 1
- gri_fft_filter *d_filter;
bool d_updated;
+ gri_fft_filter_fff *d_filter;
std::vector<float> d_new_taps;
/*!
diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter.cc b/gnuradio-core/src/lib/filter/gri_fft_filter_fff.cc
index 3d7dd152d..246d876b2 100644
--- a/gnuradio-core/src/lib/filter/gri_fft_filter.cc
+++ b/gnuradio-core/src/lib/filter/gri_fft_filter_fff.cc
@@ -24,19 +24,19 @@
#include "config.h"
#endif
-#include <gri_fft_filter.h>
+#include <gri_fft_filter_fff.h>
#include <gri_fft.h>
#include <assert.h>
#include <stdexcept>
#include <cstdio>
-gri_fft_filter::gri_fft_filter (int decimation, const std::vector<float> &taps)
+gri_fft_filter_fff::gri_fft_filter_fff (int decimation, const std::vector<float> &taps)
: d_fftsize(-1), d_decimation(decimation), d_fwdfft(0), d_invfft(0)
{
set_taps(taps);
}
-gri_fft_filter::~gri_fft_filter ()
+gri_fft_filter_fff::~gri_fft_filter_fff ()
{
delete d_fwdfft;
delete d_invfft;
@@ -46,7 +46,7 @@ gri_fft_filter::~gri_fft_filter ()
* determines d_ntaps, d_nsamples, d_fftsize, d_xformed_taps
*/
int
-gri_fft_filter::set_taps (const std::vector<float> &taps)
+gri_fft_filter_fff::set_taps (const std::vector<float> &taps)
{
int i = 0;
compute_sizes(taps.size());
@@ -80,7 +80,7 @@ gri_fft_filter::set_taps (const std::vector<float> &taps)
// determine and set d_ntaps, d_nsamples, d_fftsize
void
-gri_fft_filter::compute_sizes(int ntaps)
+gri_fft_filter_fff::compute_sizes(int ntaps)
{
int old_fftsize = d_fftsize;
d_ntaps = ntaps;
@@ -88,7 +88,7 @@ gri_fft_filter::compute_sizes(int ntaps)
d_nsamples = d_fftsize - d_ntaps + 1;
if (0)
- fprintf(stderr, "gri_fft_filter: ntaps = %d, fftsize = %d, nsamples = %d\n",
+ fprintf(stderr, "gri_fft_filter_fff: ntaps = %d, fftsize = %d, nsamples = %d\n",
d_ntaps, d_fftsize, d_nsamples);
assert(d_fftsize == d_ntaps + d_nsamples -1 );
@@ -103,7 +103,7 @@ gri_fft_filter::compute_sizes(int ntaps)
}
int
-gri_fft_filter::filter (int nitems, const float *input, float *output)
+gri_fft_filter_fff::filter (int nitems, const float *input, float *output)
{
int dec_ctr = 0;
int j = 0;
diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter.h b/gnuradio-core/src/lib/filter/gri_fft_filter_fff.h
index 174a596c2..35a2d2310 100644
--- a/gnuradio-core/src/lib/filter/gri_fft_filter.h
+++ b/gnuradio-core/src/lib/filter/gri_fft_filter_fff.h
@@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_GRI_FFT_FILTER_H
-#define INCLUDED_GRI_FFT_FILTER_H
+#ifndef INCLUDED_GRI_FFT_FILTER_FFF_H
+#define INCLUDED_GRI_FFT_FILTER_FFF_H
#include <gr_complex.h>
#include <vector>
@@ -29,7 +29,7 @@
class gri_fft_real_fwd;
class gri_fft_real_rev;
-class gri_fft_filter
+class gri_fft_filter_fff
{
private:
int d_ntaps;
@@ -46,8 +46,8 @@ class gri_fft_filter
int tailsize() const { return d_ntaps - 1; }
public:
- gri_fft_filter (int decimation, const std::vector<float> &taps);
- ~gri_fft_filter ();
+ gri_fft_filter_fff (int decimation, const std::vector<float> &taps);
+ ~gri_fft_filter_fff ();
int set_taps (const std::vector<float> &taps);
@@ -55,4 +55,4 @@ class gri_fft_filter
};
-#endif /* INCLUDED_GRI_FFT_FILTER_H */
+#endif /* INCLUDED_GRI_FFT_FILTER_FFF_H */