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

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

diff --git a/gr-pager/src/usrp_flex.py b/gr-pager/src/usrp_flex.py
index f636030e9aae5959c4b76c94605ea576070b5a12..6e09b3df6ba922af8f997f6257bfee7471136dc4 100755 (executable)
--- a/gr-pager/src/usrp_flex.py
+++ b/gr-pager/src/usrp_flex.py
@@ -160,27 +160,24 @@ def main():
     # Flow graph emits pages into message queue
     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
                tb.adjust_freq()
-                                                                               
+            elif runner.done:
+                break
            else:
                time.sleep(1)
 
     except KeyboardInterrupt:
         tb.stop()
+        runner = None
 
 if __name__ == "__main__":
     main()