diff options
author | Martin Braun <martin.braun@ettus.com> | 2015-05-04 17:18:07 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2015-05-04 17:41:35 -0700 |
commit | af939aaee4da102f5fa5500c7bda1ca52d67e335 (patch) | |
tree | f741dd44d3faf63412832acf1d9f7a77954692ae | |
parent | 06a7a77efc49fdc9b301e84f9e34c454f5ddbadf (diff) |
uhd: Fixes for CID 1296559 and 1090067 and more
Also removed spurious code that should have gone out in the previous
refactoring.
-rw-r--r-- | gr-uhd/lib/usrp_sink_impl.cc | 2 | ||||
-rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc index 513dfafad7..98d54866fe 100644 --- a/gr-uhd/lib/usrp_sink_impl.cc +++ b/gr-uhd/lib/usrp_sink_impl.cc @@ -71,7 +71,7 @@ namespace gr { _length_tag_key(length_tag_name.empty() ? pmt::PMT_NIL : pmt::string_to_symbol(length_tag_name)), _nitems_to_send(0) { - // nop + _sample_rate = get_samp_rate(); } usrp_sink_impl::~usrp_sink_impl() diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index 4265535a19..d2d12c2eb1 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -71,6 +71,12 @@ namespace gr { std::stringstream str; str << name() << unique_id(); _id = pmt::string_to_symbol(str.str()); + + _samp_rate = this->get_samp_rate(); + _center_freq = this->get_center_freq(0); +#ifdef GR_UHD_USE_STREAM_API + _samps_per_packet = 1; +#endif } usrp_source_impl::~usrp_source_impl() |