summaryrefslogtreecommitdiff
path: root/gr-uhd/lib/gr_uhd_usrp_source.cc
diff options
context:
space:
mode:
authorJosh Blum2013-05-20 10:44:23 -0700
committerJosh Blum2013-06-25 14:13:57 -0700
commitb5319db68383c1e502badc1f3d9af6e63ef79871 (patch)
tree36b66fbf026114ea84051f1502807ddff8b107c3 /gr-uhd/lib/gr_uhd_usrp_source.cc
parentdc76615c93acd3e1b1f8c72f76afa8a241385444 (diff)
downloadgnuradio-b5319db68383c1e502badc1f3d9af6e63ef79871.tar.gz
gnuradio-b5319db68383c1e502badc1f3d9af6e63ef79871.tar.bz2
gnuradio-b5319db68383c1e502badc1f3d9af6e63ef79871.zip
uhd: default num channels when empty
Diffstat (limited to 'gr-uhd/lib/gr_uhd_usrp_source.cc')
-rw-r--r--gr-uhd/lib/gr_uhd_usrp_source.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index 1d5a65f76..126023d1a 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -60,7 +60,7 @@ public:
args_to_io_sig(stream_args)
),
_stream_args(stream_args),
- _nchan(std::max<size_t>(1, stream_args.channels.size())),
+ _nchan(stream_args.channels.size()),
_stream_now(_nchan == 1),
_tag_now(false),
_start_time_set(false)
@@ -593,6 +593,6 @@ boost::shared_ptr<uhd_usrp_source> uhd_make_usrp_source(
){
gr_uhd_check_abi();
return boost::shared_ptr<uhd_usrp_source>(
- new uhd_usrp_source_impl(device_addr, stream_args)
+ new uhd_usrp_source_impl(device_addr, stream_args_ensure(stream_args))
);
}