diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-26 11:46:08 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-26 11:46:08 -0700 |
| commit | f86c25317b457b280c697fc47905c79bdbbc0c93 (patch) | |
| tree | c645e1743619672d828e0196f3d334381cb082d6 | |
| parent | 1e2f457ee118f55d753a4c124315ab17f8eb5f1b (diff) | |
| download | uhd-f86c25317b457b280c697fc47905c79bdbbc0c93.tar.gz uhd-f86c25317b457b280c697fc47905c79bdbbc0c93.tar.bz2 uhd-f86c25317b457b280c697fc47905c79bdbbc0c93.zip | |
uhd: removed remaining template stuff from vrt packet handler, also tweaked format in rx timed samples
| -rw-r--r-- | host/examples/rx_timed_samples.cpp | 7 | ||||
| -rw-r--r-- | host/lib/transport/vrt_packet_handler.hpp | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp index 3b9acbb2c..4856f6779 100644 --- a/host/examples/rx_timed_samples.cpp +++ b/host/examples/rx_timed_samples.cpp @@ -74,8 +74,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //setup streaming std::cout << std::endl; - std::cout << boost::format("Begin streaming %u samples, %d seconds in the future...") - % total_num_samps % seconds_in_future << std::endl; + std::cout << boost::format( + "Begin streaming %u samples, %d seconds in the future..." + ) % total_num_samps % seconds_in_future << std::endl; uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); stream_cmd.num_samps = total_num_samps; stream_cmd.stream_now = false; @@ -102,7 +103,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ if (num_acc_samps == 0) continue; std::cout << boost::format( "Got timeout before all samples received, possible packet loss, exiting loop..." - ) % md.error_code << std::endl; + ) << std::endl; goto done_loop; default: diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp index 07ad9115c..cf9d649dd 100644 --- a/host/lib/transport/vrt_packet_handler.hpp +++ b/host/lib/transport/vrt_packet_handler.hpp @@ -286,7 +286,6 @@ namespace vrt_packet_handler{ * Pack a vrt header, copy-convert the data, and send it. * - helper function for vrt_packet_handler::send ******************************************************************/ - template<typename vrt_packer_type> static UHD_INLINE void _send1( send_state &state, const std::vector<const void *> &buffs, @@ -295,7 +294,7 @@ namespace vrt_packet_handler{ uhd::transport::vrt::if_packet_info_t &if_packet_info, const uhd::io_type_t &io_type, const uhd::otw_type_t &otw_type, - vrt_packer_type vrt_packer, + const vrt_packer_t &vrt_packer, const get_send_buffs_t &get_send_buffs, size_t vrt_header_offset_words32 ){ |