diff options
Diffstat (limited to 'gr-atsc/src')
| -rw-r--r-- | gr-atsc/src/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsc_fpll.h | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt index 386a8792db..6fc588b8a3 100644 --- a/gr-atsc/src/lib/CMakeLists.txt +++ b/gr-atsc/src/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011-212 Free Software Foundation, Inc. +# Copyright 2011-2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,6 +23,7 @@ include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} + ${GR_ANALOG_INCLUDE_DIRS} ${GR_ATSC_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ) @@ -97,6 +98,7 @@ list(APPEND gr_atsc_sources list(APPEND atsc_libs gnuradio-filter + gnuradio-analog gnuradio-core ${Boost_LIBRARIES} ) diff --git a/gr-atsc/src/lib/atsc_fpll.h b/gr-atsc/src/lib/atsc_fpll.h index 0474b8f766..13099b045d 100644 --- a/gr-atsc/src/lib/atsc_fpll.h +++ b/gr-atsc/src/lib/atsc_fpll.h @@ -25,11 +25,13 @@ #include <atsc_api.h> #include <gr_sync_block.h> #include <gr_nco.h> -#include <gr_single_pole_iir.h> -#include <gri_agc_ff.h> +#include <filter/single_pole_iir.h> +#include <analog/agc.h> #include <stdio.h> #include <atsci_diag_output.h> +using namespace gr; + class atsc_fpll; typedef boost::shared_ptr<atsc_fpll> atsc_fpll_sptr; @@ -68,9 +70,9 @@ public: double initial_phase; bool debug_no_update; gr_nco<float,float> nco; - gri_agc_ff agc; // automatic gain control - gr_single_pole_iir<float,float,float> afci; - gr_single_pole_iir<float,float,float> afcq; + analog::kernel::agc_ff agc; // automatic gain control + filter::single_pole_iir<float,float,float> afci; + filter::single_pole_iir<float,float,float> afcq; }; |