summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Morman <jmorman@perspectalabs.com>2020-11-30 08:40:39 -0500
committermormj <34754695+mormj@users.noreply.github.com>2020-12-17 08:08:38 -0500
commitf040051b37dee57aa36bbb2f67987c1c428ba0d9 (patch)
tree2884d38f467233857cdfcbc79d885d1ac2674029
parentc9ac43f6c17d14cc29b12fbc366e9cecce44ba54 (diff)
gr-uhd/apps: import cleanup of msgq_runner
-rwxr-xr-xgr-uhd/apps/uhd_rx_cfile5
-rwxr-xr-xgr-uhd/apps/uhd_rx_nogui5
2 files changed, 4 insertions, 6 deletions
diff --git a/gr-uhd/apps/uhd_rx_cfile b/gr-uhd/apps/uhd_rx_cfile
index ab66eeef63..2ed83c47f0 100755
--- a/gr-uhd/apps/uhd_rx_cfile
+++ b/gr-uhd/apps/uhd_rx_cfile
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2012,2013,2015 Free Software Foundation, Inc.
+# Copyright 2012,2013,2015,2020 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -23,7 +23,6 @@ from gnuradio import blocks
from gnuradio import uhd
from gnuradio.eng_option import eng_option
from optparse import OptionParser
-import msgq_runner
n2s = eng_notation.num_to_str
COMMAND_DELAY = .2
@@ -194,7 +193,7 @@ class rx_cfile_block(gr.top_block):
if options.show_async_msg:
self.async_msgq = gr.msg_queue(0)
self.async_src = uhd.amsg_source("", self.async_msgq)
- self.async_rcv = msgq_runner.msgq_runner(self.async_msgq, self.async_callback)
+ self.async_rcv = uhd.msgq_runner(self.async_msgq, self.async_callback)
def async_callback(self, msg):
md = self.async_src.msg_to_async_metadata_t(msg)
diff --git a/gr-uhd/apps/uhd_rx_nogui b/gr-uhd/apps/uhd_rx_nogui
index 217e076583..06bce7ea7f 100755
--- a/gr-uhd/apps/uhd_rx_nogui
+++ b/gr-uhd/apps/uhd_rx_nogui
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2006,2007,2011,2012,2019 Free Software Foundation, Inc.
+# Copyright 2006,2007,2011,2012,2019,2020 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -56,7 +56,6 @@ from gnuradio import filter
from gnuradio import analog
from gnuradio import eng_notation, eng_arg
from gnuradio.eng_option import eng_option
-import msgq_runner
# (device_rate, channel_rate, audio_rate, channel_pass, channel_stop, demod)
@@ -192,7 +191,7 @@ class app_top_block(gr.top_block):
if self.options.show_async_msg:
self.async_msgq = gr.msg_queue(0)
self.async_src = uhd.amsg_source("", self.async_msgq)
- self.async_rcv = msgq_runner.msgq_runner(self.async_msgq, self.async_callback)
+ self.async_rcv = uhd.msgq_runner(self.async_msgq, self.async_callback)
def async_callback(self, msg):
""" Callback for processing async messages """