diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-02-04 13:51:02 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-02-04 13:51:02 -0800 |
| commit | bb2021f087700463151ad27427d17b7df8ff1294 (patch) | |
| tree | db1523157092921e95f35f4b2850bd3548faae71 /gr-uhd/lib/usrp_source_impl.cc | |
| parent | 8de3c4ce4be79dd7dba4d7ec1371cd010328fec1 (diff) | |
| parent | 42c1d6d339139eac1001bbc180907569da5e1702 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib/usrp_source_impl.cc')
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index b36e71befe..62ef2f56c7 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2013 Free Software Foundation, Inc. + * Copyright 2010-2015 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -522,6 +522,17 @@ namespace gr { } void + usrp_source_impl::set_stream_args(const ::uhd::stream_args_t &stream_args) + { + _update_stream_args(stream_args); +#ifdef GR_UHD_USE_STREAM_API + _rx_stream.reset(); +#else + throw std::runtime_error("not implemented in this version"); +#endif + } + + void usrp_source_impl::set_start_time(const ::uhd::time_spec_t &time) { _start_time = time; |