aboutsummaryrefslogtreecommitdiffstats
path: root/host/examples/rx_multi_samples.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-10-05 11:59:27 -0700
committerJosh Blum <josh@joshknows.com>2011-11-03 20:37:10 -0700
commita629bbe7e3c39a10bdc3a981f6badb85a436b443 (patch)
tree58036a96d8fa045ce8900821b073f9f5a441f683 /host/examples/rx_multi_samples.cpp
parente89b20da1511f02d887435d093d8efef3e4df261 (diff)
downloaduhd-a629bbe7e3c39a10bdc3a981f6badb85a436b443.tar.gz
uhd-a629bbe7e3c39a10bdc3a981f6badb85a436b443.tar.bz2
uhd-a629bbe7e3c39a10bdc3a981f6badb85a436b443.zip
uhd: updated examples to use new streamer interface
Diffstat (limited to 'host/examples/rx_multi_samples.cpp')
-rw-r--r--host/examples/rx_multi_samples.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/host/examples/rx_multi_samples.cpp b/host/examples/rx_multi_samples.cpp
index 8f6d7c939..56aed60af 100644
--- a/host/examples/rx_multi_samples.cpp
+++ b/host/examples/rx_multi_samples.cpp
@@ -111,6 +111,13 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
boost::this_thread::sleep(boost::posix_time::milliseconds(100));
}
+ //create a receive streamer
+ //linearly map channels (index0 = channel0, index1 = channel1, ...)
+ uhd::streamer_args stream_args("fc32"); //complex floats
+ for (size_t chan = 0; chan < usrp->get_rx_num_channels(); chan++)
+ stream_args.channels.push_back(chan); //linear mapping
+ uhd::rx_streamer::sptr rx_stream = usrp->get_rx_streamer(stream_args);
+
//setup streaming
std::cout << std::endl;
std::cout << boost::format(
@@ -126,7 +133,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
uhd::rx_metadata_t md;
//allocate buffers to receive with samples (one buffer per channel)
- size_t samps_per_buff = usrp->get_device()->get_max_recv_samps_per_packet();
+ const size_t samps_per_buff = rx_stream->get_max_num_samps();
std::vector<std::vector<std::complex<float> > > buffs(
usrp->get_rx_num_channels(), std::vector<std::complex<float> >(samps_per_buff)
);
@@ -141,10 +148,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
size_t num_acc_samps = 0; //number of accumulated samples
while(num_acc_samps < total_num_samps){
//receive a single packet
- size_t num_rx_samps = usrp->get_device()->recv(
- buff_ptrs, samps_per_buff, md,
- uhd::io_type_t::COMPLEX_FLOAT32,
- uhd::device::RECV_MODE_ONE_PACKET, timeout
+ size_t num_rx_samps = rx_stream->recv(
+ buff_ptrs, samps_per_buff, md, timeout
);
//use a small timeout for subsequent packets