diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-10 22:09:44 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-10 22:09:44 -0800 |
| commit | ea539a77938c81bb046a6d83f3cf3f40eaa33c49 (patch) | |
| tree | 82693131e1a69c46d41da689fc29d3802ab6e0a2 | |
| parent | fd380cb2e0bfa999ecc053ab32916c7380e70ebb (diff) | |
channels: switch to using gr-blocks
| -rw-r--r-- | gr-channels/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-channels/lib/channel_model_impl.cc | 4 | ||||
| -rw-r--r-- | gr-channels/lib/channel_model_impl.h | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt index 679586707f..ec3a8b3572 100644 --- a/gr-channels/lib/CMakeLists.txt +++ b/gr-channels/lib/CMakeLists.txt @@ -24,6 +24,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${GNURADIO_CORE_INCLUDE_DIRS} + ${GR_BLOCKS_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} ${GR_ANALOG_INCLUDE_DIRS} ${GR_CHANNELS_INCLUDE_DIRS} @@ -44,6 +45,7 @@ list(APPEND channels_libs gnuradio-core gnuradio-filter gnuradio-analog + gnuradio-blocks ${Boost_LIBRARIES} ) @@ -52,4 +54,4 @@ target_link_libraries(gnuradio-channels ${channels_libs}) GR_LIBRARY_FOO(gnuradio-channels RUNTIME_COMPONENT "channels_runtime" DEVEL_COMPONENT "channels_devel") add_dependencies(gnuradio-channels channels_generated_includes channels_generated_swigs - gnuradio-core gnuradio-filter gnuradio-analog) + gnuradio-core gnuradio-filter gnuradio-analog gnuradio-blocks) diff --git a/gr-channels/lib/channel_model_impl.cc b/gr-channels/lib/channel_model_impl.cc index 5b5586c1bd..a9ed06eb53 100644 --- a/gr-channels/lib/channel_model_impl.cc +++ b/gr-channels/lib/channel_model_impl.cc @@ -61,12 +61,12 @@ namespace gr { d_multipath = filter::fir_filter_ccc::make(1, d_taps); - d_noise_adder = gr_make_add_cc(); + d_noise_adder = blocks::add_cc::make(); d_noise = analog::noise_source_c::make(analog::GR_GAUSSIAN, noise_voltage, noise_seed); d_freq_offset = analog::sig_source_c::make(1, analog::GR_SIN_WAVE, frequency_offset, 1.0, 0.0); - d_mixer_offset = gr_make_multiply_cc(); + d_mixer_offset = blocks::multiply_cc::make(); connect(self(), 0, d_timing_offset, 0); connect(d_timing_offset, 0, d_multipath, 0); diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h index 9c36f6369e..03408dad64 100644 --- a/gr-channels/lib/channel_model_impl.h +++ b/gr-channels/lib/channel_model_impl.h @@ -24,8 +24,8 @@ #define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H #include <gr_top_block.h> -#include <gr_add_cc.h> -#include <gr_multiply_cc.h> +#include <blocks/add_cc.h> +#include <blocks/multiply_cc.h> #include <analog/sig_source_c.h> #include <analog/noise_source_c.h> #include <channels/channel_model.h> @@ -38,8 +38,8 @@ namespace gr { class CHANNELS_API channel_model_impl : public channel_model { private: - gr_add_cc_sptr d_noise_adder; - gr_multiply_cc_sptr d_mixer_offset; + blocks::add_cc::sptr d_noise_adder; + blocks::multiply_cc::sptr d_mixer_offset; analog::sig_source_c::sptr d_freq_offset; analog::noise_source_c::sptr d_noise; |