diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-29 20:26:35 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-29 20:26:35 -0500 |
| commit | 0fb538e11e8425c4f15063e249dc0dae2d54ebd5 (patch) | |
| tree | d4d4964feb7771c01b75a33be9d209389a8b4fc9 /gr-fcd/lib | |
| parent | 4580aaf9583b1e8ca4b3ef1d3127c7d48566fe67 (diff) | |
| parent | c805168975a30af962fbd0a25c091d7b2113394e (diff) | |
Merge branch 'next_blocks' into next
Conflicts:
gr-trellis/CMakeLists.txt
gr-trellis/python/CMakeLists.txt
Diffstat (limited to 'gr-fcd/lib')
| -rw-r--r-- | gr-fcd/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-fcd/lib/fcd_source_c_impl.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gr-fcd/lib/CMakeLists.txt b/gr-fcd/lib/CMakeLists.txt index 9a5605d99c..dd0778deef 100644 --- a/gr-fcd/lib/CMakeLists.txt +++ b/gr-fcd/lib/CMakeLists.txt @@ -26,6 +26,7 @@ GR_INCLUDE_SUBDIRECTORY(fcd) include_directories( ${GNURADIO_CORE_INCLUDE_DIRS} ${GR_FCD_INCLUDE_DIRS} + ${GR_BLOCKS_INCLUDE_DIRS} ${GR_AUDIO_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/hid ${CMAKE_CURRENT_SOURCE_DIR}/fcd @@ -44,6 +45,7 @@ list(APPEND gr_fcd_sources list(APPEND fcd_libs gnuradio-core + gnuradio-blocks gnuradio-audio ${Boost_LIBRARIES} ) diff --git a/gr-fcd/lib/fcd_source_c_impl.cc b/gr-fcd/lib/fcd_source_c_impl.cc index 81ccee092d..9d66e8bb4f 100644 --- a/gr-fcd/lib/fcd_source_c_impl.cc +++ b/gr-fcd/lib/fcd_source_c_impl.cc @@ -26,7 +26,7 @@ #include <fcd.h> #include <fcdhidcmd.h> // needed for extended API #include <gr_io_signature.h> -#include <gr_float_to_complex.h> +#include <blocks/float_to_complex.h> #include <gruel/attributes.h> //#include <iostream> @@ -53,13 +53,13 @@ fcd_source_c_impl::fcd_source_c_impl(const std::string device_name) d_freq_corr(-120), d_freq_req(0) { - gr_float_to_complex_sptr f2c; + gr::blocks::float_to_complex::sptr f2c; /* Audio source; sample rate fixed at 96kHz */ fcd = audio_make_source(96000, device_name, true); /* block to convert stereo audio to a complex stream */ - f2c = gr_make_float_to_complex(1); + f2c = gr::blocks::float_to_complex::make(1); connect(fcd, 0, f2c, 0); connect(fcd, 1, f2c, 1); |