Merged features/mp-sched -r8915:9335 into the trunk. The trunk now

[debian/gnuradio] / gr-pager / src / usrp_flex_all.py

diff --git a/gr-pager/src/usrp_flex_all.py b/gr-pager/src/usrp_flex_all.py
index daee3532cd59d7a21fdf85ac6a7c0ba5643f4d88..b37c6a5dae69060bd3b4d017205ef7837891105c 100755 (executable)
--- a/gr-pager/src/usrp_flex_all.py
+++ b/gr-pager/src/usrp_flex_all.py
@@ -77,25 +77,22 @@ def main():
     queue = gr.msg_queue()
     tb = app_top_block(options, queue)
 
+    runner = pager.top_block_runner(tb)
     try:
-        tb.start()
        while 1:
            if not queue.empty_p():
                msg = queue.delete_head() # Blocking read
                page = join(split(msg.to_string(), chr(128)), '|')
-               disp = []
-               for n in range(len(page)):
-                   if ord(page[n]) < 32:
-                       disp.append('.')
-                   else:
-                       disp.append(page[n])
-               print join(disp, '')
-                                               
+                s = pager.make_printable(page)
+                print s
+            elif runner.done:
+                break
            else:
-               time.sleep(1)
+               time.sleep(0.05)
 
     except KeyboardInterrupt:
         tb.stop()
+        runner = None
     
 if __name__ == "__main__":
     main()