diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-30 13:34:43 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-30 13:34:43 -0700 |
| commit | b779505f8f536bbc2fcc58102fd48644a0903874 (patch) | |
| tree | a9106f975d7d4dd26bd5ca69d5ff117710a36cc7 /gr-atsc | |
| parent | 372bcbcd41df277733a30adeb6a822ebf0ef6ad6 (diff) | |
atsc: moved include dir to gnuradio/atsc
Diffstat (limited to 'gr-atsc')
160 files changed, 277 insertions, 277 deletions
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt index 5e136cadae..9958edb36c 100644 --- a/gr-atsc/CMakeLists.txt +++ b/gr-atsc/CMakeLists.txt @@ -91,7 +91,7 @@ CPACK_COMPONENT("atsc_swig" # Add subdirectories ######################################################################## add_subdirectory(lib) -add_subdirectory(include/atsc) +add_subdirectory(include/gnuradio/atsc) if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python) diff --git a/gr-atsc/include/atsc/CMakeLists.txt b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt index cdf818aab2..cdf818aab2 100644 --- a/gr-atsc/include/atsc/CMakeLists.txt +++ b/gr-atsc/include/gnuradio/atsc/CMakeLists.txt diff --git a/gr-atsc/include/atsc/GrAtscBitTimingLoop.h b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop.h index 325f5e44a1..e42d37c581 100644 --- a/gr-atsc/include/atsc/GrAtscBitTimingLoop.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop.h @@ -27,12 +27,12 @@ #include <VrSigProc.h> #include <VrHistoryProc.h> #include <VrDecimatingSigProc.h> -#include <atsc/interleaver_fifo.h> +#include <gnuradio/atsc/interleaver_fifo.h> #include <gnuradio/filter/single_pole_iir.h> #include <gnuradio/filter/mmse_fir_interpolator.h> -#include <atsc/slicer_agc_impl.h> +#include <gnuradio/atsc/slicer_agc_impl.h> #include <stdio.h> -#include <atsc/diag_output_impl.h> +#include <gnuradio/atsc/diag_output_impl.h> /*! diff --git a/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop2.h index 4b04f5c1ce..7acdbb6140 100644 --- a/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop2.h @@ -27,7 +27,7 @@ #include <VrSigProc.h> #include <VrHistoryProc.h> #include <VrDecimatingSigProc.h> -#include <atsc/interleaver_fifo.h> +#include <gnuradio/atsc/interleaver_fifo.h> #include <filtersingle_pole_iir.h> #include <gnuradio/filter/mmse_fir_interpolator.h> diff --git a/gr-atsc/include/atsc/GrAtscBitTimingLoop3.h b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop3.h index c0fb333ace..cc90e667b6 100644 --- a/gr-atsc/include/atsc/GrAtscBitTimingLoop3.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscBitTimingLoop3.h @@ -25,9 +25,9 @@ #include <cstdio> #include <VrDecimatingSigProc.h> -#include <atsc/diag_output_impl.h> -#include <atsc/sssr_impl.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/diag_output_impl.h> +#include <gnuradio/atsc/sssr_impl.h> +#include <gnuradio/atsc/syminfo_impl.h> /*! * \brief ATSC BitTimingLoop3 diff --git a/gr-atsc/include/atsc/GrAtscConvert2xTo20.h b/gr-atsc/include/gnuradio/atsc/GrAtscConvert2xTo20.h index 5920832bba..5920832bba 100644 --- a/gr-atsc/include/atsc/GrAtscConvert2xTo20.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscConvert2xTo20.h diff --git a/gr-atsc/include/atsc/GrAtscDataSegToSoftDataSeg.h b/gr-atsc/include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h index 5fcb894321..c0f5cf8c33 100644 --- a/gr-atsc/include/atsc/GrAtscDataSegToSoftDataSeg.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h @@ -24,7 +24,7 @@ #define _GRATSCDATASEGTOSOFTDATASEG_H_ #include <VrHistoryProc.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> /*! * \brief Debug glue routine (atsc_data_segment --> atsc_soft_data_segment) diff --git a/gr-atsc/include/atsc/GrAtscDeinterleaver.h b/gr-atsc/include/gnuradio/atsc/GrAtscDeinterleaver.h index 8b602fa2dc..5cb59c057d 100644 --- a/gr-atsc/include/atsc/GrAtscDeinterleaver.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscDeinterleaver.h @@ -24,8 +24,8 @@ #define _GRATSCDEINTERLEAVER_H_ #include <VrHistoryProc.h> -#include <atsc/types.h> -#include <atsc/data_interleaver_impl.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/data_interleaver_impl.h> /*! * \brief Deinterleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded) diff --git a/gr-atsc/include/atsc/GrAtscDerandomizer.h b/gr-atsc/include/gnuradio/atsc/GrAtscDerandomizer.h index 0075ae2998..2fb6ce3308 100644 --- a/gr-atsc/include/atsc/GrAtscDerandomizer.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscDerandomizer.h @@ -24,8 +24,8 @@ #define _GRATSCDERANDOMIZER_H_ #include <VrHistoryProc.h> -#include <atsc/types.h> -#include <atsc/randomizer_impl.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/randomizer_impl.h> /*! * \brief Derandomize ATSC data (atsc_mpeg_packet_no_sync --> atsc_mpeg_packet) diff --git a/gr-atsc/include/atsc/GrAtscEqualizer.h b/gr-atsc/include/gnuradio/atsc/GrAtscEqualizer.h index ff944deb7d..ff944deb7d 100644 --- a/gr-atsc/include/atsc/GrAtscEqualizer.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscEqualizer.h diff --git a/gr-atsc/include/atsc/GrAtscFPLL.h b/gr-atsc/include/gnuradio/atsc/GrAtscFPLL.h index 9e05f2023c..39d053299b 100644 --- a/gr-atsc/include/atsc/GrAtscFPLL.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscFPLL.h @@ -30,7 +30,7 @@ #include <gnuradio/analog/agc.h> #include <VrSigProc.h> #include <stdio.h> -#include <atsc/diag_output_impl.h> +#include <gnuradio/atsc/diag_output_impl.h> /*! * \brief ATSC FPLL (2nd Version) diff --git a/gr-atsc/include/atsc/GrAtscFieldSyncChecker.h b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncChecker.h index 28458a19b5..28458a19b5 100644 --- a/gr-atsc/include/atsc/GrAtscFieldSyncChecker.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncChecker.h diff --git a/gr-atsc/include/atsc/GrAtscFieldSyncCorrelator.h b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncCorrelator.h index 1a16048b22..1a16048b22 100644 --- a/gr-atsc/include/atsc/GrAtscFieldSyncCorrelator.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncCorrelator.h diff --git a/gr-atsc/include/atsc/GrAtscFieldSyncDemux.h b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncDemux.h index 248c257914..ed7eb16215 100644 --- a/gr-atsc/include/atsc/GrAtscFieldSyncDemux.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncDemux.h @@ -24,7 +24,7 @@ #define _GRATSCFIELDSYNCDEMUX_H_ #include <VrDecimatingSigProc.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> /*! * \brief ATSC Field Sync Demux diff --git a/gr-atsc/include/atsc/GrAtscFieldSyncMux.h b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncMux.h index 3045f32846..7998d9a8e1 100644 --- a/gr-atsc/include/atsc/GrAtscFieldSyncMux.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscFieldSyncMux.h @@ -24,7 +24,7 @@ #define _GRATSCFIELDSYNCMUX_H_ #include <VrHistoryProc.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> /*! * \brief Insert ATSC Field Syncs as required (atsc_data_segment --> atsc_data_segment) diff --git a/gr-atsc/include/atsc/GrAtscInterleaver.h b/gr-atsc/include/gnuradio/atsc/GrAtscInterleaver.h index 5b6ad4849c..158c6a6a17 100644 --- a/gr-atsc/include/atsc/GrAtscInterleaver.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscInterleaver.h @@ -24,8 +24,8 @@ #define _GRATSCINTERLEAVER_H_ #include <VrHistoryProc.h> -#include <atsc/types.h> -#include <atsc/data_interleaver_impl.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/data_interleaver_impl.h> /*! * \brief Interleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded) diff --git a/gr-atsc/include/atsc/GrAtscRSDecoder.h b/gr-atsc/include/gnuradio/atsc/GrAtscRSDecoder.h index 9321b66a5b..160adc5413 100644 --- a/gr-atsc/include/atsc/GrAtscRSDecoder.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscRSDecoder.h @@ -24,8 +24,8 @@ #define _GRATSCRSDECODER_H_ #include <VrHistoryProc.h> -#include <atsc/types.h> -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/reed_solomon_impl.h> /*! * \brief Pass ATSC data Reed-Solomon decoder( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_rs_no_sync) diff --git a/gr-atsc/include/atsc/GrAtscRSEncoder.h b/gr-atsc/include/gnuradio/atsc/GrAtscRSEncoder.h index e18b6bd63f..b59e28dcb5 100644 --- a/gr-atsc/include/atsc/GrAtscRSEncoder.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscRSEncoder.h @@ -24,8 +24,8 @@ #define _GRATSCRSENCODER_H_ #include <VrHistoryProc.h> -#include <atsc/types.h> -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/reed_solomon_impl.h> /*! * \brief Encode using Reed Solomon ATSC data (atsc_mpeg_packet_no_sync --> atsc_mpeg_packet_rs_encoded) diff --git a/gr-atsc/include/atsc/GrAtscRandomizer.h b/gr-atsc/include/gnuradio/atsc/GrAtscRandomizer.h index 565ea7b8eb..44be87349f 100644 --- a/gr-atsc/include/atsc/GrAtscRandomizer.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscRandomizer.h @@ -24,8 +24,8 @@ #define _GRATSCRANDOMIZER_H_ #include <VrHistoryProc.h> -#include <atsc/types.h> -#include <atsc/randomizer_impl.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/randomizer_impl.h> /*! * \brief Randomize ATSC data (atsc_mpeg_packet --> atsc_mpeg_packet_no_sync) diff --git a/gr-atsc/include/atsc/GrAtscSegSymSync.h b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSync.h index 750483f544..750483f544 100644 --- a/gr-atsc/include/atsc/GrAtscSegSymSync.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSync.h diff --git a/gr-atsc/include/atsc/GrAtscSegSymSyncImpl.h b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl.h index 779f311f4f..e7b3a83018 100644 --- a/gr-atsc/include/atsc/GrAtscSegSymSyncImpl.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl.h @@ -23,7 +23,7 @@ #define _GRATSCSEGSYMSYNCIMPL_H_ #include <GrAtscSegSymSync.h> -#include <atsc/sssr_impl.h> +#include <gnuradio/atsc/sssr_impl.h> /*! diff --git a/gr-atsc/include/atsc/GrAtscSegSymSyncImpl_export.h b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl_export.h index 187f1a0395..187f1a0395 100644 --- a/gr-atsc/include/atsc/GrAtscSegSymSyncImpl_export.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscSegSymSyncImpl_export.h diff --git a/gr-atsc/include/atsc/GrAtscSymbolMapper.h b/gr-atsc/include/gnuradio/atsc/GrAtscSymbolMapper.h index aa2cce0c76..a67b860a45 100644 --- a/gr-atsc/include/atsc/GrAtscSymbolMapper.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscSymbolMapper.h @@ -25,7 +25,7 @@ #include <VrInterpolatingSigProcNoWork.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> #include <gnuradio/blocks/nco.h> /*! diff --git a/gr-atsc/include/atsc/GrAtscTrellisEncoder.h b/gr-atsc/include/gnuradio/atsc/GrAtscTrellisEncoder.h index b1a047ce24..5e8115e677 100644 --- a/gr-atsc/include/atsc/GrAtscTrellisEncoder.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscTrellisEncoder.h @@ -23,7 +23,7 @@ #ifndef _GRATSCTRELLISENCODER_H_ #include <VrHistoryProc.h> -#include <atsc/trellis_encoder_impl.h> +#include <gnuradio/atsc/trellis_encoder_impl.h> /*! * \brief ATSC 12-way interleaved trellis encoder (atsc_mpeg_packet_rs_encoded --> atsc_data_segment) diff --git a/gr-atsc/include/atsc/GrAtscViterbiDecoder.h b/gr-atsc/include/gnuradio/atsc/GrAtscViterbiDecoder.h index 35b1ea0dc7..e33aba04ce 100644 --- a/gr-atsc/include/atsc/GrAtscViterbiDecoder.h +++ b/gr-atsc/include/gnuradio/atsc/GrAtscViterbiDecoder.h @@ -23,7 +23,7 @@ #ifndef _GRATSCVITERBIDECODER_H_ #include <VrHistoryProc.h> -#include <atsc/viterbi_decoder_impl.h> +#include <gnuradio/atsc/viterbi_decoder_impl.h> /*! * \brief ATSC 12-way interleaved viterbi decoder (atsc_soft_data_segment --> atsc_mpeg_packet_rs_encoded) diff --git a/gr-atsc/include/atsc/api.h b/gr-atsc/include/gnuradio/atsc/api.h index 1c1f257059..1c1f257059 100644 --- a/gr-atsc/include/atsc/api.h +++ b/gr-atsc/include/gnuradio/atsc/api.h diff --git a/gr-atsc/include/atsc/basic_trellis_encoder_impl.h b/gr-atsc/include/gnuradio/atsc/basic_trellis_encoder_impl.h index 396ca94957..665a0f9ebf 100644 --- a/gr-atsc/include/atsc/basic_trellis_encoder_impl.h +++ b/gr-atsc/include/gnuradio/atsc/basic_trellis_encoder_impl.h @@ -23,7 +23,7 @@ #ifndef _ATSC_BASIC_TRELLIS_ENCODER_H_ #define _ATSC_BASIC_TRELLIS_ENCODER_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <assert.h> /*! diff --git a/gr-atsc/include/atsc/bit_timing_loop.h b/gr-atsc/include/gnuradio/atsc/bit_timing_loop.h index a130c86e5a..9965ade81d 100644 --- a/gr-atsc/include/atsc/bit_timing_loop.h +++ b/gr-atsc/include/gnuradio/atsc/bit_timing_loop.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_ATSC_BIT_TIMING_LOOP_H #define INCLUDED_ATSC_BIT_TIMING_LOOP_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <cstdio> #include <gnuradio/block.h> -#include <atsc/diag_output_impl.h> -#include <atsc/sssr_impl.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/diag_output_impl.h> +#include <gnuradio/atsc/sssr_impl.h> +#include <gnuradio/atsc/syminfo_impl.h> class atsc_bit_timing_loop; typedef boost::shared_ptr<atsc_bit_timing_loop> atsc_bit_timing_loop_sptr; diff --git a/gr-atsc/include/atsc/consts.h b/gr-atsc/include/gnuradio/atsc/consts.h index bbe2ec69aa..bbe2ec69aa 100644 --- a/gr-atsc/include/atsc/consts.h +++ b/gr-atsc/include/gnuradio/atsc/consts.h diff --git a/gr-atsc/include/atsc/convolutional_interleaver.h b/gr-atsc/include/gnuradio/atsc/convolutional_interleaver.h index 00c843b015..02c0c4dc44 100644 --- a/gr-atsc/include/atsc/convolutional_interleaver.h +++ b/gr-atsc/include/gnuradio/atsc/convolutional_interleaver.h @@ -24,7 +24,7 @@ #define _CONVOLUTIONAL_INTERLEAVER_H_ #include <vector> -#include <atsc/interleaver_fifo.h> +#include <gnuradio/atsc/interleaver_fifo.h> #include <assert.h> /*! diff --git a/gr-atsc/include/atsc/create_atsci_equalizer.h b/gr-atsc/include/gnuradio/atsc/create_atsci_equalizer.h index adc4991703..63773a80bb 100644 --- a/gr-atsc/include/atsc/create_atsci_equalizer.h +++ b/gr-atsc/include/gnuradio/atsc/create_atsci_equalizer.h @@ -23,7 +23,7 @@ #ifndef _CREATE_ATSC_EQUALIZER_H_ #define _CREATE_ATSC_EQUALIZER_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> class atsci_equalizer; diff --git a/gr-atsc/include/atsc/create_atsci_fs_checker.h b/gr-atsc/include/gnuradio/atsc/create_atsci_fs_checker.h index 5d8e9ea407..73b0c7443f 100644 --- a/gr-atsc/include/atsc/create_atsci_fs_checker.h +++ b/gr-atsc/include/gnuradio/atsc/create_atsci_fs_checker.h @@ -23,7 +23,7 @@ #ifndef _CREATE_ATSC_FS_CHECKER_H_ #define _CREATE_ATSC_FS_CHECKER_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> class atsci_fs_checker; diff --git a/gr-atsc/include/atsc/create_atsci_fs_correlator.h b/gr-atsc/include/gnuradio/atsc/create_atsci_fs_correlator.h index 0488645ace..dc6d81499f 100644 --- a/gr-atsc/include/atsc/create_atsci_fs_correlator.h +++ b/gr-atsc/include/gnuradio/atsc/create_atsci_fs_correlator.h @@ -23,7 +23,7 @@ #ifndef _CREATE_ATSC_FS_CORRELATOR_H_ #define _CREATE_ATSC_FS_CORRELATOR_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> class atsci_fs_correlator; diff --git a/gr-atsc/include/atsc/data_interleaver_impl.h b/gr-atsc/include/gnuradio/atsc/data_interleaver_impl.h index a7765bd43f..e44125864b 100644 --- a/gr-atsc/include/atsc/data_interleaver_impl.h +++ b/gr-atsc/include/gnuradio/atsc/data_interleaver_impl.h @@ -23,9 +23,9 @@ #ifndef _ATSC_DATA_INTERLEAVER_H_ #define _ATSC_DATA_INTERLEAVER_H_ -#include <atsc/api.h> -#include <atsc/types.h> -#include <atsc/convolutional_interleaver.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/convolutional_interleaver.h> /*! * \brief atsc convolutional data interleaver diff --git a/gr-atsc/include/atsc/deinterleaver.h b/gr-atsc/include/gnuradio/atsc/deinterleaver.h index 35711a5d0e..22b5461aaf 100644 --- a/gr-atsc/include/atsc/deinterleaver.h +++ b/gr-atsc/include/gnuradio/atsc/deinterleaver.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_DEINTERLEAVER_H #define INCLUDED_ATSC_DEINTERLEAVER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/data_interleaver_impl.h> +#include <gnuradio/atsc/data_interleaver_impl.h> class atsc_deinterleaver; typedef boost::shared_ptr<atsc_deinterleaver> atsc_deinterleaver_sptr; diff --git a/gr-atsc/include/atsc/depad.h b/gr-atsc/include/gnuradio/atsc/depad.h index 26ea705e66..3a638c46fe 100644 --- a/gr-atsc/include/atsc/depad.h +++ b/gr-atsc/include/gnuradio/atsc/depad.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_ATSC_DEPAD_H #define INCLUDED_ATSC_DEPAD_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_interpolator.h> class atsc_depad; diff --git a/gr-atsc/include/atsc/derandomizer.h b/gr-atsc/include/gnuradio/atsc/derandomizer.h index 7824d5860c..86eaca427c 100644 --- a/gr-atsc/include/atsc/derandomizer.h +++ b/gr-atsc/include/gnuradio/atsc/derandomizer.h @@ -22,9 +22,9 @@ #ifndef INCLUDED_ATSC_DERANDOMIZER_H #define INCLUDED_ATSC_DERANDOMIZER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/randomizer_impl.h> +#include <gnuradio/atsc/randomizer_impl.h> class atsc_derandomizer; typedef boost::shared_ptr<atsc_derandomizer> atsc_derandomizer_sptr; diff --git a/gr-atsc/include/atsc/diag_output_impl.h b/gr-atsc/include/gnuradio/atsc/diag_output_impl.h index 09fd763d6a..09fd763d6a 100644 --- a/gr-atsc/include/atsc/diag_output_impl.h +++ b/gr-atsc/include/gnuradio/atsc/diag_output_impl.h diff --git a/gr-atsc/include/atsc/ds_to_softds.h b/gr-atsc/include/gnuradio/atsc/ds_to_softds.h index 82717829d5..197aafb7ad 100644 --- a/gr-atsc/include/atsc/ds_to_softds.h +++ b/gr-atsc/include/gnuradio/atsc/ds_to_softds.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_DS_TO_SOFTDS_H #define INCLUDED_ATSC_DS_TO_SOFTDS_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> class atsc_ds_to_softds; typedef boost::shared_ptr<atsc_ds_to_softds> atsc_ds_to_softds_sptr; diff --git a/gr-atsc/include/atsc/equalizer.h b/gr-atsc/include/gnuradio/atsc/equalizer.h index caac2974c8..4e9103fb12 100644 --- a/gr-atsc/include/atsc/equalizer.h +++ b/gr-atsc/include/gnuradio/atsc/equalizer.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_EQUALIZER_H #define INCLUDED_ATSC_EQUALIZER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/equalizer_impl.h> +#include <gnuradio/atsc/equalizer_impl.h> #include <vector> class atsc_equalizer; diff --git a/gr-atsc/include/atsc/equalizer_impl.h b/gr-atsc/include/gnuradio/atsc/equalizer_impl.h index e2baf537df..a6d849b00f 100644 --- a/gr-atsc/include/atsc/equalizer_impl.h +++ b/gr-atsc/include/gnuradio/atsc/equalizer_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_EQUALIZER_H_ #define _ATSC_EQUALIZER_H_ -#include <atsc/api.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/syminfo_impl.h> #include <vector> /*! diff --git a/gr-atsc/include/atsc/equalizer_lms2_impl.h b/gr-atsc/include/gnuradio/atsc/equalizer_lms2_impl.h index ebd6c13d0f..5f4ab66c96 100644 --- a/gr-atsc/include/atsc/equalizer_lms2_impl.h +++ b/gr-atsc/include/gnuradio/atsc/equalizer_lms2_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_EQUALIZER_LMS2_H_ #define _ATSC_EQUALIZER_LMS2_H_ -#include <atsc/api.h> -#include <atsc/equalizer_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/equalizer_impl.h> #include <vector> #include <stdio.h> diff --git a/gr-atsc/include/atsc/equalizer_lms_impl.h b/gr-atsc/include/gnuradio/atsc/equalizer_lms_impl.h index c91349de69..0daa00e67c 100644 --- a/gr-atsc/include/atsc/equalizer_lms_impl.h +++ b/gr-atsc/include/gnuradio/atsc/equalizer_lms_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_EQUALIZER_LMS_H_ #define _ATSC_EQUALIZER_LMS_H_ -#include <atsc/api.h> -#include <atsc/equalizer_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/equalizer_impl.h> #include <vector> #include <stdio.h> diff --git a/gr-atsc/include/atsc/equalizer_nop_impl.h b/gr-atsc/include/gnuradio/atsc/equalizer_nop_impl.h index 85549e326b..1c075c5220 100644 --- a/gr-atsc/include/atsc/equalizer_nop_impl.h +++ b/gr-atsc/include/gnuradio/atsc/equalizer_nop_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_EQUALIZER_NOP_H_ #define _ATSC_EQUALIZER_NOP_H_ -#include <atsc/api.h> -#include <atsc/equalizer_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/equalizer_impl.h> class ATSC_API atsci_equalizer_nop : public atsci_equalizer { diff --git a/gr-atsc/include/atsc/exp2_lp_impl.h b/gr-atsc/include/gnuradio/atsc/exp2_lp_impl.h index b0fbc46432..2d61fc8667 100644 --- a/gr-atsc/include/atsc/exp2_lp_impl.h +++ b/gr-atsc/include/gnuradio/atsc/exp2_lp_impl.h @@ -23,7 +23,7 @@ #ifndef _ATSC_EXP2_LP_H_ #define _ATSC_EXP2_LP_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gr_fir_builder.h> class ATSC_API atsci_exp2_lp : public gr_fir_builder diff --git a/gr-atsc/include/atsc/fake_single_viterbi_impl.h b/gr-atsc/include/gnuradio/atsc/fake_single_viterbi_impl.h index 5895e0ac61..ae671832b4 100644 --- a/gr-atsc/include/atsc/fake_single_viterbi_impl.h +++ b/gr-atsc/include/gnuradio/atsc/fake_single_viterbi_impl.h @@ -23,7 +23,7 @@ #ifndef _ATSCFAKESINGLEVITERBI_H_ #define _ATSCFAKESINGLEVITERBI_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> /*! * \brief single channel viterbi decoder diff --git a/gr-atsc/include/atsc/field_sync_demux.h b/gr-atsc/include/gnuradio/atsc/field_sync_demux.h index 0bc3d1dd0f..e12a456b51 100644 --- a/gr-atsc/include/atsc/field_sync_demux.h +++ b/gr-atsc/include/gnuradio/atsc/field_sync_demux.h @@ -22,9 +22,9 @@ #ifndef INCLUDED_ATSC_FIELD_SYNC_DEMUX_H #define INCLUDED_ATSC_FIELD_SYNC_DEMUX_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/block.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> class atsc_field_sync_demux; typedef boost::shared_ptr<atsc_field_sync_demux> atsc_field_sync_demux_sptr; diff --git a/gr-atsc/include/atsc/field_sync_mux.h b/gr-atsc/include/gnuradio/atsc/field_sync_mux.h index d6a78f4de7..dbf08c5132 100644 --- a/gr-atsc/include/atsc/field_sync_mux.h +++ b/gr-atsc/include/gnuradio/atsc/field_sync_mux.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_FIELD_SYNC_MUX_H #define INCLUDED_ATSC_FIELD_SYNC_MUX_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> class atsc_field_sync_mux; typedef boost::shared_ptr<atsc_field_sync_mux> atsc_field_sync_mux_sptr; diff --git a/gr-atsc/include/atsc/fpll.h b/gr-atsc/include/gnuradio/atsc/fpll.h index e20047a56a..9c565ed2eb 100644 --- a/gr-atsc/include/atsc/fpll.h +++ b/gr-atsc/include/gnuradio/atsc/fpll.h @@ -23,13 +23,13 @@ #ifndef INCLUDED_ATSC_FPLL_H #define INCLUDED_ATSC_FPLL_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> #include <gnuradio/nco.h> #include <gnuradio/filter/single_pole_iir.h> #include <gnuradio/analog/agc.h> #include <stdio.h> -#include <atsc/diag_output_impl.h> +#include <gnuradio/atsc/diag_output_impl.h> using namespace gr; diff --git a/gr-atsc/include/atsc/fs_checker.h b/gr-atsc/include/gnuradio/atsc/fs_checker.h index 0ece079f76..7a7d73852a 100644 --- a/gr-atsc/include/atsc/fs_checker.h +++ b/gr-atsc/include/gnuradio/atsc/fs_checker.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_ATSC_FS_CHECKER_H #define INCLUDED_ATSC_FS_CHECKER_H -#include <atsc/api.h> -#include <atsc/fs_checker_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/fs_checker_impl.h> #include <gnuradio/sync_block.h> class atsc_fs_checker; diff --git a/gr-atsc/include/atsc/fs_checker_impl.h b/gr-atsc/include/gnuradio/atsc/fs_checker_impl.h index a4975d243e..3ac1b8d913 100644 --- a/gr-atsc/include/atsc/fs_checker_impl.h +++ b/gr-atsc/include/gnuradio/atsc/fs_checker_impl.h @@ -22,8 +22,8 @@ #ifndef _ATSC_FS_CHECKER_H_ #define _ATSC_FS_CHECKER_H_ -#include <atsc/api.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/syminfo_impl.h> /*! * \brief abstract base class for ATSC field sync checker diff --git a/gr-atsc/include/atsc/fs_checker_naive_impl.h b/gr-atsc/include/gnuradio/atsc/fs_checker_naive_impl.h index 0056bf69c8..002af5c645 100644 --- a/gr-atsc/include/atsc/fs_checker_naive_impl.h +++ b/gr-atsc/include/gnuradio/atsc/fs_checker_naive_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_FS_CHECKER_NAIVE_H_ #define _ATSC_FS_CHECKER_NAIVE_H_ -#include <atsc/api.h> -#include <atsc/fs_checker_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/fs_checker_impl.h> /*! * \brief Naive concrete implementation of field sync checker diff --git a/gr-atsc/include/atsc/fs_correlator_impl.h b/gr-atsc/include/gnuradio/atsc/fs_correlator_impl.h index b55b1b9854..2517877666 100644 --- a/gr-atsc/include/atsc/fs_correlator_impl.h +++ b/gr-atsc/include/gnuradio/atsc/fs_correlator_impl.h @@ -23,7 +23,7 @@ #ifndef _ATSC_FS_CORRELATOR_H_ #define _ATSC_FS_CORRELATOR_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> /*! * \brief abstract base class for ATSC field sync correlator diff --git a/gr-atsc/include/atsc/fs_correlator_naive_impl.h b/gr-atsc/include/gnuradio/atsc/fs_correlator_naive_impl.h index e2fd19557b..4f8b5a8d76 100644 --- a/gr-atsc/include/atsc/fs_correlator_naive_impl.h +++ b/gr-atsc/include/gnuradio/atsc/fs_correlator_naive_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_FS_CORRELATOR_NAIVE_H_ #define _ATSC_FS_CORRELATOR_NAIVE_H_ -#include <atsc/api.h> -#include <atsc/fs_correlator_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/fs_correlator_impl.h> /*! * \brief Naive concrete implementation of field sync correlator diff --git a/gr-atsc/include/atsc/interleaver.h b/gr-atsc/include/gnuradio/atsc/interleaver.h index 9031e13c50..1f245bbbe0 100644 --- a/gr-atsc/include/atsc/interleaver.h +++ b/gr-atsc/include/gnuradio/atsc/interleaver.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_INTERLEAVER_H #define INCLUDED_ATSC_INTERLEAVER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/data_interleaver_impl.h> +#include <gnuradio/atsc/data_interleaver_impl.h> class atsc_interleaver; typedef boost::shared_ptr<atsc_interleaver> atsc_interleaver_sptr; diff --git a/gr-atsc/include/atsc/interleaver_fifo.h b/gr-atsc/include/gnuradio/atsc/interleaver_fifo.h index 5c29a82563..aee42104e7 100644 --- a/gr-atsc/include/atsc/interleaver_fifo.h +++ b/gr-atsc/include/gnuradio/atsc/interleaver_fifo.h @@ -24,7 +24,7 @@ #define _INTERLEAVER_FIFO_H_ -#include <atsc/interleaver_fifo.h> +#include <gnuradio/atsc/interleaver_fifo.h> #include <string.h> /*! diff --git a/gr-atsc/include/atsc/pad.h b/gr-atsc/include/gnuradio/atsc/pad.h index 0871776d03..cbe5b11e5d 100644 --- a/gr-atsc/include/atsc/pad.h +++ b/gr-atsc/include/gnuradio/atsc/pad.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_ATSC_PAD_H #define INCLUDED_ATSC_PAD_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_decimator.h> class atsc_pad; diff --git a/gr-atsc/include/atsc/pnXXX_impl.h b/gr-atsc/include/gnuradio/atsc/pnXXX_impl.h index 3de6eb1f51..b33d82cec6 100644 --- a/gr-atsc/include/atsc/pnXXX_impl.h +++ b/gr-atsc/include/gnuradio/atsc/pnXXX_impl.h @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> ATSC_API extern const unsigned char atsc_pn511[]; ATSC_API extern const unsigned char atsc_pn63[]; diff --git a/gr-atsc/include/atsc/randomizer.h b/gr-atsc/include/gnuradio/atsc/randomizer.h index b5e7237031..dfda95d032 100644 --- a/gr-atsc/include/atsc/randomizer.h +++ b/gr-atsc/include/gnuradio/atsc/randomizer.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_RANDOMIZER_H #define INCLUDED_ATSC_RANDOMIZER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/randomizer_impl.h> +#include <gnuradio/atsc/randomizer_impl.h> class atsc_randomizer; typedef boost::shared_ptr<atsc_randomizer> atsc_randomizer_sptr; diff --git a/gr-atsc/include/atsc/randomizer_impl.h b/gr-atsc/include/gnuradio/atsc/randomizer_impl.h index 4fdbebc06d..d798629de2 100644 --- a/gr-atsc/include/atsc/randomizer_impl.h +++ b/gr-atsc/include/gnuradio/atsc/randomizer_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_RANDOMIZER_H_ #define _ATSC_RANDOMIZER_H_ -#include <atsc/api.h> -#include <atsc/types.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/types.h> /*! * \brief ATSC data "whitener" diff --git a/gr-atsc/include/atsc/reed_solomon_impl.h b/gr-atsc/include/gnuradio/atsc/reed_solomon_impl.h index 484b6d0ce2..53584b4dbf 100644 --- a/gr-atsc/include/atsc/reed_solomon_impl.h +++ b/gr-atsc/include/gnuradio/atsc/reed_solomon_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_REED_SOLOMON_H_ #define _ATSC_REED_SOLOMON_H_ -#include <atsc/api.h> -#include <atsc/types.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/types.h> /*! * \brief ATSC Reed-Solomon encoder / decoder diff --git a/gr-atsc/include/atsc/root_raised_cosine_bandpass_impl.h b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_bandpass_impl.h index 50548bec89..318d888712 100644 --- a/gr-atsc/include/atsc/root_raised_cosine_bandpass_impl.h +++ b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_bandpass_impl.h @@ -23,8 +23,8 @@ #ifndef _ATSC_RRC_BANDPASS_H_ #define _ATSC_RRC_BANDPASS_H_ -#include <atsc/api.h> -#include <atsc/root_raised_cosine_impl.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/root_raised_cosine_impl.h> class ATSC_API atsc_root_raised_cosine_bandpass : public atsc_root_raised_cosine { diff --git a/gr-atsc/include/atsc/root_raised_cosine_impl.h b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_impl.h index ae884bfb19..3489a7a908 100644 --- a/gr-atsc/include/atsc/root_raised_cosine_impl.h +++ b/gr-atsc/include/gnuradio/atsc/root_raised_cosine_impl.h @@ -23,7 +23,7 @@ #ifndef _ATSC_RRC_H_ #define _ATSC_RRC_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gr_fir_builder.h> class ATSC_API atsc_root_raised_cosine : public gr_fir_builder diff --git a/gr-atsc/include/atsc/rs_decoder.h b/gr-atsc/include/gnuradio/atsc/rs_decoder.h index 6b8a7f4560..99ab875869 100644 --- a/gr-atsc/include/atsc/rs_decoder.h +++ b/gr-atsc/include/gnuradio/atsc/rs_decoder.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_RS_DECODER_H #define INCLUDED_ATSC_RS_DECODER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/reed_solomon_impl.h> class atsc_rs_decoder; typedef boost::shared_ptr<atsc_rs_decoder> atsc_rs_decoder_sptr; diff --git a/gr-atsc/include/atsc/rs_encoder.h b/gr-atsc/include/gnuradio/atsc/rs_encoder.h index 43ee112499..49f67d2762 100644 --- a/gr-atsc/include/atsc/rs_encoder.h +++ b/gr-atsc/include/gnuradio/atsc/rs_encoder.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_RS_ENCODER_H #define INCLUDED_ATSC_RS_ENCODER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/reed_solomon_impl.h> class atsc_rs_encoder; typedef boost::shared_ptr<atsc_rs_encoder> atsc_rs_encoder_sptr; diff --git a/gr-atsc/include/atsc/single_viterbi_impl.h b/gr-atsc/include/gnuradio/atsc/single_viterbi_impl.h index d92ded80e5..d6578ce259 100644 --- a/gr-atsc/include/atsc/single_viterbi_impl.h +++ b/gr-atsc/include/gnuradio/atsc/single_viterbi_impl.h @@ -23,7 +23,7 @@ #ifndef _ATSCSINGLEVITERBI_H_ #define _ATSCSINGLEVITERBI_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> /*! * \brief single channel viterbi decoder diff --git a/gr-atsc/include/atsc/slicer_agc_impl.h b/gr-atsc/include/gnuradio/atsc/slicer_agc_impl.h index 25e1669ee0..d55e744fea 100644 --- a/gr-atsc/include/atsc/slicer_agc_impl.h +++ b/gr-atsc/include/gnuradio/atsc/slicer_agc_impl.h @@ -23,7 +23,7 @@ #ifndef _ATSC_SLICER_AGC_H_ #define _ATSC_SLICER_AGC_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <math.h> #include <gnuradio/filter/single_pole_iir.h> diff --git a/gr-atsc/include/atsc/sliding_correlator_impl.h b/gr-atsc/include/gnuradio/atsc/sliding_correlator_impl.h index 45c0caa241..eca63df609 100644 --- a/gr-atsc/include/atsc/sliding_correlator_impl.h +++ b/gr-atsc/include/gnuradio/atsc/sliding_correlator_impl.h @@ -23,10 +23,10 @@ #ifndef _ATSC_SLIDING_CORRELATOR_H_ #define _ATSC_SLIDING_CORRELATOR_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <string.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> //extern const unsigned char atsc_pn511[511]; //extern const unsigned char atsc_pn63[63]; diff --git a/gr-atsc/include/atsc/sssr_impl.h b/gr-atsc/include/gnuradio/atsc/sssr_impl.h index 4e910f1d3f..f61d0f340f 100644 --- a/gr-atsc/include/atsc/sssr_impl.h +++ b/gr-atsc/include/gnuradio/atsc/sssr_impl.h @@ -27,8 +27,8 @@ #ifndef _ATSC_SSSR_H_ #define _ATSC_SSSR_H_ -#include <atsc/api.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/consts.h> #include <gnuradio/filter/mmse_fir_interpolator_ff.h> #include <gnuradio/filter/single_pole_iir.h> #include <cstdio> diff --git a/gr-atsc/include/atsc/syminfo_impl.h b/gr-atsc/include/gnuradio/atsc/syminfo_impl.h index 9f25e4902a..9f25e4902a 100644 --- a/gr-atsc/include/atsc/syminfo_impl.h +++ b/gr-atsc/include/gnuradio/atsc/syminfo_impl.h diff --git a/gr-atsc/include/atsc/sync_tag_impl.h b/gr-atsc/include/gnuradio/atsc/sync_tag_impl.h index bdb64c5d3d..bdb64c5d3d 100644 --- a/gr-atsc/include/atsc/sync_tag_impl.h +++ b/gr-atsc/include/gnuradio/atsc/sync_tag_impl.h diff --git a/gr-atsc/include/atsc/trellis_encoder.h b/gr-atsc/include/gnuradio/atsc/trellis_encoder.h index 7833d0beda..6eb424650f 100644 --- a/gr-atsc/include/atsc/trellis_encoder.h +++ b/gr-atsc/include/gnuradio/atsc/trellis_encoder.h @@ -22,9 +22,9 @@ #ifndef INCLUDED_ATSC_TRELLIS_ENCODER_H #define INCLUDED_ATSC_TRELLIS_ENCODER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/trellis_encoder_impl.h> +#include <gnuradio/atsc/trellis_encoder_impl.h> class atsc_trellis_encoder; typedef boost::shared_ptr<atsc_trellis_encoder> atsc_trellis_encoder_sptr; diff --git a/gr-atsc/include/atsc/trellis_encoder_impl.h b/gr-atsc/include/gnuradio/atsc/trellis_encoder_impl.h index d20885ef36..93aab1b190 100644 --- a/gr-atsc/include/atsc/trellis_encoder_impl.h +++ b/gr-atsc/include/gnuradio/atsc/trellis_encoder_impl.h @@ -23,9 +23,9 @@ #ifndef _ATSC_TRELLIS_ENCODER_H_ #define _ATSC_TRELLIS_ENCODER_H_ -#include <atsc/api.h> -#include <atsc/basic_trellis_encoder_impl.h> -#include <atsc/types.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/types.h> /*! * \brief fancy, schmancy 12-way interleaved trellis encoder for ATSC diff --git a/gr-atsc/include/atsc/types.h b/gr-atsc/include/gnuradio/atsc/types.h index 759ef68ba7..1d93bb0d6a 100644 --- a/gr-atsc/include/atsc/types.h +++ b/gr-atsc/include/gnuradio/atsc/types.h @@ -23,7 +23,7 @@ #ifndef _ATSC_TYPES_H_ #define _ATSC_TYPES_H_ -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> #include <cstring> #include <cassert> diff --git a/gr-atsc/include/atsc/viterbi_decoder.h b/gr-atsc/include/gnuradio/atsc/viterbi_decoder.h index 8ba60e90cb..a529c18d3b 100644 --- a/gr-atsc/include/atsc/viterbi_decoder.h +++ b/gr-atsc/include/gnuradio/atsc/viterbi_decoder.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_ATSC_VITERBI_DECODER_H #define INCLUDED_ATSC_VITERBI_DECODER_H -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gnuradio/sync_block.h> -#include <atsc/viterbi_decoder_impl.h> +#include <gnuradio/atsc/viterbi_decoder_impl.h> class atsc_viterbi_decoder; typedef boost::shared_ptr<atsc_viterbi_decoder> atsc_viterbi_decoder_sptr; diff --git a/gr-atsc/include/atsc/viterbi_decoder_impl.h b/gr-atsc/include/gnuradio/atsc/viterbi_decoder_impl.h index 307b157a9b..447d43911d 100644 --- a/gr-atsc/include/atsc/viterbi_decoder_impl.h +++ b/gr-atsc/include/gnuradio/atsc/viterbi_decoder_impl.h @@ -25,15 +25,15 @@ #define USE_SIMPLE_SLICER 0 -#include <atsc/api.h> -#include <atsc/types.h> -#include <atsc/interleaver_fifo.h> +#include <gnuradio/atsc/api.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/interleaver_fifo.h> #if (USE_SIMPLE_SLICER) -#include <atsc/fake_single_viterbi_impl.h> +#include <gnuradio/atsc/fake_single_viterbi_impl.h> typedef atsci_fake_single_viterbi single_viterbi_t; #else -#include <atsc/single_viterbi_impl.h> +#include <gnuradio/atsc/single_viterbi_impl.h> typedef atsci_single_viterbi single_viterbi_t; #endif diff --git a/gr-atsc/include/atsc/vsbtx_lp_impl.h b/gr-atsc/include/gnuradio/atsc/vsbtx_lp_impl.h index d9640ca483..ce6f8bfefb 100644 --- a/gr-atsc/include/atsc/vsbtx_lp_impl.h +++ b/gr-atsc/include/gnuradio/atsc/vsbtx_lp_impl.h @@ -23,7 +23,7 @@ #ifndef _ATSC_VSBTX_LP_H_ #define _ATSC_VSBTX_LP_H_ -#include <atsc/api.h> +#include <gnuradio/atsc/api.h> #include <gr_fir_builder.h> class ATSC_API atsc_vsbtx_lp : public gr_fir_builder diff --git a/gr-atsc/lib/GrAtscBitTimingLoop.cc b/gr-atsc/lib/GrAtscBitTimingLoop.cc index f2e666892b..835dc14a91 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop.cc @@ -21,10 +21,10 @@ */ #include <cmath> -#include <atsc/GrAtscBitTimingLoop.h> +#include <gnuradio/atsc/GrAtscBitTimingLoop.h> #include "fpll_btloop_coupling.h" #include <algorithm> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> #include <stdio.h> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscBitTimingLoop2.cc b/gr-atsc/lib/GrAtscBitTimingLoop2.cc index d856123fc3..536ca08720 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop2.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop2.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscBitTimingLoop2.h> +#include <gnuradio/atsc/GrAtscBitTimingLoop2.h> #include <algorithm> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> #include <stdio.h> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscBitTimingLoop3.cc b/gr-atsc/lib/GrAtscBitTimingLoop3.cc index 647b34c151..14596900a9 100644 --- a/gr-atsc/lib/GrAtscBitTimingLoop3.cc +++ b/gr-atsc/lib/GrAtscBitTimingLoop3.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscBitTimingLoop3.h> +#include <gnuradio/atsc/GrAtscBitTimingLoop3.h> #include <cmath> #include <cstdio> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscConvert2xTo20.cc b/gr-atsc/lib/GrAtscConvert2xTo20.cc index ac22ee1258..296ae35302 100644 --- a/gr-atsc/lib/GrAtscConvert2xTo20.cc +++ b/gr-atsc/lib/GrAtscConvert2xTo20.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscConvert2xTo20.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/GrAtscConvert2xTo20.h> +#include <gnuradio/atsc/consts.h> #include <cmath> #include <cstdio> diff --git a/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc b/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc index 2406c0c33d..a17927bf5b 100644 --- a/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc +++ b/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscDataSegToSoftDataSeg.h> +#include <gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscDeinterleaver.cc b/gr-atsc/lib/GrAtscDeinterleaver.cc index 69fac69aa8..dffa99e809 100644 --- a/gr-atsc/lib/GrAtscDeinterleaver.cc +++ b/gr-atsc/lib/GrAtscDeinterleaver.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscDeinterleaver.h> +#include <gnuradio/atsc/GrAtscDeinterleaver.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscDerandomizer.cc b/gr-atsc/lib/GrAtscDerandomizer.cc index ac1701d906..f6c1203bc9 100644 --- a/gr-atsc/lib/GrAtscDerandomizer.cc +++ b/gr-atsc/lib/GrAtscDerandomizer.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscDerandomizer.h> +#include <gnuradio/atsc/GrAtscDerandomizer.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscEqualizer.cc b/gr-atsc/lib/GrAtscEqualizer.cc index 3e9f8a0022..71e6723505 100644 --- a/gr-atsc/lib/GrAtscEqualizer.cc +++ b/gr-atsc/lib/GrAtscEqualizer.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscEqualizer.h> -#include <atsc/equalizer_impl.h> +#include <gnuradio/atsc/GrAtscEqualizer.h> +#include <gnuradio/atsc/equalizer_impl.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscFPLL.cc b/gr-atsc/lib/GrAtscFPLL.cc index fc796c3c12..e0919e0181 100644 --- a/gr-atsc/lib/GrAtscFPLL.cc +++ b/gr-atsc/lib/GrAtscFPLL.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscFPLL.h> +#include <gnuradio/atsc/GrAtscFPLL.h> #include <algorithm> #include "fpll_btloop_coupling.h" diff --git a/gr-atsc/lib/GrAtscFieldSyncChecker.cc b/gr-atsc/lib/GrAtscFieldSyncChecker.cc index 0aaa98e4f6..620962cbcd 100644 --- a/gr-atsc/lib/GrAtscFieldSyncChecker.cc +++ b/gr-atsc/lib/GrAtscFieldSyncChecker.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscFieldSyncChecker.h> -#include <atsc/create_atsci_fs_checker.h> -#include <atsc/fs_checker_impl.h> +#include <gnuradio/atsc/GrAtscFieldSyncChecker.h> +#include <gnuradio/atsc/create_atsci_fs_checker.h> +#include <gnuradio/atsc/fs_checker_impl.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc b/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc index 5d42d3b5a9..0abb1799f1 100644 --- a/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc +++ b/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscFieldSyncCorrelator.h> -#include <atsc/create_atsci_fs_correlator.h> -#include <atsc/fs_correlator_impl.h> +#include <gnuradio/atsc/GrAtscFieldSyncCorrelator.h> +#include <gnuradio/atsc/create_atsci_fs_correlator.h> +#include <gnuradio/atsc/fs_correlator_impl.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscFieldSyncDemux.cc b/gr-atsc/lib/GrAtscFieldSyncDemux.cc index 171d25d23d..873b56eaf3 100644 --- a/gr-atsc/lib/GrAtscFieldSyncDemux.cc +++ b/gr-atsc/lib/GrAtscFieldSyncDemux.cc @@ -21,10 +21,10 @@ */ #include <cmath> -#include <atsc/GrAtscFieldSyncDemux.h> -#include <atsc/consts.h> -#include <atsc/types.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/GrAtscFieldSyncDemux.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/syminfo_impl.h> #include <stdio.h> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscFieldSyncMux.cc b/gr-atsc/lib/GrAtscFieldSyncMux.cc index 50ad55448d..4d514fd852 100644 --- a/gr-atsc/lib/GrAtscFieldSyncMux.cc +++ b/gr-atsc/lib/GrAtscFieldSyncMux.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscFieldSyncMux.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/GrAtscFieldSyncMux.h> +#include <gnuradio/atsc/pnXXX_impl.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscInterleaver.cc b/gr-atsc/lib/GrAtscInterleaver.cc index 58113bd5d4..f24dcaad15 100644 --- a/gr-atsc/lib/GrAtscInterleaver.cc +++ b/gr-atsc/lib/GrAtscInterleaver.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscInterleaver.h> +#include <gnuradio/atsc/GrAtscInterleaver.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscRSDecoder.cc b/gr-atsc/lib/GrAtscRSDecoder.cc index 211c569efd..f87edef6ae 100644 --- a/gr-atsc/lib/GrAtscRSDecoder.cc +++ b/gr-atsc/lib/GrAtscRSDecoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscRSDecoder.h> +#include <gnuradio/atsc/GrAtscRSDecoder.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscRSEncoder.cc b/gr-atsc/lib/GrAtscRSEncoder.cc index f7a457351b..deef98f180 100644 --- a/gr-atsc/lib/GrAtscRSEncoder.cc +++ b/gr-atsc/lib/GrAtscRSEncoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscRSEncoder.h> +#include <gnuradio/atsc/GrAtscRSEncoder.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscRandomizer.cc b/gr-atsc/lib/GrAtscRandomizer.cc index b4123c788f..bdf5e682ae 100644 --- a/gr-atsc/lib/GrAtscRandomizer.cc +++ b/gr-atsc/lib/GrAtscRandomizer.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscRandomizer.h> +#include <gnuradio/atsc/GrAtscRandomizer.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscSegSymSync.cc b/gr-atsc/lib/GrAtscSegSymSync.cc index 53d5d3b4bb..001f8a1bba 100644 --- a/gr-atsc/lib/GrAtscSegSymSync.cc +++ b/gr-atsc/lib/GrAtscSegSymSync.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscSegSymSync.h> -#include <atsc/GrAtscSegSymSyncImpl_export.h> +#include <gnuradio/atsc/GrAtscSegSymSync.h> +#include <gnuradio/atsc/GrAtscSegSymSyncImpl_export.h> #include <iostream> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscSegSymSyncImpl.cc b/gr-atsc/lib/GrAtscSegSymSyncImpl.cc index 425ab36d11..bdb15a2b57 100644 --- a/gr-atsc/lib/GrAtscSegSymSyncImpl.cc +++ b/gr-atsc/lib/GrAtscSegSymSyncImpl.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscSegSymSyncImpl.h> -#include <atsc/GrAtscSegSymSyncImpl_export.h> +#include <gnuradio/atsc/GrAtscSegSymSyncImpl.h> +#include <gnuradio/atsc/GrAtscSegSymSyncImpl_export.h> #include <cmath> #include <assert.h> diff --git a/gr-atsc/lib/GrAtscTrellisEncoder.cc b/gr-atsc/lib/GrAtscTrellisEncoder.cc index abe67d2a9e..62f7f75b22 100644 --- a/gr-atsc/lib/GrAtscTrellisEncoder.cc +++ b/gr-atsc/lib/GrAtscTrellisEncoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscTrellisEncoder.h> +#include <gnuradio/atsc/GrAtscTrellisEncoder.h> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/GrAtscViterbiDecoder.cc b/gr-atsc/lib/GrAtscViterbiDecoder.cc index 986fe001dc..272d457846 100644 --- a/gr-atsc/lib/GrAtscViterbiDecoder.cc +++ b/gr-atsc/lib/GrAtscViterbiDecoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/GrAtscViterbiDecoder.h> +#include <gnuradio/atsc/GrAtscViterbiDecoder.h> #include <iostream> // typedefs for fundamental i/o types diff --git a/gr-atsc/lib/atsc_bit_timing_loop.cc b/gr-atsc/lib/atsc_bit_timing_loop.cc index 0eaa53ccfa..f75e724834 100644 --- a/gr-atsc/lib/atsc_bit_timing_loop.cc +++ b/gr-atsc/lib/atsc_bit_timing_loop.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/bit_timing_loop.h> +#include <gnuradio/atsc/bit_timing_loop.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> #include <string.h> // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz diff --git a/gr-atsc/lib/atsc_deinterleaver.cc b/gr-atsc/lib/atsc_deinterleaver.cc index 27728d8b07..47507e58aa 100644 --- a/gr-atsc/lib/atsc_deinterleaver.cc +++ b/gr-atsc/lib/atsc_deinterleaver.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/deinterleaver.h> +#include <gnuradio/atsc/deinterleaver.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> atsc_deinterleaver_sptr diff --git a/gr-atsc/lib/atsc_depad.cc b/gr-atsc/lib/atsc_depad.cc index 626638bf63..b4872df2c9 100644 --- a/gr-atsc/lib/atsc_depad.cc +++ b/gr-atsc/lib/atsc_depad.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/depad.h> +#include <gnuradio/atsc/depad.h> #include <gnuradio/io_signature.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> atsc_depad_sptr atsc_make_depad() diff --git a/gr-atsc/lib/atsc_derandomizer.cc b/gr-atsc/lib/atsc_derandomizer.cc index f0051a6090..e619aa6865 100644 --- a/gr-atsc/lib/atsc_derandomizer.cc +++ b/gr-atsc/lib/atsc_derandomizer.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/derandomizer.h> +#include <gnuradio/atsc/derandomizer.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> atsc_derandomizer_sptr diff --git a/gr-atsc/lib/atsc_ds_to_softds.cc b/gr-atsc/lib/atsc_ds_to_softds.cc index b1061b83fc..d4f79f829e 100644 --- a/gr-atsc/lib/atsc_ds_to_softds.cc +++ b/gr-atsc/lib/atsc_ds_to_softds.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/ds_to_softds.h> +#include <gnuradio/atsc/ds_to_softds.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> atsc_ds_to_softds_sptr diff --git a/gr-atsc/lib/atsc_equalizer.cc b/gr-atsc/lib/atsc_equalizer.cc index 6b76b37387..2e00f5f374 100644 --- a/gr-atsc/lib/atsc_equalizer.cc +++ b/gr-atsc/lib/atsc_equalizer.cc @@ -24,11 +24,11 @@ #include <config.h> #endif -#include <atsc/equalizer.h> -#include <atsc/create_atsci_equalizer.h> +#include <gnuradio/atsc/equalizer.h> +#include <gnuradio/atsc/create_atsci_equalizer.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/syminfo_impl.h> atsc_equalizer_sptr diff --git a/gr-atsc/lib/atsc_field_sync_demux.cc b/gr-atsc/lib/atsc_field_sync_demux.cc index dc5c011353..69830f45ed 100644 --- a/gr-atsc/lib/atsc_field_sync_demux.cc +++ b/gr-atsc/lib/atsc_field_sync_demux.cc @@ -25,11 +25,11 @@ #endif #include <cmath> -#include <atsc/field_sync_demux.h> +#include <gnuradio/atsc/field_sync_demux.h> #include <gnuradio/io_signature.h> -#include <atsc/types.h> -#include <atsc/consts.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/types.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/syminfo_impl.h> #include <stdio.h> #include <assert.h> #include <iostream> diff --git a/gr-atsc/lib/atsc_field_sync_mux.cc b/gr-atsc/lib/atsc_field_sync_mux.cc index 82bb0d8692..5520a74877 100644 --- a/gr-atsc/lib/atsc_field_sync_mux.cc +++ b/gr-atsc/lib/atsc_field_sync_mux.cc @@ -24,10 +24,10 @@ #include <config.h> #endif -#include <atsc/field_sync_mux.h> +#include <gnuradio/atsc/field_sync_mux.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/pnXXX_impl.h> atsc_field_sync_mux_sptr diff --git a/gr-atsc/lib/atsc_fpll.cc b/gr-atsc/lib/atsc_fpll.cc index 323f1681c9..9a27674c0a 100644 --- a/gr-atsc/lib/atsc_fpll.cc +++ b/gr-atsc/lib/atsc_fpll.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/fpll.h> +#include <gnuradio/atsc/fpll.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> #include <algorithm> #include "fpll_btloop_coupling.h" #include <gnuradio/math.h> diff --git a/gr-atsc/lib/atsc_fs_checker.cc b/gr-atsc/lib/atsc_fs_checker.cc index f8727d7584..28e771dfb5 100644 --- a/gr-atsc/lib/atsc_fs_checker.cc +++ b/gr-atsc/lib/atsc_fs_checker.cc @@ -24,12 +24,12 @@ #include <config.h> #endif -#include <atsc/fs_checker.h> -#include <atsc/create_atsci_fs_checker.h> -#include <atsc/fs_checker_impl.h> +#include <gnuradio/atsc/fs_checker.h> +#include <gnuradio/atsc/create_atsci_fs_checker.h> +#include <gnuradio/atsc/fs_checker_impl.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> -#include <atsc/syminfo_impl.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/syminfo_impl.h> atsc_fs_checker_sptr diff --git a/gr-atsc/lib/atsc_interleaver.cc b/gr-atsc/lib/atsc_interleaver.cc index 24b335a4af..ef8820abaf 100644 --- a/gr-atsc/lib/atsc_interleaver.cc +++ b/gr-atsc/lib/atsc_interleaver.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/interleaver.h> +#include <gnuradio/atsc/interleaver.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> atsc_interleaver_sptr diff --git a/gr-atsc/lib/atsc_pad.cc b/gr-atsc/lib/atsc_pad.cc index 1d341bacf3..776eb4ab05 100644 --- a/gr-atsc/lib/atsc_pad.cc +++ b/gr-atsc/lib/atsc_pad.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/pad.h> +#include <gnuradio/atsc/pad.h> #include <gnuradio/io_signature.h> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> static const int INTR = ATSC_MPEG_PKT_LENGTH; diff --git a/gr-atsc/lib/atsc_randomizer.cc b/gr-atsc/lib/atsc_randomizer.cc index 54cb3c3084..6ee61a9888 100644 --- a/gr-atsc/lib/atsc_randomizer.cc +++ b/gr-atsc/lib/atsc_randomizer.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/randomizer.h> +#include <gnuradio/atsc/randomizer.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> atsc_randomizer_sptr diff --git a/gr-atsc/lib/atsc_rs_decoder.cc b/gr-atsc/lib/atsc_rs_decoder.cc index f707a98073..3891b3874d 100644 --- a/gr-atsc/lib/atsc_rs_decoder.cc +++ b/gr-atsc/lib/atsc_rs_decoder.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/rs_decoder.h> +#include <gnuradio/atsc/rs_decoder.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> atsc_rs_decoder_sptr diff --git a/gr-atsc/lib/atsc_rs_encoder.cc b/gr-atsc/lib/atsc_rs_encoder.cc index 702ad07e72..b2b8cf7421 100644 --- a/gr-atsc/lib/atsc_rs_encoder.cc +++ b/gr-atsc/lib/atsc_rs_encoder.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/rs_encoder.h> +#include <gnuradio/atsc/rs_encoder.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> atsc_rs_encoder_sptr diff --git a/gr-atsc/lib/atsc_trellis_encoder.cc b/gr-atsc/lib/atsc_trellis_encoder.cc index 8cb3c6fcba..fe8530d6d2 100644 --- a/gr-atsc/lib/atsc_trellis_encoder.cc +++ b/gr-atsc/lib/atsc_trellis_encoder.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/trellis_encoder.h> +#include <gnuradio/atsc/trellis_encoder.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> atsc_trellis_encoder_sptr diff --git a/gr-atsc/lib/atsc_viterbi_decoder.cc b/gr-atsc/lib/atsc_viterbi_decoder.cc index 7ea2c8ca43..7f74bffc3b 100644 --- a/gr-atsc/lib/atsc_viterbi_decoder.cc +++ b/gr-atsc/lib/atsc_viterbi_decoder.cc @@ -24,9 +24,9 @@ #include <config.h> #endif -#include <atsc/viterbi_decoder.h> +#include <gnuradio/atsc/viterbi_decoder.h> #include <gnuradio/io_signature.h> -#include <atsc/consts.h> +#include <gnuradio/atsc/consts.h> #include <iostream> using std::cerr; diff --git a/gr-atsc/lib/atsci_basic_trellis_encoder.cc b/gr-atsc/lib/atsci_basic_trellis_encoder.cc index a4fa3d6d83..589958220a 100644 --- a/gr-atsc/lib/atsci_basic_trellis_encoder.cc +++ b/gr-atsc/lib/atsci_basic_trellis_encoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> #include <assert.h> const unsigned char atsci_basic_trellis_encoder::next_state[32] = { diff --git a/gr-atsc/lib/atsci_data_interleaver.cc b/gr-atsc/lib/atsci_data_interleaver.cc index 9aa2541412..ec270071ad 100644 --- a/gr-atsc/lib/atsci_data_interleaver.cc +++ b/gr-atsc/lib/atsci_data_interleaver.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/data_interleaver_impl.h> +#include <gnuradio/atsc/data_interleaver_impl.h> void atsci_data_interleaver::interleave (atsc_mpeg_packet_rs_encoded &out, diff --git a/gr-atsc/lib/atsci_equalizer.cc b/gr-atsc/lib/atsci_equalizer.cc index 6646810a2b..9e58cddfc2 100644 --- a/gr-atsc/lib/atsci_equalizer.cc +++ b/gr-atsc/lib/atsci_equalizer.cc @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/equalizer_impl.h> +#include <gnuradio/atsc/equalizer_impl.h> #include <algorithm> #include <iostream> -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> using std::cerr; using std::endl; diff --git a/gr-atsc/lib/atsci_equalizer_lms.cc b/gr-atsc/lib/atsci_equalizer_lms.cc index b4776faea6..9da93aebf0 100644 --- a/gr-atsc/lib/atsci_equalizer_lms.cc +++ b/gr-atsc/lib/atsci_equalizer_lms.cc @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/equalizer_lms_impl.h> +#include <gnuradio/atsc/equalizer_lms_impl.h> #include <assert.h> #include <algorithm> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> #include <stdio.h> diff --git a/gr-atsc/lib/atsci_equalizer_lms2.cc b/gr-atsc/lib/atsci_equalizer_lms2.cc index 7bcaad12a0..51097931ca 100644 --- a/gr-atsc/lib/atsci_equalizer_lms2.cc +++ b/gr-atsc/lib/atsci_equalizer_lms2.cc @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/equalizer_lms2_impl.h> +#include <gnuradio/atsc/equalizer_lms2_impl.h> #include <assert.h> #include <algorithm> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> #include <cmath> #include <stdlib.h> #include <gnuradio/math.h> diff --git a/gr-atsc/lib/atsci_equalizer_nop.cc b/gr-atsc/lib/atsci_equalizer_nop.cc index 61fed43d27..39cf2ea1f6 100644 --- a/gr-atsc/lib/atsci_equalizer_nop.cc +++ b/gr-atsc/lib/atsci_equalizer_nop.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/equalizer_nop_impl.h> -#include <atsc/sync_tag_impl.h> +#include <gnuradio/atsc/equalizer_nop_impl.h> +#include <gnuradio/atsc/sync_tag_impl.h> #include <assert.h> atsci_equalizer_nop::atsci_equalizer_nop () diff --git a/gr-atsc/lib/atsci_exp2_lp.cc b/gr-atsc/lib/atsci_exp2_lp.cc index 93e15f7023..ae12db02c2 100644 --- a/gr-atsc/lib/atsci_exp2_lp.cc +++ b/gr-atsc/lib/atsci_exp2_lp.cc @@ -21,7 +21,7 @@ */ #include <atsc_consts.h> -#include <atsc/exp2_lp_impl.h> +#include <gnuradio/atsc/exp2_lp_impl.h> #include <stdexcept> #include <cmath> #include <iostream> diff --git a/gr-atsc/lib/atsci_fake_single_viterbi.cc b/gr-atsc/lib/atsci_fake_single_viterbi.cc index e94e7f0734..0e1eb6f3a4 100644 --- a/gr-atsc/lib/atsci_fake_single_viterbi.cc +++ b/gr-atsc/lib/atsci_fake_single_viterbi.cc @@ -21,7 +21,7 @@ */ #include <math.h> -#include <atsc/fake_single_viterbi_impl.h> +#include <gnuradio/atsc/fake_single_viterbi_impl.h> #include <iostream> #include <algorithm> diff --git a/gr-atsc/lib/atsci_fs_checker.cc b/gr-atsc/lib/atsci_fs_checker.cc index e43f88e33d..064edb2f77 100644 --- a/gr-atsc/lib/atsci_fs_checker.cc +++ b/gr-atsc/lib/atsci_fs_checker.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/fs_checker_impl.h> +#include <gnuradio/atsc/fs_checker_impl.h> // empty constructor atsci_fs_checker::atsci_fs_checker () diff --git a/gr-atsc/lib/atsci_fs_checker_naive.cc b/gr-atsc/lib/atsci_fs_checker_naive.cc index 392bf70399..96ec09ad1b 100644 --- a/gr-atsc/lib/atsci_fs_checker_naive.cc +++ b/gr-atsc/lib/atsci_fs_checker_naive.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/fs_checker_naive_impl.h> -#include <atsc/syminfo_impl.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/fs_checker_naive_impl.h> +#include <gnuradio/atsc/syminfo_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> #include <iostream> #include <cstring> diff --git a/gr-atsc/lib/atsci_fs_correlator.cc b/gr-atsc/lib/atsci_fs_correlator.cc index 1dccfc5e21..bc6db0de32 100644 --- a/gr-atsc/lib/atsci_fs_correlator.cc +++ b/gr-atsc/lib/atsci_fs_correlator.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/fs_correlator_impl.h> +#include <gnuradio/atsc/fs_correlator_impl.h> // empty constructor atsci_fs_correlator::atsci_fs_correlator () diff --git a/gr-atsc/lib/atsci_fs_correlator_naive.cc b/gr-atsc/lib/atsci_fs_correlator_naive.cc index 5bddcfa79c..1458dc8527 100644 --- a/gr-atsc/lib/atsci_fs_correlator_naive.cc +++ b/gr-atsc/lib/atsci_fs_correlator_naive.cc @@ -20,9 +20,9 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/fs_correlator_naive_impl.h> -#include <atsc/sync_tag_impl.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/fs_correlator_naive_impl.h> +#include <gnuradio/atsc/sync_tag_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> #include <iostream> #include <cstring> diff --git a/gr-atsc/lib/atsci_pnXXX.cc b/gr-atsc/lib/atsci_pnXXX.cc index 93c9b22950..250d487c71 100644 --- a/gr-atsc/lib/atsci_pnXXX.cc +++ b/gr-atsc/lib/atsci_pnXXX.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> const unsigned char atsc_pn511[511] = { 0,0,0,0, 0,0,0,1, 0,1,1,1, 1,1,1,1, 1,1,0,0, 1,0,1,0, 1,0,1,0, 1,1,1,0, diff --git a/gr-atsc/lib/atsci_randomizer.cc b/gr-atsc/lib/atsci_randomizer.cc index 6deadfecf8..e9427c66ea 100644 --- a/gr-atsc/lib/atsci_randomizer.cc +++ b/gr-atsc/lib/atsci_randomizer.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/randomizer_impl.h> +#include <gnuradio/atsc/randomizer_impl.h> #include <assert.h> unsigned char atsci_randomizer::s_output_map[1 << 14]; diff --git a/gr-atsc/lib/atsci_reed_solomon.cc b/gr-atsc/lib/atsci_reed_solomon.cc index 0d32d04049..49cbed1c78 100644 --- a/gr-atsc/lib/atsci_reed_solomon.cc +++ b/gr-atsc/lib/atsci_reed_solomon.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/reed_solomon_impl.h> #include <assert.h> #include <string.h> diff --git a/gr-atsc/lib/atsci_root_raised_cosine.cc b/gr-atsc/lib/atsci_root_raised_cosine.cc index de25df6339..2a8cf928b9 100644 --- a/gr-atsc/lib/atsci_root_raised_cosine.cc +++ b/gr-atsc/lib/atsci_root_raised_cosine.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/consts.h> -#include <atsc/root_raised_cosine_impl.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/root_raised_cosine_impl.h> #include <gnuradio/filter/firdes.h> vector<float> diff --git a/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc b/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc index 5dd7705541..84f9f22cab 100644 --- a/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc +++ b/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/root_raised_cosine_bandpass_impl.h> +#include <gnuradio/atsc/root_raised_cosine_bandpass_impl.h> #include <iostream> #include <cmath> diff --git a/gr-atsc/lib/atsci_single_viterbi.cc b/gr-atsc/lib/atsci_single_viterbi.cc index f53f16c8e1..0458f80998 100644 --- a/gr-atsc/lib/atsci_single_viterbi.cc +++ b/gr-atsc/lib/atsci_single_viterbi.cc @@ -21,7 +21,7 @@ */ #include <math.h> -#include <atsc/single_viterbi_impl.h> +#include <gnuradio/atsc/single_viterbi_impl.h> #include <iostream> using std::cerr; diff --git a/gr-atsc/lib/atsci_sliding_correlator.cc b/gr-atsc/lib/atsci_sliding_correlator.cc index b79adfb53b..1e0498931d 100644 --- a/gr-atsc/lib/atsci_sliding_correlator.cc +++ b/gr-atsc/lib/atsci_sliding_correlator.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/sliding_correlator_impl.h> -#include <atsc/pnXXX_impl.h> +#include <gnuradio/atsc/sliding_correlator_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> // #define TRY_BACKWARDS diff --git a/gr-atsc/lib/atsci_sssr.cc b/gr-atsc/lib/atsci_sssr.cc index 1a33411570..0906555738 100644 --- a/gr-atsc/lib/atsci_sssr.cc +++ b/gr-atsc/lib/atsci_sssr.cc @@ -20,12 +20,12 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/sssr_impl.h> +#include <gnuradio/atsc/sssr_impl.h> #include <algorithm> #include <cmath> #include <cstdio> #include <assert.h> -#include <atsc/diag_output_impl.h> +#include <gnuradio/atsc/diag_output_impl.h> #include <gnuradio/math.h> #include <stdio.h> #include <boost/math/special_functions/sign.hpp> diff --git a/gr-atsc/lib/atsci_trellis_encoder.cc b/gr-atsc/lib/atsci_trellis_encoder.cc index 4e81c87e32..3037f5e0b4 100644 --- a/gr-atsc/lib/atsci_trellis_encoder.cc +++ b/gr-atsc/lib/atsci_trellis_encoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/trellis_encoder_impl.h> +#include <gnuradio/atsc/trellis_encoder_impl.h> #include <assert.h> #include <stdio.h> #include <string.h> diff --git a/gr-atsc/lib/atsci_viterbi_decoder.cc b/gr-atsc/lib/atsci_viterbi_decoder.cc index 26f5577de5..2179cb5a5c 100644 --- a/gr-atsc/lib/atsci_viterbi_decoder.cc +++ b/gr-atsc/lib/atsci_viterbi_decoder.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/viterbi_decoder.h> +#include <gnuradio/atsc/viterbi_decoder.h> #include <assert.h> #include <stdio.h> #include <cmath> diff --git a/gr-atsc/lib/atsci_vsbtx_lp.cc b/gr-atsc/lib/atsci_vsbtx_lp.cc index 4b6f82af3d..2de5cd7497 100644 --- a/gr-atsc/lib/atsci_vsbtx_lp.cc +++ b/gr-atsc/lib/atsci_vsbtx_lp.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/consts.h> -#include <atsc/vsbtx_lp_impl.h> +#include <gnuradio/atsc/consts.h> +#include <gnuradio/atsc/vsbtx_lp_impl.h> #include <stdexcept> #include <cmath> #include <iostream> diff --git a/gr-atsc/lib/create_atsci_equalizer.cc b/gr-atsc/lib/create_atsci_equalizer.cc index 17874cdd47..2d3b1b1882 100644 --- a/gr-atsc/lib/create_atsci_equalizer.cc +++ b/gr-atsc/lib/create_atsci_equalizer.cc @@ -20,10 +20,10 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/create_atsci_equalizer.h> -#include <atsc/equalizer_nop_impl.h> -#include <atsc/equalizer_lms_impl.h> -#include <atsc/equalizer_lms2_impl.h> +#include <gnuradio/atsc/create_atsci_equalizer.h> +#include <gnuradio/atsc/equalizer_nop_impl.h> +#include <gnuradio/atsc/equalizer_lms_impl.h> +#include <gnuradio/atsc/equalizer_lms2_impl.h> atsci_equalizer * create_atsci_equalizer_nop () diff --git a/gr-atsc/lib/create_atsci_fs_checker.cc b/gr-atsc/lib/create_atsci_fs_checker.cc index 1eea7bcc01..98a904acb7 100644 --- a/gr-atsc/lib/create_atsci_fs_checker.cc +++ b/gr-atsc/lib/create_atsci_fs_checker.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/create_atsci_fs_checker.h> -#include <atsc/fs_checker_naive_impl.h> +#include <gnuradio/atsc/create_atsci_fs_checker.h> +#include <gnuradio/atsc/fs_checker_naive_impl.h> atsci_fs_checker * create_atsci_fs_checker () diff --git a/gr-atsc/lib/create_atsci_fs_correlator.cc b/gr-atsc/lib/create_atsci_fs_correlator.cc index 021d315de9..1dd10e6812 100644 --- a/gr-atsc/lib/create_atsci_fs_correlator.cc +++ b/gr-atsc/lib/create_atsci_fs_correlator.cc @@ -20,8 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/create_atsci_fs_correlator.h> -#include <atsc/fs_correlator_naive_impl.h> +#include <gnuradio/atsc/create_atsci_fs_correlator.h> +#include <gnuradio/atsc/fs_correlator_naive_impl.h> atsci_fs_correlator * create_atsci_fs_correlator () diff --git a/gr-atsc/lib/plinfo.cc b/gr-atsc/lib/plinfo.cc index 8ad28c6001..0a24f7a073 100644 --- a/gr-atsc/lib/plinfo.cc +++ b/gr-atsc/lib/plinfo.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <atsc/types.h> +#include <gnuradio/atsc/types.h> #include <assert.h> void diff --git a/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h b/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h index c1e6e8f8ce..6102d72071 100644 --- a/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h +++ b/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h @@ -25,7 +25,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> class qa_atsci_basic_trellis_encoder : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_atsci_data_interleaver.h b/gr-atsc/lib/qa_atsci_data_interleaver.h index 32c9e79c46..d7b94f8e2b 100644 --- a/gr-atsc/lib/qa_atsci_data_interleaver.h +++ b/gr-atsc/lib/qa_atsci_data_interleaver.h @@ -27,7 +27,7 @@ #include <cppunit/TestCase.h> #include <stdio.h> -#include <atsc/data_interleaver_impl.h> +#include <gnuradio/atsc/data_interleaver_impl.h> class qa_atsci_data_interleaver : public CppUnit::TestCase { public: diff --git a/gr-atsc/lib/qa_atsci_equalizer_nop.cc b/gr-atsc/lib/qa_atsci_equalizer_nop.cc index 927e23fdac..098d745db3 100644 --- a/gr-atsc/lib/qa_atsci_equalizer_nop.cc +++ b/gr-atsc/lib/qa_atsci_equalizer_nop.cc @@ -21,10 +21,10 @@ */ #include "qa_atsci_equalizer_nop.h" -#include <atsc/equalizer_impl.h> -#include <atsc/equalizer_nop_impl.h> -#include <atsc/pnXXX_impl.h> -#include <atsc/types.h> +#include <gnuradio/atsc/equalizer_impl.h> +#include <gnuradio/atsc/equalizer_nop_impl.h> +#include <gnuradio/atsc/pnXXX_impl.h> +#include <gnuradio/atsc/types.h> #include <cppunit/TestAssert.h> #include <assert.h> #include <iostream> diff --git a/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc index 35f81543de..e59bc3880b 100644 --- a/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc +++ b/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc @@ -26,7 +26,7 @@ #include <cppunit/TestAssert.h> #include <stdio.h> -#include <atsc/fake_single_viterbi_impl.h> +#include <gnuradio/atsc/fake_single_viterbi_impl.h> #include "qa_atsci_fake_single_viterbi.h" #include <gnuradio/random.h> #include <string.h> diff --git a/gr-atsc/lib/qa_atsci_fake_single_viterbi.h b/gr-atsc/lib/qa_atsci_fake_single_viterbi.h index 373f4b6c67..42915ac6e8 100644 --- a/gr-atsc/lib/qa_atsci_fake_single_viterbi.h +++ b/gr-atsc/lib/qa_atsci_fake_single_viterbi.h @@ -26,8 +26,8 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/fake_single_viterbi_impl.h> -#include <atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/fake_single_viterbi_impl.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> class qa_atsci_fake_single_viterbi : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/qa_atsci_fs_correlator.cc b/gr-atsc/lib/qa_atsci_fs_correlator.cc index 51865c6a5a..c416c22fbb 100644 --- a/gr-atsc/lib/qa_atsci_fs_correlator.cc +++ b/gr-atsc/lib/qa_atsci_fs_correlator.cc @@ -25,13 +25,13 @@ #endif #include "qa_atsci_fs_correlator.h" -#include <atsc/fs_correlator_impl.h> -#include <atsc/create_atsci_fs_correlator.h> -#include <atsc/sync_tag_impl.h> +#include <gnuradio/atsc/fs_correlator_impl.h> +#include <gnuradio/atsc/create_atsci_fs_correlator.h> +#include <gnuradio/atsc/sync_tag_impl.h> #include <stdlib.h> #include <algorithm> -#include <atsc/pnXXX_impl.h> -#include <atsc/types.h> +#include <gnuradio/atsc/pnXXX_impl.h> +#include <gnuradio/atsc/types.h> #include <cppunit/TestAssert.h> #include <assert.h> #include <gnuradio/random.h> diff --git a/gr-atsc/lib/qa_atsci_randomizer.h b/gr-atsc/lib/qa_atsci_randomizer.h index 0255d8a4ae..e0e293e85c 100644 --- a/gr-atsc/lib/qa_atsci_randomizer.h +++ b/gr-atsc/lib/qa_atsci_randomizer.h @@ -25,7 +25,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/randomizer_impl.h> +#include <gnuradio/atsc/randomizer_impl.h> class qa_atsci_randomizer : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/qa_atsci_reed_solomon.cc b/gr-atsc/lib/qa_atsci_reed_solomon.cc index 50acb76a01..f6c21dd8ce 100644 --- a/gr-atsc/lib/qa_atsci_reed_solomon.cc +++ b/gr-atsc/lib/qa_atsci_reed_solomon.cc @@ -27,7 +27,7 @@ #include <cppunit/TestAssert.h> #include <stdlib.h> #include <stdio.h> -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/reed_solomon_impl.h> #include "qa_atsci_reed_solomon.h" #include <string.h> diff --git a/gr-atsc/lib/qa_atsci_reed_solomon.h b/gr-atsc/lib/qa_atsci_reed_solomon.h index 097d681302..0afcd1398b 100644 --- a/gr-atsc/lib/qa_atsci_reed_solomon.h +++ b/gr-atsc/lib/qa_atsci_reed_solomon.h @@ -26,7 +26,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/reed_solomon_impl.h> +#include <gnuradio/atsc/reed_solomon_impl.h> class qa_atsci_reed_solomon : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_atsci_single_viterbi.cc b/gr-atsc/lib/qa_atsci_single_viterbi.cc index 71b123813b..8291041a55 100644 --- a/gr-atsc/lib/qa_atsci_single_viterbi.cc +++ b/gr-atsc/lib/qa_atsci_single_viterbi.cc @@ -27,7 +27,7 @@ #include <cppunit/TestAssert.h> #include <stdlib.h> #include <stdio.h> -#include <atsc/single_viterbi_impl.h> +#include <gnuradio/atsc/single_viterbi_impl.h> #include "qa_atsci_single_viterbi.h" #include <gnuradio/random.h> #include <string.h> diff --git a/gr-atsc/lib/qa_atsci_single_viterbi.h b/gr-atsc/lib/qa_atsci_single_viterbi.h index bfd911ab08..571988c559 100644 --- a/gr-atsc/lib/qa_atsci_single_viterbi.h +++ b/gr-atsc/lib/qa_atsci_single_viterbi.h @@ -26,8 +26,8 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/single_viterbi_impl.h> -#include <atsc/basic_trellis_encoder_impl.h> +#include <gnuradio/atsc/single_viterbi_impl.h> +#include <gnuradio/atsc/basic_trellis_encoder_impl.h> class qa_atsci_single_viterbi : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/qa_atsci_sliding_correlator.h b/gr-atsc/lib/qa_atsci_sliding_correlator.h index 34f12cbcbc..ea02449711 100644 --- a/gr-atsc/lib/qa_atsci_sliding_correlator.h +++ b/gr-atsc/lib/qa_atsci_sliding_correlator.h @@ -27,7 +27,7 @@ #include <cppunit/TestCase.h> #include <stdio.h> -#include <atsc/sliding_correlator_impl.h> +#include <gnuradio/atsc/sliding_correlator_impl.h> class qa_atsci_sliding_correlator : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_atsci_trellis_encoder.h b/gr-atsc/lib/qa_atsci_trellis_encoder.h index a93c0c3895..16567488c8 100644 --- a/gr-atsc/lib/qa_atsci_trellis_encoder.h +++ b/gr-atsc/lib/qa_atsci_trellis_encoder.h @@ -27,7 +27,7 @@ #include <cppunit/TestCase.h> #include <stdio.h> -#include <atsc/trellis_encoder_impl.h> +#include <gnuradio/atsc/trellis_encoder_impl.h> class qa_atsci_trellis_encoder : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_atsci_viterbi_decoder.h b/gr-atsc/lib/qa_atsci_viterbi_decoder.h index 94b5ce21d2..47b2776af8 100644 --- a/gr-atsc/lib/qa_atsci_viterbi_decoder.h +++ b/gr-atsc/lib/qa_atsci_viterbi_decoder.h @@ -27,7 +27,7 @@ #include <cppunit/TestCase.h> #include <stdio.h> -#include <atsc/viterbi_decoder_impl.h> +#include <gnuradio/atsc/viterbi_decoder_impl.h> class qa_atsci_viterbi_decoder : public CppUnit::TestCase { diff --git a/gr-atsc/lib/qa_convolutional_interleaver.h b/gr-atsc/lib/qa_convolutional_interleaver.h index afe795a547..5fc73dd70c 100644 --- a/gr-atsc/lib/qa_convolutional_interleaver.h +++ b/gr-atsc/lib/qa_convolutional_interleaver.h @@ -26,7 +26,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/convolutional_interleaver.h> +#include <gnuradio/atsc/convolutional_interleaver.h> class qa_convolutional_interleaver : public CppUnit::TestCase { private: diff --git a/gr-atsc/lib/qa_interleaver_fifo.h b/gr-atsc/lib/qa_interleaver_fifo.h index d0651b591f..9fea65a748 100644 --- a/gr-atsc/lib/qa_interleaver_fifo.h +++ b/gr-atsc/lib/qa_interleaver_fifo.h @@ -26,7 +26,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/TestCase.h> -#include <atsc/interleaver_fifo.h> +#include <gnuradio/atsc/interleaver_fifo.h> class qa_interleaver_fifo : public CppUnit::TestCase { private: diff --git a/gr-atsc/swig/CMakeLists.txt b/gr-atsc/swig/CMakeLists.txt index 9fdd7ec764..2eb7047a11 100644 --- a/gr-atsc/swig/CMakeLists.txt +++ b/gr-atsc/swig/CMakeLists.txt @@ -39,7 +39,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/atsc_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/atsc) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/atsc) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-atsc gnuradio-fft) diff --git a/gr-atsc/swig/atsc_swig.i b/gr-atsc/swig/atsc_swig.i index 6ca65a6c69..2c15449251 100644 --- a/gr-atsc/swig/atsc_swig.i +++ b/gr-atsc/swig/atsc_swig.i @@ -26,26 +26,26 @@ %include "atsc_swig_doc.i" %{ -#include <atsc/randomizer.h> -#include <atsc/derandomizer.h> -#include <atsc/rs_encoder.h> -#include <atsc/rs_decoder.h> -#include <atsc/interleaver.h> -#include <atsc/deinterleaver.h> -#include <atsc/trellis_encoder.h> -#include <atsc/viterbi_decoder.h> -#include <atsc/ds_to_softds.h> -#include <atsc/field_sync_mux.h> -#include <atsc/field_sync_demux.h> -#include <atsc/equalizer.h> -#include <atsc/fs_checker.h> -#include <atsc/bit_timing_loop.h> -#include <atsc/fpll.h> -#include <atsc/depad.h> -#include <atsc/pad.h> +#include <gnuradio/atsc/randomizer.h> +#include <gnuradio/atsc/derandomizer.h> +#include <gnuradio/atsc/rs_encoder.h> +#include <gnuradio/atsc/rs_decoder.h> +#include <gnuradio/atsc/interleaver.h> +#include <gnuradio/atsc/deinterleaver.h> +#include <gnuradio/atsc/trellis_encoder.h> +#include <gnuradio/atsc/viterbi_decoder.h> +#include <gnuradio/atsc/ds_to_softds.h> +#include <gnuradio/atsc/field_sync_mux.h> +#include <gnuradio/atsc/field_sync_demux.h> +#include <gnuradio/atsc/equalizer.h> +#include <gnuradio/atsc/fs_checker.h> +#include <gnuradio/atsc/bit_timing_loop.h> +#include <gnuradio/atsc/fpll.h> +#include <gnuradio/atsc/depad.h> +#include <gnuradio/atsc/pad.h> %} -%include "atsc/consts.h" +%include "gnuradio/atsc/consts.h" %constant int sizeof_atsc_mpeg_packet = sizeof(atsc_mpeg_packet); %constant int sizeof_atsc_mpeg_packet_no_sync = sizeof(atsc_mpeg_packet_no_sync); |