diff options
73 files changed, 159 insertions, 159 deletions
diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt index 10a9976496..31e0adf2d1 100644 --- a/gr-analog/CMakeLists.txt +++ b/gr-analog/CMakeLists.txt @@ -87,7 +87,7 @@ CPACK_COMPONENT("analog_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/analog) +add_subdirectory(include/gnuradio/analog) add_subdirectory(lib) add_subdirectory(doc) if(ENABLE_PYTHON) diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/gnuradio/analog/CMakeLists.txt index 0343abcd85..0343abcd85 100644 --- a/gr-analog/include/analog/CMakeLists.txt +++ b/gr-analog/include/gnuradio/analog/CMakeLists.txt diff --git a/gr-analog/include/analog/agc.h b/gr-analog/include/gnuradio/analog/agc.h index 088ce9869b..ca6125082f 100644 --- a/gr-analog/include/analog/agc.h +++ b/gr-analog/include/gnuradio/analog/agc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC_H #define INCLUDED_ANALOG_AGC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/gr_complex.h> #include <math.h> diff --git a/gr-analog/include/analog/agc2.h b/gr-analog/include/gnuradio/analog/agc2.h index b035e8e222..225adc4410 100644 --- a/gr-analog/include/analog/agc2.h +++ b/gr-analog/include/gnuradio/analog/agc2.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC2_H #define INCLUDED_ANALOG_AGC2_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/gr_complex.h> #include <math.h> diff --git a/gr-analog/include/analog/agc2_cc.h b/gr-analog/include/gnuradio/analog/agc2_cc.h index bc848e603d..76a5263183 100644 --- a/gr-analog/include/analog/agc2_cc.h +++ b/gr-analog/include/gnuradio/analog/agc2_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_AGC2_CC_H #define INCLUDED_ANALOG_AGC2_CC_H -#include <analog/api.h> -#include <analog/agc2.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/agc2.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/agc2_ff.h b/gr-analog/include/gnuradio/analog/agc2_ff.h index 3e18999899..740d795e1d 100644 --- a/gr-analog/include/analog/agc2_ff.h +++ b/gr-analog/include/gnuradio/analog/agc2_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_AGC2_FF_H #define INCLUDED_ANALOG_AGC2_FF_H -#include <analog/api.h> -#include <analog/agc2.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/agc2.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/agc_cc.h b/gr-analog/include/gnuradio/analog/agc_cc.h index 1b790f4a88..8319995960 100644 --- a/gr-analog/include/analog/agc_cc.h +++ b/gr-analog/include/gnuradio/analog/agc_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_AGC_CC_H #define INCLUDED_ANALOG_AGC_CC_H -#include <analog/api.h> -#include <analog/agc.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/agc.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/agc_ff.h b/gr-analog/include/gnuradio/analog/agc_ff.h index cebc766738..d55072889b 100644 --- a/gr-analog/include/analog/agc_ff.h +++ b/gr-analog/include/gnuradio/analog/agc_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_AGC_FF_H #define INCLUDED_ANALOG_AGC_FF_H -#include <analog/api.h> -#include <analog/agc.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/agc.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/api.h b/gr-analog/include/gnuradio/analog/api.h index 01107345e6..01107345e6 100644 --- a/gr-analog/include/analog/api.h +++ b/gr-analog/include/gnuradio/analog/api.h diff --git a/gr-analog/include/analog/cpfsk_bc.h b/gr-analog/include/gnuradio/analog/cpfsk_bc.h index e42df907cf..580c387d45 100644 --- a/gr-analog/include/analog/cpfsk_bc.h +++ b/gr-analog/include/gnuradio/analog/cpfsk_bc.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_ANALOG_CPFSK_BC_H #define INCLUDED_ANALOG_CPFSK_BC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_interpolator.h> namespace gr { diff --git a/gr-analog/include/analog/cpm.h b/gr-analog/include/gnuradio/analog/cpm.h index 43dd0b3729..040f20514a 100644 --- a/gr-analog/include/analog/cpm.h +++ b/gr-analog/include/gnuradio/analog/cpm.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_ANALOG_CPM_H #define INCLUDED_ANALOG_CPM_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <vector> namespace gr { diff --git a/gr-analog/include/analog/ctcss_squelch_ff.h b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h index dfa886bcc4..f9ecc88a03 100644 --- a/gr-analog/include/analog/ctcss_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_CTCSS_SQUELCH_FF_H #define INCLUDED_ANALOG_CTCSS_SQUELCH_FF_H -#include <analog/api.h> -#include <analog/squelch_base_ff.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/squelch_base_ff.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-analog/include/analog/dpll_bb.h b/gr-analog/include/gnuradio/analog/dpll_bb.h index a8a29a99fc..4f9a6c0dd9 100644 --- a/gr-analog/include/analog/dpll_bb.h +++ b/gr-analog/include/gnuradio/analog/dpll_bb.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_DPLL_BB_H #define INCLUDED_ANALOG_DPLL_BB_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/fastnoise_source_X.h.t b/gr-analog/include/gnuradio/analog/fastnoise_source_X.h.t index 611dea3ea4..c5331fc084 100644 --- a/gr-analog/include/analog/fastnoise_source_X.h.t +++ b/gr-analog/include/gnuradio/analog/fastnoise_source_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/api.h> -#include <analog/noise_type.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/noise_type.h> #include <gnuradio/sync_block.h> namespace gr { @@ -47,7 +47,7 @@ namespace gr { typedef boost::shared_ptr<@BASE_NAME@> sptr; /*! \brief Make a fast noise source - * \param type the random distribution to use (see analog/noise_type.h) + * \param type the random distribution to use (see gnuradio/analog/noise_type.h) * \param ampl a scaling factor for the output * \param seed seed for random generators. Note that for uniform and * \param samples Number of samples to pre-generate diff --git a/gr-analog/include/analog/feedforward_agc_cc.h b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h index 5ad92f53f5..5d4abfeedb 100644 --- a/gr-analog/include/analog/feedforward_agc_cc.h +++ b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_H #define INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/fmdet_cf.h b/gr-analog/include/gnuradio/analog/fmdet_cf.h index d020bf2b67..15749efc4e 100644 --- a/gr-analog/include/analog/fmdet_cf.h +++ b/gr-analog/include/gnuradio/analog/fmdet_cf.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_FMDET_CF_H #define INCLUDED_ANALOG_FMDET_CF_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/frequency_modulator_fc.h b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h index a740144efa..d6e2b277fe 100644 --- a/gr-analog/include/analog/frequency_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H #define INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/noise_source_X.h.t b/gr-analog/include/gnuradio/analog/noise_source_X.h.t index 4a44f683f9..b7b0906c06 100644 --- a/gr-analog/include/analog/noise_source_X.h.t +++ b/gr-analog/include/gnuradio/analog/noise_source_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/api.h> -#include <analog/noise_type.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/noise_type.h> #include <gnuradio/sync_block.h> namespace gr { @@ -47,7 +47,7 @@ namespace gr { typedef boost::shared_ptr<@BASE_NAME@> sptr; /*! Build a noise source - * \param type the random distribution to use (see analog/noise_type.h) + * \param type the random distribution to use (see gnuradio/analog/noise_type.h) * \param ampl a scaling factor for the output * \param seed seed for random generators. Note that for uniform and * Gaussian distributions, this should be a negative number. diff --git a/gr-analog/include/analog/noise_type.h b/gr-analog/include/gnuradio/analog/noise_type.h index c3a2146b7e..c3a2146b7e 100644 --- a/gr-analog/include/analog/noise_type.h +++ b/gr-analog/include/gnuradio/analog/noise_type.h diff --git a/gr-analog/include/analog/phase_modulator_fc.h b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h index 82385fb010..56c39ce3ea 100644 --- a/gr-analog/include/analog/phase_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PHASE_MODULATOR_FC_H #define INCLUDED_ANALOG_PHASE_MODULATOR_FC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h index 8e09703aaf..35da29c8af 100644 --- a/gr-analog/include/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_H #define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/blocks/control_loop.h> #include <gnuradio/sync_block.h> diff --git a/gr-analog/include/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h index b9e8d04541..1ea7eb97ec 100644 --- a/gr-analog/include/analog/pll_freqdet_cf.h +++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_FREQDET_CF_H #define INCLUDED_ANALOG_PLL_FREQDET_CF_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/blocks/control_loop.h> #include <gnuradio/sync_block.h> diff --git a/gr-analog/include/analog/pll_refout_cc.h b/gr-analog/include/gnuradio/analog/pll_refout_cc.h index bc5221df9d..29a2f43198 100644 --- a/gr-analog/include/analog/pll_refout_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_refout_cc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_REFOUT_CC_H #define INCLUDED_ANALOG_PLL_REFOUT_CC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/blocks/control_loop.h> #include <gnuradio/sync_block.h> diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h index f6d9171a38..fe67f3ad59 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h index fe19f629c9..d491321e68 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h index 4604f8db51..960480b962 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/pwr_squelch_cc.h b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h index 13280cb945..766f76d385 100644 --- a/gr-analog/include/analog/pwr_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PWR_SQUELCH_CC_H #define INCLUDED_ANALOG_PWR_SQUELCH_CC_H -#include <analog/api.h> -#include <analog/squelch_base_cc.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/squelch_base_cc.h> #include <cmath> namespace gr { diff --git a/gr-analog/include/analog/pwr_squelch_ff.h b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h index 83bc578583..abff53d5e0 100644 --- a/gr-analog/include/analog/pwr_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ANALOG_PWR_SQUELCH_FF_H #define INCLUDED_ANALOG_PWR_SQUELCH_FF_H -#include <analog/api.h> -#include <analog/squelch_base_ff.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/squelch_base_ff.h> #include <cmath> namespace gr { diff --git a/gr-analog/include/analog/quadrature_demod_cf.h b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h index 6a1e60edb5..888cb4a20b 100644 --- a/gr-analog/include/analog/quadrature_demod_cf.h +++ b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_H #define INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/rail_ff.h b/gr-analog/include/gnuradio/analog/rail_ff.h index 77bc2e1187..29856bbcbc 100644 --- a/gr-analog/include/analog/rail_ff.h +++ b/gr-analog/include/gnuradio/analog/rail_ff.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_RAIL_FF_H #define INCLUDED_ANALOG_RAIL_FF_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/sig_source_X.h.t b/gr-analog/include/gnuradio/analog/sig_source_X.h.t index a6cb517fce..81c42926cf 100644 --- a/gr-analog/include/analog/sig_source_X.h.t +++ b/gr-analog/include/gnuradio/analog/sig_source_X.h.t @@ -25,8 +25,8 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/api.h> -#include <analog/sig_source_waveform.h> +#include <gnuradio/analog/api.h> +#include <gnuradio/analog/sig_source_waveform.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/sig_source_waveform.h b/gr-analog/include/gnuradio/analog/sig_source_waveform.h index e3efeb1fbb..e3efeb1fbb 100644 --- a/gr-analog/include/analog/sig_source_waveform.h +++ b/gr-analog/include/gnuradio/analog/sig_source_waveform.h diff --git a/gr-analog/include/analog/simple_squelch_cc.h b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h index 0ae937e7b4..de6252b288 100644 --- a/gr-analog/include/analog/simple_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_H #define INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-analog/include/analog/squelch_base_cc.h b/gr-analog/include/gnuradio/analog/squelch_base_cc.h index 41dbb4766d..63f84cb374 100644 --- a/gr-analog/include/analog/squelch_base_cc.h +++ b/gr-analog/include/gnuradio/analog/squelch_base_cc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_SQUELCH_BASE_CC_H #define INCLUDED_ANALOG_SQUELCH_BASE_CC_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-analog/include/analog/squelch_base_ff.h b/gr-analog/include/gnuradio/analog/squelch_base_ff.h index 85228a3605..f68262f015 100644 --- a/gr-analog/include/analog/squelch_base_ff.h +++ b/gr-analog/include/gnuradio/analog/squelch_base_ff.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_SQUELCH_BASE_FF_H #define INCLUDED_ANALOG_SQUELCH_BASE_FF_H -#include <analog/api.h> +#include <gnuradio/analog/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-analog/lib/agc2_cc_impl.h b/gr-analog/lib/agc2_cc_impl.h index 98afc668a0..9220501323 100644 --- a/gr-analog/lib/agc2_cc_impl.h +++ b/gr-analog/lib/agc2_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC2_IMPL_CC_H #define INCLUDED_ANALOG_AGC2_IMPL_CC_H -#include <analog/agc2_cc.h> +#include <gnuradio/analog/agc2_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/agc2_ff_impl.h b/gr-analog/lib/agc2_ff_impl.h index df33c8e446..8c068c4e34 100644 --- a/gr-analog/lib/agc2_ff_impl.h +++ b/gr-analog/lib/agc2_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC2_FF_IMPL_H #define INCLUDED_ANALOG_AGC2_FF_IMPL_H -#include <analog/agc2_ff.h> +#include <gnuradio/analog/agc2_ff.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/agc_cc_impl.h b/gr-analog/lib/agc_cc_impl.h index 822f46ef27..fda154d021 100644 --- a/gr-analog/lib/agc_cc_impl.h +++ b/gr-analog/lib/agc_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC_CC_IMPL_H #define INCLUDED_ANALOG_AGC_CC_IMPL_H -#include <analog/agc_cc.h> +#include <gnuradio/analog/agc_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/agc_ff_impl.h b/gr-analog/lib/agc_ff_impl.h index e309cca1be..c67739b73e 100644 --- a/gr-analog/lib/agc_ff_impl.h +++ b/gr-analog/lib/agc_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_AGC_FF_IMPL_H #define INCLUDED_ANALOG_AGC_FF_IMPL_H -#include <analog/agc_ff.h> +#include <gnuradio/analog/agc_ff.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/cpfsk_bc_impl.h b/gr-analog/lib/cpfsk_bc_impl.h index 9f6ec2c7fe..c3ae0dc864 100644 --- a/gr-analog/lib/cpfsk_bc_impl.h +++ b/gr-analog/lib/cpfsk_bc_impl.h @@ -21,7 +21,7 @@ #ifndef INCLUDED_ANALOG_CPFSK_BC_IMPL_H #define INCLUDED_ANALOG_CPFSK_BC_IMPL_H -#include <analog/cpfsk_bc.h> +#include <gnuradio/analog/cpfsk_bc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/cpm.cc b/gr-analog/lib/cpm.cc index 618475cec7..b61ee28816 100644 --- a/gr-analog/lib/cpm.cc +++ b/gr-analog/lib/cpm.cc @@ -26,7 +26,7 @@ #include <cmath> #include <cfloat> -#include <analog/cpm.h> +#include <gnuradio/analog/cpm.h> //gives us erf on compilers without it #include <boost/math/special_functions/erf.hpp> diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.h b/gr-analog/lib/ctcss_squelch_ff_impl.h index 0827fbafe3..c9cd8af1d0 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.h +++ b/gr-analog/lib/ctcss_squelch_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_CTCSS_SQUELCH_FF_IMPL_H #define INCLUDED_ANALOG_CTCSS_SQUELCH_FF_IMPL_H -#include <analog/ctcss_squelch_ff.h> +#include <gnuradio/analog/ctcss_squelch_ff.h> #include "squelch_base_ff_impl.h" #include <fft/goertzel.h> diff --git a/gr-analog/lib/dpll_bb_impl.h b/gr-analog/lib/dpll_bb_impl.h index a1d8b77097..4caa498d70 100644 --- a/gr-analog/lib/dpll_bb_impl.h +++ b/gr-analog/lib/dpll_bb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_DPLL_BB_IMPL_H #define INCLUDED_ANALOG_DPLL_BB_IMPL_H -#include <analog/dpll_bb.h> +#include <gnuradio/analog/dpll_bb.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/fastnoise_source_X_impl.h.t b/gr-analog/lib/fastnoise_source_X_impl.h.t index abfe3c0371..ed342ec176 100644 --- a/gr-analog/lib/fastnoise_source_X_impl.h.t +++ b/gr-analog/lib/fastnoise_source_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/@BASE_NAME@.h> +#include <gnuradio/analog/@BASE_NAME@.h> #include <gnuradio/random.h> namespace gr { diff --git a/gr-analog/lib/feedforward_agc_cc_impl.h b/gr-analog/lib/feedforward_agc_cc_impl.h index 60c7acadaf..ebbfceb278 100644 --- a/gr-analog/lib/feedforward_agc_cc_impl.h +++ b/gr-analog/lib/feedforward_agc_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_IMPL_H #define INCLUDED_ANALOG_FEEDFORWARD_AGC_CC_IMPL_H -#include <analog/feedforward_agc_cc.h> +#include <gnuradio/analog/feedforward_agc_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/fmdet_cf_impl.h b/gr-analog/lib/fmdet_cf_impl.h index 1a7698b57a..bcb31ecedc 100644 --- a/gr-analog/lib/fmdet_cf_impl.h +++ b/gr-analog/lib/fmdet_cf_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_FMDET_CF_IMPL_H #define INCLUDED_ANALOG_FMDET_CF_IMPL_H -#include <analog/fmdet_cf.h> +#include <gnuradio/analog/fmdet_cf.h> //#include <filter/fir_filter.h> #include <gnuradio/sync_block.h> diff --git a/gr-analog/lib/frequency_modulator_fc_impl.h b/gr-analog/lib/frequency_modulator_fc_impl.h index 36512f5164..cdd3562e09 100644 --- a/gr-analog/lib/frequency_modulator_fc_impl.h +++ b/gr-analog/lib/frequency_modulator_fc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_IMPL_H #define INCLUDED_ANALOG_FREQUENCY_MODULATOR_FC_IMPL_H -#include <analog/frequency_modulator_fc.h> +#include <gnuradio/analog/frequency_modulator_fc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/noise_source_X_impl.h.t b/gr-analog/lib/noise_source_X_impl.h.t index a25280f9ec..cd7a3e1636 100644 --- a/gr-analog/lib/noise_source_X_impl.h.t +++ b/gr-analog/lib/noise_source_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/@BASE_NAME@.h> +#include <gnuradio/analog/@BASE_NAME@.h> #include <gnuradio/random.h> namespace gr { diff --git a/gr-analog/lib/phase_modulator_fc_impl.h b/gr-analog/lib/phase_modulator_fc_impl.h index ac10bc891f..8b7c1df053 100644 --- a/gr-analog/lib/phase_modulator_fc_impl.h +++ b/gr-analog/lib/phase_modulator_fc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PHASE_MODULATOR_FC_IMPL_H #define INCLUDED_ANALOG_PHASE_MODULATOR_FC_IMPL_H -#include <analog/phase_modulator_fc.h> +#include <gnuradio/analog/phase_modulator_fc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/pll_carriertracking_cc_impl.h b/gr-analog/lib/pll_carriertracking_cc_impl.h index c809736709..49259f996e 100644 --- a/gr-analog/lib/pll_carriertracking_cc_impl.h +++ b/gr-analog/lib/pll_carriertracking_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_IMPL_H #define INCLUDED_ANALOG_PLL_CARRIERTRACKING_CC_IMPL_H -#include <analog/pll_carriertracking_cc.h> +#include <gnuradio/analog/pll_carriertracking_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/pll_freqdet_cf_impl.h b/gr-analog/lib/pll_freqdet_cf_impl.h index 3170d819b6..646b0609c0 100644 --- a/gr-analog/lib/pll_freqdet_cf_impl.h +++ b/gr-analog/lib/pll_freqdet_cf_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_FREQDET_CF_IMPL_H #define INCLUDED_ANALOG_PLL_FREQDET_CF_IMPL_H -#include <analog/pll_freqdet_cf.h> +#include <gnuradio/analog/pll_freqdet_cf.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/pll_refout_cc_impl.h b/gr-analog/lib/pll_refout_cc_impl.h index 1734b6e138..1a7e3d5066 100644 --- a/gr-analog/lib/pll_refout_cc_impl.h +++ b/gr-analog/lib/pll_refout_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PLL_REFOUT_CC_IMPL_H #define INCLUDED_ANALOG_PLL_REFOUT_CC_IMPL_H -#include <analog/pll_refout_cc.h> +#include <gnuradio/analog/pll_refout_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h index 0a2685357a..082975caf5 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_c_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_IMPL_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_C_IMPL_H -#include <analog/probe_avg_mag_sqrd_c.h> +#include <gnuradio/analog/probe_avg_mag_sqrd_c.h> #include <filter/single_pole_iir.h> namespace gr { diff --git a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h index 9cd8f8d4c3..3d2d127787 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_IMPL_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_CF_IMPL_H -#include <analog/probe_avg_mag_sqrd_cf.h> +#include <gnuradio/analog/probe_avg_mag_sqrd_cf.h> #include <filter/single_pole_iir.h> namespace gr { diff --git a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h index ba879763c2..e74623cd11 100644 --- a/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h +++ b/gr-analog/lib/probe_avg_mag_sqrd_f_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_IMPL_H #define INCLUDED_ANALOG_PROBE_AVG_MAG_SQRD_F_IMPL_H -#include <analog/probe_avg_mag_sqrd_f.h> +#include <gnuradio/analog/probe_avg_mag_sqrd_f.h> #include <filter/single_pole_iir.h> namespace gr { diff --git a/gr-analog/lib/pwr_squelch_cc_impl.h b/gr-analog/lib/pwr_squelch_cc_impl.h index 72df0f3d2d..811d3ce03c 100644 --- a/gr-analog/lib/pwr_squelch_cc_impl.h +++ b/gr-analog/lib/pwr_squelch_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PWR_SQUELCH_CC_IMPL_H #define INCLUDED_ANALOG_PWR_SQUELCH_CC_IMPL_H -#include <analog/pwr_squelch_cc.h> +#include <gnuradio/analog/pwr_squelch_cc.h> #include "squelch_base_cc_impl.h" #include <filter/single_pole_iir.h> #include <cmath> diff --git a/gr-analog/lib/pwr_squelch_ff_impl.h b/gr-analog/lib/pwr_squelch_ff_impl.h index 96d959b4dd..c17f839cec 100644 --- a/gr-analog/lib/pwr_squelch_ff_impl.h +++ b/gr-analog/lib/pwr_squelch_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_PWR_SQUELCH_FF_IMPL_H #define INCLUDED_ANALOG_PWR_SQUELCH_FF_IMPL_H -#include <analog/pwr_squelch_ff.h> +#include <gnuradio/analog/pwr_squelch_ff.h> #include "squelch_base_ff_impl.h" #include <filter/single_pole_iir.h> #include <cmath> diff --git a/gr-analog/lib/quadrature_demod_cf_impl.h b/gr-analog/lib/quadrature_demod_cf_impl.h index 72beb23316..2b505c3c55 100644 --- a/gr-analog/lib/quadrature_demod_cf_impl.h +++ b/gr-analog/lib/quadrature_demod_cf_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_IMPL_H #define INCLUDED_ANALOG_QUADRATURE_DEMOD_CF_IMPL_H -#include <analog/quadrature_demod_cf.h> +#include <gnuradio/analog/quadrature_demod_cf.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/rail_ff_impl.h b/gr-analog/lib/rail_ff_impl.h index 436b10b412..3617d097d9 100644 --- a/gr-analog/lib/rail_ff_impl.h +++ b/gr-analog/lib/rail_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_RAIL_FF_IMPL_H #define INCLUDED_ANALOG_RAIL_FF_IMPL_H -#include <analog/rail_ff.h> +#include <gnuradio/analog/rail_ff.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/sig_source_X_impl.h.t b/gr-analog/lib/sig_source_X_impl.h.t index d80c3b8933..930a810a67 100644 --- a/gr-analog/lib/sig_source_X_impl.h.t +++ b/gr-analog/lib/sig_source_X_impl.h.t @@ -25,7 +25,7 @@ #ifndef @GUARD_NAME@ #define @GUARD_NAME@ -#include <analog/@BASE_NAME@.h> +#include <gnuradio/analog/@BASE_NAME@.h> #include <gnuradio/sync_block.h> #include <gnuradio/fxpt_nco.h> diff --git a/gr-analog/lib/simple_squelch_cc_impl.h b/gr-analog/lib/simple_squelch_cc_impl.h index ba11de91e7..d8f51a430f 100644 --- a/gr-analog/lib/simple_squelch_cc_impl.h +++ b/gr-analog/lib/simple_squelch_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_IMPL_H #define INCLUDED_ANALOG_SIMPLE_SQUELCH_CC_IMPL_H -#include <analog/simple_squelch_cc.h> +#include <gnuradio/analog/simple_squelch_cc.h> #include <filter/single_pole_iir.h> namespace gr { diff --git a/gr-analog/lib/squelch_base_cc_impl.h b/gr-analog/lib/squelch_base_cc_impl.h index 19dccaa101..58802df91c 100644 --- a/gr-analog/lib/squelch_base_cc_impl.h +++ b/gr-analog/lib/squelch_base_cc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_SQUELCH_BASE_CC_IMPL_H #define INCLUDED_GR_SQUELCH_BASE_CC_IMPL_H -#include <analog/squelch_base_cc.h> +#include <gnuradio/analog/squelch_base_cc.h> namespace gr { namespace analog { diff --git a/gr-analog/lib/squelch_base_ff_impl.h b/gr-analog/lib/squelch_base_ff_impl.h index 22659be746..343dc5f610 100644 --- a/gr-analog/lib/squelch_base_ff_impl.h +++ b/gr-analog/lib/squelch_base_ff_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_SQUELCH_BASE_FF_IMPL_H #define INCLUDED_GR_SQUELCH_BASE_FF_IMPL_H -#include <analog/squelch_base_ff.h> +#include <gnuradio/analog/squelch_base_ff.h> namespace gr { namespace analog { diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt index 3e93f0c77b..577a69eae4 100644 --- a/gr-analog/swig/CMakeLists.txt +++ b/gr-analog/swig/CMakeLists.txt @@ -37,7 +37,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/analog) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/analog) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_TARGET_DEPS analog_generated_includes) set(GR_SWIG_LIBRARIES gnuradio-analog gnuradio-filter) diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i index 9dd42e31ec..a2da8dd10e 100644 --- a/gr-analog/swig/analog_swig.i +++ b/gr-analog/swig/analog_swig.i @@ -34,86 +34,86 @@ %include <gnuradio/blocks/control_loop.h> %{ -#include "analog/cpm.h" -#include "analog/noise_type.h" -#include "analog/agc_cc.h" -#include "analog/agc_ff.h" -#include "analog/agc2_cc.h" -#include "analog/agc2_ff.h" -#include "analog/cpfsk_bc.h" -#include "analog/ctcss_squelch_ff.h" -#include "analog/dpll_bb.h" -#include "analog/feedforward_agc_cc.h" -#include "analog/fmdet_cf.h" -#include "analog/frequency_modulator_fc.h" -#include "analog/fastnoise_source_s.h" -#include "analog/fastnoise_source_i.h" -#include "analog/fastnoise_source_f.h" -#include "analog/fastnoise_source_c.h" -#include "analog/noise_source_s.h" -#include "analog/noise_source_i.h" -#include "analog/noise_source_f.h" -#include "analog/noise_source_c.h" -#include "analog/phase_modulator_fc.h" -#include "analog/pll_carriertracking_cc.h" -#include "analog/pll_freqdet_cf.h" -#include "analog/pll_refout_cc.h" -#include "analog/probe_avg_mag_sqrd_c.h" -#include "analog/probe_avg_mag_sqrd_cf.h" -#include "analog/probe_avg_mag_sqrd_f.h" -#include "analog/pwr_squelch_cc.h" -#include "analog/pwr_squelch_ff.h" -#include "analog/quadrature_demod_cf.h" -#include "analog/rail_ff.h" -#include "analog/sig_source_s.h" -#include "analog/sig_source_i.h" -#include "analog/sig_source_f.h" -#include "analog/sig_source_c.h" -#include "analog/sig_source_waveform.h" -#include "analog/simple_squelch_cc.h" -#include "analog/squelch_base_cc.h" -#include "analog/squelch_base_ff.h" +#include "gnuradio/analog/cpm.h" +#include "gnuradio/analog/noise_type.h" +#include "gnuradio/analog/agc_cc.h" +#include "gnuradio/analog/agc_ff.h" +#include "gnuradio/analog/agc2_cc.h" +#include "gnuradio/analog/agc2_ff.h" +#include "gnuradio/analog/cpfsk_bc.h" +#include "gnuradio/analog/ctcss_squelch_ff.h" +#include "gnuradio/analog/dpll_bb.h" +#include "gnuradio/analog/feedforward_agc_cc.h" +#include "gnuradio/analog/fmdet_cf.h" +#include "gnuradio/analog/frequency_modulator_fc.h" +#include "gnuradio/analog/fastnoise_source_s.h" +#include "gnuradio/analog/fastnoise_source_i.h" +#include "gnuradio/analog/fastnoise_source_f.h" +#include "gnuradio/analog/fastnoise_source_c.h" +#include "gnuradio/analog/noise_source_s.h" +#include "gnuradio/analog/noise_source_i.h" +#include "gnuradio/analog/noise_source_f.h" +#include "gnuradio/analog/noise_source_c.h" +#include "gnuradio/analog/phase_modulator_fc.h" +#include "gnuradio/analog/pll_carriertracking_cc.h" +#include "gnuradio/analog/pll_freqdet_cf.h" +#include "gnuradio/analog/pll_refout_cc.h" +#include "gnuradio/analog/probe_avg_mag_sqrd_c.h" +#include "gnuradio/analog/probe_avg_mag_sqrd_cf.h" +#include "gnuradio/analog/probe_avg_mag_sqrd_f.h" +#include "gnuradio/analog/pwr_squelch_cc.h" +#include "gnuradio/analog/pwr_squelch_ff.h" +#include "gnuradio/analog/quadrature_demod_cf.h" +#include "gnuradio/analog/rail_ff.h" +#include "gnuradio/analog/sig_source_s.h" +#include "gnuradio/analog/sig_source_i.h" +#include "gnuradio/analog/sig_source_f.h" +#include "gnuradio/analog/sig_source_c.h" +#include "gnuradio/analog/sig_source_waveform.h" +#include "gnuradio/analog/simple_squelch_cc.h" +#include "gnuradio/analog/squelch_base_cc.h" +#include "gnuradio/analog/squelch_base_ff.h" %} -%include "analog/cpm.h" -%include "analog/noise_type.h" -%include "analog/agc_cc.h" -%include "analog/agc_ff.h" -%include "analog/agc2_cc.h" -%include "analog/agc2_ff.h" -%include "analog/cpfsk_bc.h" -%include "analog/ctcss_squelch_ff.h" -%include "analog/dpll_bb.h" -%include "analog/feedforward_agc_cc.h" -%include "analog/fmdet_cf.h" -%include "analog/frequency_modulator_fc.h" -%include "analog/fastnoise_source_s.h" -%include "analog/fastnoise_source_i.h" -%include "analog/fastnoise_source_f.h" -%include "analog/fastnoise_source_c.h" -%include "analog/noise_source_s.h" -%include "analog/noise_source_i.h" -%include "analog/noise_source_f.h" -%include "analog/noise_source_c.h" -%include "analog/phase_modulator_fc.h" -%include "analog/pll_carriertracking_cc.h" -%include "analog/pll_freqdet_cf.h" -%include "analog/pll_refout_cc.h" -%include "analog/probe_avg_mag_sqrd_c.h" -%include "analog/probe_avg_mag_sqrd_cf.h" -%include "analog/probe_avg_mag_sqrd_f.h" -%include "analog/pwr_squelch_cc.h" -%include "analog/pwr_squelch_ff.h" -%include "analog/quadrature_demod_cf.h" -%include "analog/rail_ff.h" -%include "analog/sig_source_s.h" -%include "analog/sig_source_i.h" -%include "analog/sig_source_f.h" -%include "analog/sig_source_c.h" -%include "analog/sig_source_waveform.h" -%include "analog/simple_squelch_cc.h" -%include "analog/squelch_base_cc.h" -%include "analog/squelch_base_ff.h" +%include "gnuradio/analog/cpm.h" +%include "gnuradio/analog/noise_type.h" +%include "gnuradio/analog/agc_cc.h" +%include "gnuradio/analog/agc_ff.h" +%include "gnuradio/analog/agc2_cc.h" +%include "gnuradio/analog/agc2_ff.h" +%include "gnuradio/analog/cpfsk_bc.h" +%include "gnuradio/analog/ctcss_squelch_ff.h" +%include "gnuradio/analog/dpll_bb.h" +%include "gnuradio/analog/feedforward_agc_cc.h" +%include "gnuradio/analog/fmdet_cf.h" +%include "gnuradio/analog/frequency_modulator_fc.h" +%include "gnuradio/analog/fastnoise_source_s.h" +%include "gnuradio/analog/fastnoise_source_i.h" +%include "gnuradio/analog/fastnoise_source_f.h" +%include "gnuradio/analog/fastnoise_source_c.h" +%include "gnuradio/analog/noise_source_s.h" +%include "gnuradio/analog/noise_source_i.h" +%include "gnuradio/analog/noise_source_f.h" +%include "gnuradio/analog/noise_source_c.h" +%include "gnuradio/analog/phase_modulator_fc.h" +%include "gnuradio/analog/pll_carriertracking_cc.h" +%include "gnuradio/analog/pll_freqdet_cf.h" +%include "gnuradio/analog/pll_refout_cc.h" +%include "gnuradio/analog/probe_avg_mag_sqrd_c.h" +%include "gnuradio/analog/probe_avg_mag_sqrd_cf.h" +%include "gnuradio/analog/probe_avg_mag_sqrd_f.h" +%include "gnuradio/analog/pwr_squelch_cc.h" +%include "gnuradio/analog/pwr_squelch_ff.h" +%include "gnuradio/analog/quadrature_demod_cf.h" +%include "gnuradio/analog/rail_ff.h" +%include "gnuradio/analog/sig_source_s.h" +%include "gnuradio/analog/sig_source_i.h" +%include "gnuradio/analog/sig_source_f.h" +%include "gnuradio/analog/sig_source_c.h" +%include "gnuradio/analog/sig_source_waveform.h" +%include "gnuradio/analog/simple_squelch_cc.h" +%include "gnuradio/analog/squelch_base_cc.h" +%include "gnuradio/analog/squelch_base_ff.h" GR_SWIG_BLOCK_MAGIC2(analog, agc_cc); GR_SWIG_BLOCK_MAGIC2(analog, agc_ff); diff --git a/gr-atsc/include/atsc/GrAtscFPLL.h b/gr-atsc/include/atsc/GrAtscFPLL.h index dbc20b6025..5a5885260d 100644 --- a/gr-atsc/include/atsc/GrAtscFPLL.h +++ b/gr-atsc/include/atsc/GrAtscFPLL.h @@ -27,7 +27,7 @@ #include <gnuradio/blocks/nco.h> #include <filter/iir.h> #include <filter/single_pole_iir.h> -#include <analog/agc.h> +#include <gnuradio/analog/agc.h> #include <VrSigProc.h> #include <stdio.h> #include <atsc/diag_output_impl.h> diff --git a/gr-atsc/include/atsc/fpll.h b/gr-atsc/include/atsc/fpll.h index e7feee6a63..5db4fda55f 100644 --- a/gr-atsc/include/atsc/fpll.h +++ b/gr-atsc/include/atsc/fpll.h @@ -27,7 +27,7 @@ #include <gnuradio/sync_block.h> #include <gnuradio/nco.h> #include <filter/single_pole_iir.h> -#include <analog/agc.h> +#include <gnuradio/analog/agc.h> #include <stdio.h> #include <atsc/diag_output_impl.h> diff --git a/gr-audio/examples/c++/dial_tone.cc b/gr-audio/examples/c++/dial_tone.cc index 0547d36edc..7fe3cd055d 100644 --- a/gr-audio/examples/c++/dial_tone.cc +++ b/gr-audio/examples/c++/dial_tone.cc @@ -38,7 +38,7 @@ // Include header files for each block used in flowgraph #include <gnuradio/top_block.h> -#include <analog/sig_source_f.h> +#include <gnuradio/analog/sig_source_f.h> #include <audio/sink.h> using namespace gr; diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h index 68b8dc392d..b50ef1cb5c 100644 --- a/gr-channels/lib/channel_model_impl.h +++ b/gr-channels/lib/channel_model_impl.h @@ -26,8 +26,8 @@ #include <gnuradio/top_block.h> #include <gnuradio/blocks/add_cc.h> #include <gnuradio/blocks/multiply_cc.h> -#include <analog/sig_source_c.h> -#include <analog/fastnoise_source_c.h> +#include <gnuradio/analog/sig_source_c.h> +#include <gnuradio/analog/fastnoise_source_c.h> #include <channels/channel_model.h> #include <filter/fractional_interpolator_cc.h> #include <filter/fir_filter_ccc.h> diff --git a/gr-digital/include/digital/cpmmod_bc.h b/gr-digital/include/digital/cpmmod_bc.h index 1597d5d7db..13c778943c 100644 --- a/gr-digital/include/digital/cpmmod_bc.h +++ b/gr-digital/include/digital/cpmmod_bc.h @@ -25,7 +25,7 @@ #include <digital/api.h> #include <gnuradio/hier_block2.h> -#include <analog/cpm.h> +#include <gnuradio/analog/cpm.h> namespace gr { namespace digital { diff --git a/gr-digital/lib/cpmmod_bc_impl.h b/gr-digital/lib/cpmmod_bc_impl.h index 7ae150100c..08c936478c 100644 --- a/gr-digital/lib/cpmmod_bc_impl.h +++ b/gr-digital/lib/cpmmod_bc_impl.h @@ -25,7 +25,7 @@ #include <digital/cpmmod_bc.h> #include <gnuradio/blocks/char_to_float.h> -#include <analog/frequency_modulator_fc.h> +#include <gnuradio/analog/frequency_modulator_fc.h> #include <filter/interp_fir_filter_fff.h> namespace gr { diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i index a721e6ec52..bc5481a2a1 100644 --- a/gr-digital/swig/digital_swig.i +++ b/gr-digital/swig/digital_swig.i @@ -29,7 +29,7 @@ //load generated python docstrings %include "digital_swig_doc.i" -%include "analog/cpm.h" +%include "gnuradio/analog/cpm.h" %{ #include <gnuradio/blocks/control_loop.h> diff --git a/gr-fcd/examples/c++/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc index 5855fe7124..264e41b0c2 100644 --- a/gr-fcd/examples/c++/fcd_nfm_rx.cc +++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc @@ -35,7 +35,7 @@ #include <gnuradio/top_block.h> #include <filter/firdes.h> #include <filter/fir_filter_ccf.h> -#include <analog/quadrature_demod_cf.h> +#include <gnuradio/analog/quadrature_demod_cf.h> #include <audio/sink.h> #include <fcd_source_c.h> |