diff options
39 files changed, 46 insertions, 46 deletions
diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.h b/gr-analog/lib/ctcss_squelch_ff_impl.h index c9cd8af1d0..8954b213e2 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.h +++ b/gr-analog/lib/ctcss_squelch_ff_impl.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ANALOG_CTCSS_SQUELCH_FF_IMPL_H #define INCLUDED_ANALOG_CTCSS_SQUELCH_FF_IMPL_H -#include <gnuradio/analog/ctcss_squelch_ff.h> #include "squelch_base_ff_impl.h" -#include <fft/goertzel.h> +#include <gnuradio/analog/ctcss_squelch_ff.h> +#include <gnuradio/fft/goertzel.h> namespace gr { namespace analog { diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index e9732eb30b..6bd08b257a 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -84,7 +84,7 @@ CPACK_COMPONENT("fft_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/fft) +add_subdirectory(include/gnuradio/fft) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) 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 ce2a49f4be..ce2a49f4be 100644 --- a/gr-fft/include/fft/api.h +++ b/gr-fft/include/gnuradio/fft/api.h diff --git a/gr-fft/include/fft/fft.h b/gr-fft/include/gnuradio/fft/fft.h index 9d2467df6f..04673c16e1 100644 --- a/gr-fft/include/fft/fft.h +++ b/gr-fft/include/gnuradio/fft/fft.h @@ -27,7 +27,7 @@ * Wrappers for FFTW single precision 1d dft */ -#include <fft/api.h> +#include <gnuradio/fft/api.h> #include <gnuradio/gr_complex.h> #include <boost/thread.hpp> diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/gnuradio/fft/fft_vcc.h index d0a0a53417..a2682de196 100644 --- a/gr-fft/include/fft/fft_vcc.h +++ b/gr-fft/include/gnuradio/fft/fft_vcc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FFT_FFT_VCC_H #define INCLUDED_FFT_FFT_VCC_H -#include <fft/api.h> +#include <gnuradio/fft/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/gnuradio/fft/fft_vfc.h index a3f5e133e5..9937d92a34 100644 --- a/gr-fft/include/fft/fft_vfc.h +++ b/gr-fft/include/gnuradio/fft/fft_vfc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FFT_FFT_VFC_H #define INCLUDED_FFT_FFT_VFC_H -#include <fft/api.h> +#include <gnuradio/fft/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-fft/include/fft/goertzel.h b/gr-fft/include/gnuradio/fft/goertzel.h index 7ec0a3d614..47ff1dd18c 100644 --- a/gr-fft/include/fft/goertzel.h +++ b/gr-fft/include/gnuradio/fft/goertzel.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FFT_IMPL_GOERTZEL_H #define INCLUDED_FFT_IMPL_GOERTZEL_H -#include <fft/api.h> +#include <gnuradio/fft/api.h> #include <gnuradio/types.h> namespace gr { diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/gnuradio/fft/goertzel_fc.h index d22fa98ab3..3815ac0fd4 100644 --- a/gr-fft/include/fft/goertzel_fc.h +++ b/gr-fft/include/gnuradio/fft/goertzel_fc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_FFT_GOERTZEL_FC_H #define INCLUDED_FFT_GOERTZEL_FC_H -#include <fft/api.h> +#include <gnuradio/fft/api.h> #include <gnuradio/sync_decimator.h> namespace gr { diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc index b3d0f04bc0..abcda7d30e 100644 --- a/gr-fft/lib/fft.cc +++ b/gr-fft/lib/fft.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/sys_paths.h> #include <fftw3.h> diff --git a/gr-fft/lib/fft_vcc_fftw.h b/gr-fft/lib/fft_vcc_fftw.h index ea15dd07bb..2aa2056f5b 100644 --- a/gr-fft/lib/fft_vcc_fftw.h +++ b/gr-fft/lib/fft_vcc_fftw.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H #define INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H -#include <fft/fft_vcc.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft_vcc.h> +#include <gnuradio/fft/fft.h> namespace gr { namespace fft { diff --git a/gr-fft/lib/fft_vfc_fftw.h b/gr-fft/lib/fft_vfc_fftw.h index 1b6f78ba63..2fe292f8ca 100644 --- a/gr-fft/lib/fft_vfc_fftw.h +++ b/gr-fft/lib/fft_vfc_fftw.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H #define INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H -#include <fft/fft_vfc.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft_vfc.h> +#include <gnuradio/fft/fft.h> namespace gr { namespace fft { diff --git a/gr-fft/lib/goertzel.cc b/gr-fft/lib/goertzel.cc index 4bcd5ee190..ddb086c531 100644 --- a/gr-fft/lib/goertzel.cc +++ b/gr-fft/lib/goertzel.cc @@ -25,7 +25,7 @@ #endif #include <cmath> -#include <fft/goertzel.h> +#include <gnuradio/fft/goertzel.h> namespace gr { namespace fft { diff --git a/gr-fft/lib/goertzel_fc_impl.h b/gr-fft/lib/goertzel_fc_impl.h index 426bc71f6b..79b24f15c4 100644 --- a/gr-fft/lib/goertzel_fc_impl.h +++ b/gr-fft/lib/goertzel_fc_impl.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_FFT_GOERTZEL_FC_IMPL_H #define INCLUDED_FFT_GOERTZEL_FC_IMPL_H -#include <fft/goertzel_fc.h> -#include <fft/goertzel.h> +#include <gnuradio/fft/goertzel_fc.h> +#include <gnuradio/fft/goertzel.h> namespace gr { namespace fft { diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt index 7c11b85bb4..476e343da7 100644 --- a/gr-fft/swig/CMakeLists.txt +++ b/gr-fft/swig/CMakeLists.txt @@ -36,7 +36,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fft_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fft) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/fft) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-fft) diff --git a/gr-fft/swig/fft_swig.i b/gr-fft/swig/fft_swig.i index 51e44cfe49..005f5ed23a 100644 --- a/gr-fft/swig/fft_swig.i +++ b/gr-fft/swig/fft_swig.i @@ -28,14 +28,14 @@ %include "fft_swig_doc.i" %{ -#include "fft/fft_vcc.h" -#include "fft/fft_vfc.h" -#include "fft/goertzel_fc.h" +#include "gnuradio/fft/fft_vcc.h" +#include "gnuradio/fft/fft_vfc.h" +#include "gnuradio/fft/goertzel_fc.h" %} -%include "fft/fft_vcc.h" -%include "fft/fft_vfc.h" -%include "fft/goertzel_fc.h" +%include "gnuradio/fft/fft_vcc.h" +%include "gnuradio/fft/fft_vfc.h" +%include "gnuradio/fft/goertzel_fc.h" GR_SWIG_BLOCK_MAGIC2(fft, fft_vcc); GR_SWIG_BLOCK_MAGIC2(fft, fft_vfc); diff --git a/gr-filter/include/filter/fft_filter.h b/gr-filter/include/filter/fft_filter.h index 4be970e34f..cf5c638c05 100644 --- a/gr-filter/include/filter/fft_filter.h +++ b/gr-filter/include/filter/fft_filter.h @@ -26,7 +26,7 @@ #include <filter/api.h> #include <vector> #include <gnuradio/gr_complex.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> namespace gr { namespace filter { diff --git a/gr-filter/include/filter/polyphase_filterbank.h b/gr-filter/include/filter/polyphase_filterbank.h index 7ce891b6c8..3678c0c28e 100644 --- a/gr-filter/include/filter/polyphase_filterbank.h +++ b/gr-filter/include/filter/polyphase_filterbank.h @@ -26,7 +26,7 @@ #include <filter/api.h> #include <filter/fir_filter.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> namespace gr { namespace filter { diff --git a/gr-filter/lib/fir_filter.cc b/gr-filter/lib/fir_filter.cc index 58a500e2e6..f1d4662650 100644 --- a/gr-filter/lib/fir_filter.cc +++ b/gr-filter/lib/fir_filter.cc @@ -21,7 +21,7 @@ */ #include <filter/fir_filter.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <volk/volk.h> #include <cstdio> #include <cstring> diff --git a/gr-filter/lib/fir_filter_with_buffer.cc b/gr-filter/lib/fir_filter_with_buffer.cc index 7c37361c11..6aa7fc797e 100644 --- a/gr-filter/lib/fir_filter_with_buffer.cc +++ b/gr-filter/lib/fir_filter_with_buffer.cc @@ -25,7 +25,7 @@ #endif #include <filter/fir_filter_with_buffer.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <volk/volk.h> #include <algorithm> #include <cstdio> diff --git a/gr-filter/lib/pfb_channelizer_ccf_impl.h b/gr-filter/lib/pfb_channelizer_ccf_impl.h index 4c72ce4e25..f556e1e760 100644 --- a/gr-filter/lib/pfb_channelizer_ccf_impl.h +++ b/gr-filter/lib/pfb_channelizer_ccf_impl.h @@ -26,7 +26,7 @@ #include <filter/pfb_channelizer_ccf.h> #include <filter/polyphase_filterbank.h> #include <filter/fir_filter.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/thread/thread.h> namespace gr { diff --git a/gr-filter/lib/pfb_decimator_ccf_impl.h b/gr-filter/lib/pfb_decimator_ccf_impl.h index 44e0c278e1..cc57f9a003 100644 --- a/gr-filter/lib/pfb_decimator_ccf_impl.h +++ b/gr-filter/lib/pfb_decimator_ccf_impl.h @@ -27,7 +27,7 @@ #include <filter/pfb_decimator_ccf.h> #include <filter/polyphase_filterbank.h> #include <filter/fir_filter.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/thread/thread.h> namespace gr { diff --git a/gr-filter/lib/pfb_interpolator_ccf_impl.h b/gr-filter/lib/pfb_interpolator_ccf_impl.h index 3ee9276439..5c6b1b50bf 100644 --- a/gr-filter/lib/pfb_interpolator_ccf_impl.h +++ b/gr-filter/lib/pfb_interpolator_ccf_impl.h @@ -27,7 +27,7 @@ #include <filter/pfb_interpolator_ccf.h> #include <filter/polyphase_filterbank.h> #include <filter/fir_filter.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/thread/thread.h> namespace gr { diff --git a/gr-filter/lib/pfb_synthesizer_ccf_impl.h b/gr-filter/lib/pfb_synthesizer_ccf_impl.h index efb0425a3a..2e217e36e9 100644 --- a/gr-filter/lib/pfb_synthesizer_ccf_impl.h +++ b/gr-filter/lib/pfb_synthesizer_ccf_impl.h @@ -26,7 +26,7 @@ #include <filter/pfb_synthesizer_ccf.h> #include <filter/fir_filter_with_buffer.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/thread/thread.h> namespace gr { diff --git a/gr-filter/lib/qa_fir_filter_with_buffer.cc b/gr-filter/lib/qa_fir_filter_with_buffer.cc index d9c82804c1..7302e29225 100644 --- a/gr-filter/lib/qa_fir_filter_with_buffer.cc +++ b/gr-filter/lib/qa_fir_filter_with_buffer.cc @@ -27,7 +27,7 @@ #include <gnuradio/types.h> #include <qa_fir_filter_with_buffer.h> #include <filter/fir_filter_with_buffer.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <cppunit/TestAssert.h> #include <cmath> #include <gnuradio/random.h> diff --git a/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc b/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc index 268b8801cc..01948946da 100644 --- a/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc +++ b/gr-filter/lib/qa_mmse_fir_interpolator_cc.cc @@ -27,7 +27,7 @@ #include <cppunit/TestAssert.h> #include <qa_mmse_fir_interpolator_cc.h> #include <filter/mmse_fir_interpolator_cc.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <cstdio> #include <cmath> #include <stdexcept> diff --git a/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc b/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc index 54387fd9bd..c3c9e1ad46 100644 --- a/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc +++ b/gr-filter/lib/qa_mmse_fir_interpolator_ff.cc @@ -27,7 +27,7 @@ #include <cppunit/TestAssert.h> #include <qa_mmse_fir_interpolator_ff.h> #include <filter/mmse_fir_interpolator_ff.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <cstdio> #include <cmath> diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 0c9d90069e..33e0cc5a22 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -28,7 +28,7 @@ #include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index 86a7657e78..d9a73974b0 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -25,7 +25,7 @@ #include <qtgui/freq_sink_c.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/thread/thread.h> #include <qtgui/freqdisplayform.h> diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index a11ceef88a..69137fb168 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -25,7 +25,7 @@ #include <qtgui/freq_sink_f.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/thread/thread.h> #include <qtgui/freqdisplayform.h> diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index dd17b8c900..7138ba5450 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -25,7 +25,7 @@ #include <qtgui/sink_c.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <qtgui/SpectrumGUIClass.h> diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index a8214e5cce..cb42f814c4 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -25,7 +25,7 @@ #include <qtgui/sink_f.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <qtgui/SpectrumGUIClass.h> diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 9d1ffb8cbf..f9556d55dc 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -25,7 +25,7 @@ #include <qtgui/time_raster_sink_b.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/thread/thread.h> #include <qtgui/timerasterdisplayform.h> diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.h b/gr-qtgui/lib/time_raster_sink_c_impl.h index 6824f0e40f..067a8656cc 100644 --- a/gr-qtgui/lib/time_raster_sink_c_impl.h +++ b/gr-qtgui/lib/time_raster_sink_c_impl.h @@ -25,7 +25,7 @@ #include <qtgui/time_raster_sink_c.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/thread/thread.h> #include <qtgui/time_rasterdisplayform.h> diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index 079e5382bf..316593246e 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -25,7 +25,7 @@ #include <qtgui/time_raster_sink_f.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/thread/thread.h> #include <qtgui/timerasterdisplayform.h> diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index b19aa68b79..c9f3e963c7 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -28,7 +28,7 @@ #include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 68ebae4690..081da98134 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -28,7 +28,7 @@ #include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index baa793eec9..e889e9c931 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -25,7 +25,7 @@ #include <qtgui/waterfall_sink_c.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/thread/thread.h> #include <qtgui/waterfalldisplayform.h> diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 9d4d43b26c..694607210e 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -25,7 +25,7 @@ #include <qtgui/waterfall_sink_f.h> #include <filter/firdes.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <gnuradio/high_res_timer.h> #include <gnuradio/thread/thread.h> #include <qtgui/waterfalldisplayform.h> |