diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-11 23:17:18 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-11 23:17:18 -0500 |
| commit | 364404cdd1ddf6e9b8c128490f76bc95a384facd (patch) | |
| tree | 0b90d876d30a808b9b7c21c2800120d4ee484c71 | |
| parent | a64df4e322933006f954c72bccbe53f6ce1a2381 (diff) | |
audio: wip: fixing gr-fcd to build with new audio naming.
| -rw-r--r-- | gr-fcd/examples/c++/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-fcd/examples/c++/fcd_nfm_rx.cc | 2 | ||||
| -rw-r--r-- | gr-fcd/lib/fcd_source_c_impl.cc | 2 | ||||
| -rw-r--r-- | gr-fcd/lib/fcd_source_c_impl.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/gr-fcd/examples/c++/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt index cfba1e23ca..977e9e4e68 100644 --- a/gr-fcd/examples/c++/CMakeLists.txt +++ b/gr-fcd/examples/c++/CMakeLists.txt @@ -28,7 +28,8 @@ include_directories( ) add_executable(fcd_nfm_rx fcd_nfm_rx.cc) -target_link_libraries(fcd_nfm_rx gnuradio-fcd gnuradio-filter gnuradio-analog) +target_link_libraries(fcd_nfm_rx + gnuradio-fcd gnuradio-filter gnuradio-analog gnuradio-audio) INSTALL(TARGETS fcd_nfm_rx diff --git a/gr-fcd/examples/c++/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc index 5f969b908b..4f129add19 100644 --- a/gr-fcd/examples/c++/fcd_nfm_rx.cc +++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc @@ -94,7 +94,7 @@ int main(int argc, char **argv) analog::quadrature_demod_cf::make(rate/(2.0*pi*5000.0)); // Audio sink - audio_sink::sptr sink = audio_make_sink(rate); + audio::sink::sptr sink = audio::sink::make(rate); // Connect blocks tb->connect(fcd, 0, filter, 0); diff --git a/gr-fcd/lib/fcd_source_c_impl.cc b/gr-fcd/lib/fcd_source_c_impl.cc index 9d66e8bb4f..350ba9e544 100644 --- a/gr-fcd/lib/fcd_source_c_impl.cc +++ b/gr-fcd/lib/fcd_source_c_impl.cc @@ -56,7 +56,7 @@ fcd_source_c_impl::fcd_source_c_impl(const std::string device_name) gr::blocks::float_to_complex::sptr f2c; /* Audio source; sample rate fixed at 96kHz */ - fcd = audio_make_source(96000, device_name, true); + fcd = gr::audio::source::make(96000, device_name, true); /* block to convert stereo audio to a complex stream */ f2c = gr::blocks::float_to_complex::make(1); diff --git a/gr-fcd/lib/fcd_source_c_impl.h b/gr-fcd/lib/fcd_source_c_impl.h index 378bc4ee2e..56afe2e614 100644 --- a/gr-fcd/lib/fcd_source_c_impl.h +++ b/gr-fcd/lib/fcd_source_c_impl.h @@ -42,7 +42,7 @@ private: friend FCD_API fcd_source_c_sptr fcd_make_source_c(const std::string device_name); - audio_source::sptr fcd; /*!< The audio input source */ + gr::audio::source::sptr fcd; /*!< The audio input source */ int d_freq_corr; /*!< The frequency correction in ppm */ int d_freq_req; /*!< The latest requested frequency in Hz */ }; |