summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2015-05-06 12:30:06 -0400
committerTom Rondeau <tom@trondeau.com>2015-05-06 12:30:06 -0400
commit8be6b663e6bc4893ce03905ad4d41ab85aabb0e2 (patch)
treee23565996add77bc203da011c693d8f0c660fd6e
parent39b8c223887ccd9c33695a916b416e9442fcbb93 (diff)
parentaf939aaee4da102f5fa5500c7bda1ca52d67e335 (diff)
Merge remote-tracking branch 'mbant/uhd/cids-59-67-master'
-rw-r--r--gr-uhd/lib/usrp_sink_impl.cc2
-rw-r--r--gr-uhd/lib/usrp_source_impl.cc6
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()