From 55d3e4a47958be287648a2021f7e92d81086b2d9 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 21 Dec 2012 15:11:39 -0500
Subject: blocks: removes blocks moved to gr-blocks from gnuradio-core.
Also fixes up some other missing moves.
---
gr-fcd/lib/CMakeLists.txt | 2 ++
gr-fcd/lib/fcd_source_c_impl.cc | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
(limited to 'gr-fcd/lib')
diff --git a/gr-fcd/lib/CMakeLists.txt b/gr-fcd/lib/CMakeLists.txt
index 9a5605d99..dd0778dee 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 81ccee092..9d66e8bb4 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);
--
cgit v1.2.3