move msgq_runner out of runtime into gr-uhd/apps, its single consumer

Signed-off-by: Marcus Müller <mmueller@gnuradio.org>

7 files changed, 9 insertions, 8 deletions

diff --git a/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt
index a122da093..123cf8c34 100644
--- a/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt
+++ b/gnuradio-runtime/python/gnuradio/gru/CMakeLists.txt
@@ -9,6 +9,5 @@ include(GrPython)
 
 GR_PYTHON_INSTALL(FILES
     __init__.py
-    msgq_runner.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/gru
 )
diff --git a/gnuradio-runtime/python/gnuradio/gru/__init__.py b/gnuradio-runtime/python/gnuradio/gru/__init__.py
index 8443f1a4f..0857b0302 100644
--- a/gnuradio-runtime/python/gnuradio/gru/__init__.py
+++ b/gnuradio-runtime/python/gnuradio/gru/__init__.py
@@ -1,4 +1,3 @@
 # make this a package
 
 # Import gru stuff
-from .msgq_runner import *
diff --git a/gr-uhd/apps/CMakeLists.txt b/gr-uhd/apps/CMakeLists.txt
index 3aca2d833..85036b540 100644
--- a/gr-uhd/apps/CMakeLists.txt
+++ b/gr-uhd/apps/CMakeLists.txt
@@ -14,6 +14,7 @@ GR_PYTHON_INSTALL(
     FILES
     uhd_siggen_base.py
     uhd_app.py
+    msgq_runner.py
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/uhd
 )
 
diff --git a/gnuradio-runtime/python/gnuradio/gru/msgq_runner.py b/gr-uhd/apps/msgq_runner.py
index 31bebcf0d..31bebcf0d 100644
--- a/gnuradio-runtime/python/gnuradio/gru/msgq_runner.py
+++ b/gr-uhd/apps/msgq_runner.py
diff --git a/gr-uhd/apps/uhd_app.py b/gr-uhd/apps/uhd_app.py
index d878a063c..230e4b54d 100644
--- a/gr-uhd/apps/uhd_app.py
+++ b/gr-uhd/apps/uhd_app.py
@@ -17,7 +17,7 @@ import argparse
 from gnuradio import eng_arg
 from gnuradio import uhd
 from gnuradio import gr
-from gnuradio import gru
+import msgq_runner
 
 COMMAND_DELAY = .2 # Seconds
 
@@ -269,7 +269,7 @@ class UHDApp:
         if args.show_async_msg:
             self.async_msgq = gr.msg_queue(0)
             self.async_src = uhd.amsg_source("", self.async_msgq)
-            self.async_rcv = gru.msgq_runner(self.async_msgq, self.async_callback)
+            self.async_rcv = msgq_runner.msgq_runner(self.async_msgq, self.async_callback)
 
     def set_gain(self, gain):
         """
diff --git a/gr-uhd/apps/uhd_rx_cfile b/gr-uhd/apps/uhd_rx_cfile
index d8b4d8155..ab66eeef6 100755
--- a/gr-uhd/apps/uhd_rx_cfile
+++ b/gr-uhd/apps/uhd_rx_cfile
@@ -18,11 +18,12 @@ import sys
 import os
 import pmt
 import time
-from gnuradio import gr, gru, eng_notation
+from gnuradio import gr, eng_notation
 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
@@ -193,7 +194,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 = gru.msgq_runner(self.async_msgq, self.async_callback)
+            self.async_rcv = msgq_runner.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 f477898fb..217e07658 100755
--- a/gr-uhd/apps/uhd_rx_nogui
+++ b/gr-uhd/apps/uhd_rx_nogui
@@ -51,11 +51,12 @@ blocks.
 import math
 import sys
 from argparse import ArgumentParser
-from gnuradio import gr, gru, uhd, audio
+from gnuradio import gr, uhd, audio
 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)
@@ -191,7 +192,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 = gru.msgq_runner(self.async_msgq, self.async_callback)
+            self.async_rcv = msgq_runner.msgq_runner(self.async_msgq, self.async_callback)
 
     def async_callback(self, msg):
         """ Callback for processing async messages """