diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-11-17 21:20:55 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-11-17 21:21:08 +0100 |
| commit | 7f25c0120fc7bc6a6eeee87878cf387647d51614 (patch) | |
| tree | ab510060a2c5625d00e7f19f4c7d699861b98cea /gr-uhd/lib/usrp_source_impl.h | |
| parent | e1acf2d27760d606cc7cba200aa380e885f2ffaf (diff) | |
| parent | 1d50d70f0b990b909357a803881955623dea94d8 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-uhd/lib/usrp_source_impl.h')
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h index f6225a7e35..c1566e18d0 100644 --- a/gr-uhd/lib/usrp_source_impl.h +++ b/gr-uhd/lib/usrp_source_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2013 Free Software Foundation, Inc. + * Copyright 2010-2016 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -36,15 +36,7 @@ namespace gr { args_to_io_sig(const ::uhd::stream_args_t &args) { const size_t nchan = std::max<size_t>(args.channels.size(), 1); -#ifdef GR_UHD_USE_STREAM_API const size_t size = ::uhd::convert::get_bytes_per_item(args.cpu_format); -#else - size_t size = 0; - if(args.cpu_format == "fc32") - size = 8; - if(args.cpu_format == "sc16") - size = 4; -#endif return io_signature::make(nchan, nchan, size); } @@ -123,10 +115,9 @@ namespace gr { ::uhd::tune_result_t _set_center_freq_from_internals(size_t chan); void _cmd_handler_tag(const pmt::pmt_t &tag); -#ifdef GR_UHD_USE_STREAM_API ::uhd::rx_streamer::sptr _rx_stream; size_t _samps_per_packet; -#endif + double _recv_timeout; bool _tag_now; ::uhd::rx_metadata_t _metadata; pmt::pmt_t _id; |