diff options
Diffstat (limited to 'gr-fft/include')
-rw-r--r-- | gr-fft/include/gnuradio/fft/CMakeLists.txt (renamed from gr-fft/include/fft/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/api.h (renamed from gr-fft/include/fft/api.h) | 2 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/fft.h (renamed from gr-fft/include/fft/fft.h) | 4 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/fft_vcc.h (renamed from gr-fft/include/fft/fft_vcc.h) | 6 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/fft_vfc.h (renamed from gr-fft/include/fft/fft_vfc.h) | 6 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/goertzel.h (renamed from gr-fft/include/fft/goertzel.h) | 4 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/goertzel_fc.h (renamed from gr-fft/include/fft/goertzel_fc.h) | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/gr-fft/include/fft/CMakeLists.txt b/gr-fft/include/gnuradio/fft/CMakeLists.txt index bce3da674d..bce3da674d 100644 --- a/gr-fft/include/fft/CMakeLists.txt +++ b/gr-fft/include/gnuradio/fft/CMakeLists.txt diff --git a/gr-fft/include/fft/api.h b/gr-fft/include/gnuradio/fft/api.h index a569ceb265..ce2a49f4be 100644 --- a/gr-fft/include/fft/api.h +++ b/gr-fft/include/gnuradio/fft/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_FFT_API_H #define INCLUDED_FFT_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_fft_EXPORTS # define FFT_API __GR_ATTR_EXPORT diff --git a/gr-fft/include/fft/fft.h b/gr-fft/include/gnuradio/fft/fft.h index 305b1cb711..04673c16e1 100644 --- a/gr-fft/include/fft/fft.h +++ b/gr-fft/include/gnuradio/fft/fft.h @@ -27,8 +27,8 @@ * Wrappers for FFTW single precision 1d dft */ -#include <fft/api.h> -#include <gr_complex.h> +#include <gnuradio/fft/api.h> +#include <gnuradio/gr_complex.h> #include <boost/thread.hpp> namespace gr { diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/gnuradio/fft/fft_vcc.h index 2f5b5a23f0..a2682de196 100644 --- a/gr-fft/include/fft/fft_vcc.h +++ b/gr-fft/include/gnuradio/fft/fft_vcc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_FFT_VCC_H #define INCLUDED_FFT_FFT_VCC_H -#include <fft/api.h> -#include <gr_sync_block.h> +#include <gnuradio/fft/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace fft { @@ -33,7 +33,7 @@ namespace gr { * \brief Compute forward or reverse FFT. complex vector in / complex vector out. * \ingroup fourier_analysis_blk */ - class FFT_API fft_vcc : virtual public gr_sync_block + class FFT_API fft_vcc : virtual public sync_block { public: diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/gnuradio/fft/fft_vfc.h index 89491113b6..9937d92a34 100644 --- a/gr-fft/include/fft/fft_vfc.h +++ b/gr-fft/include/gnuradio/fft/fft_vfc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_FFT_VFC_H #define INCLUDED_FFT_FFT_VFC_H -#include <fft/api.h> -#include <gr_sync_block.h> +#include <gnuradio/fft/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace fft { @@ -33,7 +33,7 @@ namespace gr { * \brief Compute forward or reverse FFT. float vector in / complex vector out. * \ingroup fourier_analysis_blk */ - class FFT_API fft_vfc : virtual public gr_sync_block + class FFT_API fft_vfc : virtual public sync_block { public: diff --git a/gr-fft/include/fft/goertzel.h b/gr-fft/include/gnuradio/fft/goertzel.h index ff37355e64..47ff1dd18c 100644 --- a/gr-fft/include/fft/goertzel.h +++ b/gr-fft/include/gnuradio/fft/goertzel.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_IMPL_GOERTZEL_H #define INCLUDED_FFT_IMPL_GOERTZEL_H -#include <fft/api.h> -#include <gr_types.h> +#include <gnuradio/fft/api.h> +#include <gnuradio/types.h> namespace gr { namespace fft { diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/gnuradio/fft/goertzel_fc.h index 26b0d0d11c..3815ac0fd4 100644 --- a/gr-fft/include/fft/goertzel_fc.h +++ b/gr-fft/include/gnuradio/fft/goertzel_fc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_GOERTZEL_FC_H #define INCLUDED_FFT_GOERTZEL_FC_H -#include <fft/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/fft/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace fft { @@ -33,7 +33,7 @@ namespace gr { * \brief Goertzel single-bin DFT calculation. * \ingroup fourier_analysis_blk */ - class FFT_API goertzel_fc : virtual public gr_sync_decimator + class FFT_API goertzel_fc : virtual public sync_decimator { public: |