summaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/CMakeLists.txt2
-rw-r--r--host/include/uhd/device.hpp6
-rw-r--r--host/include/uhd/device_deprecated.ipp16
-rw-r--r--host/include/uhd/stream.hpp (renamed from host/include/uhd/streamer.hpp)10
-rw-r--r--host/include/uhd/usrp/multi_usrp.hpp8
5 files changed, 21 insertions, 21 deletions
diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt
index 6b277654d..2b0c6ec14 100644
--- a/host/include/uhd/CMakeLists.txt
+++ b/host/include/uhd/CMakeLists.txt
@@ -30,7 +30,7 @@ INSTALL(FILES
exception.hpp
property_tree.ipp
property_tree.hpp
- streamer.hpp
+ stream.hpp
version.hpp
wax.hpp
DESTINATION ${INCLUDE_DIR}/uhd
diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp
index c96139858..89c6332da 100644
--- a/host/include/uhd/device.hpp
+++ b/host/include/uhd/device.hpp
@@ -19,7 +19,7 @@
#define INCLUDED_UHD_DEVICE_HPP
#include <uhd/config.hpp>
-#include <uhd/streamer.hpp>
+#include <uhd/stream.hpp>
#include <uhd/deprecated.hpp>
#include <uhd/types/device_addr.hpp>
#include <boost/utility.hpp>
@@ -77,10 +77,10 @@ public:
static sptr make(const device_addr_t &hint, size_t which = 0);
//! Make a new receive streamer from the streamer arguments
- virtual rx_streamer::sptr get_rx_streamer(const streamer_args &args) = 0;
+ virtual rx_streamer::sptr get_rx_stream(const stream_args_t &args) = 0;
//! Make a new transmit streamer from the streamer arguments
- virtual tx_streamer::sptr get_tx_streamer(const streamer_args &args) = 0;
+ virtual tx_streamer::sptr get_tx_stream(const stream_args_t &args) = 0;
/*!
* Receive and asynchronous message from the device.
diff --git a/host/include/uhd/device_deprecated.ipp b/host/include/uhd/device_deprecated.ipp
index 7afaaca2d..8e61c389f 100644
--- a/host/include/uhd/device_deprecated.ipp
+++ b/host/include/uhd/device_deprecated.ipp
@@ -80,12 +80,12 @@ size_t send(
if (_tx_streamer.get() == NULL or _tx_streamer->get_num_channels() != buffs.size() or _send_tid != io_type.tid){
_send_tid = io_type.tid;
_tx_streamer.reset(); //cleanup possible old one
- streamer_args args;
+ stream_args_t args;
args.cpu_format = (_send_tid == io_type_t::COMPLEX_FLOAT32)? "fc32" : "sc16";
args.otw_format = "sc16";
for (size_t ch = 0; ch < buffs.size(); ch++)
args.channels.push_back(ch); //linear mapping
- _tx_streamer = get_tx_streamer(args);
+ _tx_streamer = get_tx_stream(args);
}
const size_t nsamps = (send_mode == SEND_MODE_ONE_PACKET)?
std::min(nsamps_per_buff, get_max_send_samps_per_packet()) :
@@ -135,12 +135,12 @@ size_t recv(
if (_rx_streamer.get() == NULL or _rx_streamer->get_num_channels() != buffs.size() or _recv_tid != io_type.tid){
_recv_tid = io_type.tid;
_rx_streamer.reset(); //cleanup possible old one
- streamer_args args;
+ stream_args_t args;
args.cpu_format = (_recv_tid == io_type_t::COMPLEX_FLOAT32)? "fc32" : "sc16";
args.otw_format = "sc16";
for (size_t ch = 0; ch < buffs.size(); ch++)
args.channels.push_back(ch); //linear mapping
- _rx_streamer = get_rx_streamer(args);
+ _rx_streamer = get_rx_stream(args);
}
const size_t nsamps = (recv_mode == RECV_MODE_ONE_PACKET)?
std::min(nsamps_per_buff, get_max_recv_samps_per_packet()) :
@@ -154,10 +154,10 @@ size_t recv(
*/
size_t get_max_send_samps_per_packet(void){
if (_tx_streamer.get() == NULL){
- streamer_args args;
+ stream_args_t args;
args.cpu_format = "fc32";
args.otw_format = "sc16";
- _tx_streamer = get_tx_streamer(args);
+ _tx_streamer = get_tx_stream(args);
_send_tid = io_type_t::COMPLEX_FLOAT32;
}
return _tx_streamer->get_max_num_samps();
@@ -169,10 +169,10 @@ size_t get_max_send_samps_per_packet(void){
*/
size_t get_max_recv_samps_per_packet(void){
if (_rx_streamer.get() == NULL){
- streamer_args args;
+ stream_args_t args;
args.cpu_format = "fc32";
args.otw_format = "sc16";
- _rx_streamer = get_rx_streamer(args);
+ _rx_streamer = get_rx_stream(args);
_recv_tid = io_type_t::COMPLEX_FLOAT32;
}
return _rx_streamer->get_max_num_samps();
diff --git a/host/include/uhd/streamer.hpp b/host/include/uhd/stream.hpp
index c9c6fef89..583dfd1e4 100644
--- a/host/include/uhd/streamer.hpp
+++ b/host/include/uhd/stream.hpp
@@ -15,8 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
-#ifndef INCLUDED_UHD_STREAMER_HPP
-#define INCLUDED_UHD_STREAMER_HPP
+#ifndef INCLUDED_UHD_STREAM_HPP
+#define INCLUDED_UHD_STREAM_HPP
#include <uhd/config.hpp>
#include <uhd/types/metadata.hpp>
@@ -35,10 +35,10 @@ namespace uhd{
* Not all combinations of CPU and OTW format have conversion support.
* You may however write and register your own conversion routines.
*/
-struct UHD_API streamer_args{
+struct UHD_API stream_args_t{
//! Convenience constructor for streamer args
- streamer_args(
+ stream_args_t(
const std::string &cpu = "fc32",
const std::string &otw = "sc16"
){
@@ -186,4 +186,4 @@ public:
} //namespace uhd
-#endif /* INCLUDED_UHD_STREAMER_HPP */
+#endif /* INCLUDED_UHD_STREAM_HPP */
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp
index 303af7ef9..72386204f 100644
--- a/host/include/uhd/usrp/multi_usrp.hpp
+++ b/host/include/uhd/usrp/multi_usrp.hpp
@@ -109,13 +109,13 @@ public:
virtual device::sptr get_device(void) = 0;
//! Convenience method to get a RX streamer
- rx_streamer::sptr get_rx_streamer(const streamer_args &args){
- return this->get_device()->get_rx_streamer(args);
+ rx_streamer::sptr get_rx_stream(const stream_args_t &args){
+ return this->get_device()->get_rx_stream(args);
}
//! Convenience method to get a TX streamer
- tx_streamer::sptr get_tx_streamer(const streamer_args &args){
- return this->get_device()->get_tx_streamer(args);
+ tx_streamer::sptr get_tx_stream(const stream_args_t &args){
+ return this->get_device()->get_tx_stream(args);
}
/*******************************************************************
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 06:34:22 +0000