summaryrefslogtreecommitdiffstats
path: root/src/OutputUHD.h
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-05-05 11:43:03 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-05-05 11:43:03 +0200
commit2269cc5ed6c4032c017684018a9ee1da234a6123 (patch)
tree802b6398d9e2488f5e6ba26de6329b4c1223fceb /src/OutputUHD.h
parentca8ff2b57c4bccfaba4be0d7cee089a3022ea4b6 (diff)
parentbfce4874a0410f8f6521875d7e975f80d05544d4 (diff)
downloaddabmod-2269cc5ed6c4032c017684018a9ee1da234a6123.tar.gz
dabmod-2269cc5ed6c4032c017684018a9ee1da234a6123.tar.bz2
dabmod-2269cc5ed6c4032c017684018a9ee1da234a6123.zip
Merge branch 'next' into next_memless
Diffstat (limited to 'src/OutputUHD.h')
-rw-r--r--src/OutputUHD.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/OutputUHD.h b/src/OutputUHD.h
index cbf159f..d42245f 100644
--- a/src/OutputUHD.h
+++ b/src/OutputUHD.h
@@ -125,6 +125,8 @@ class UHDWorker {
void start(struct UHDWorkerData *uhdworkerdata) {
uwd->running = true;
uhd_thread = boost::thread(&UHDWorker::process_errhandler, this);
+ async_rx_thread = boost::thread(
+ &UHDWorker::print_async_metadata, this);
}
void stop() {
@@ -133,6 +135,7 @@ class UHDWorker {
}
uhd_thread.interrupt();
uhd_thread.join();
+ async_rx_thread.join();
}
~UHDWorker() {
@@ -155,13 +158,14 @@ class UHDWorker {
// Used to print statistics once a second
std::chrono::steady_clock::time_point last_print_time;
- void print_async_metadata(const struct UHDWorkerFrameData *frame);
+ void print_async_metadata(void);
void handle_frame(const struct UHDWorkerFrameData *frame);
void tx_frame(const struct UHDWorkerFrameData *frame, bool ts_update);
struct UHDWorkerData *uwd;
boost::thread uhd_thread;
+ boost::thread async_rx_thread;
uhd::tx_streamer::sptr myTxStream;