Merged r6171:6186 from jcorgan/fg into trunk.

Changes hierarchical flow graph API to use gr.top_block instead
of gr.runtime.

See discuss-gnuradio mailing list for explanation of changes.

GRC has not been updated to use the changed API.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6187 221aa14e-8319-0410-a670-987f0aec2ac5

2 files changed, 2 insertions, 7 deletions

diff --git a/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py b/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
index 54c612f62..6b85281ad 100755
--- a/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
+++ b/gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py
@@ -85,10 +85,9 @@ def main():
         sys.exit(1)
 
     top_block = usrp_sounder_rx(options)
-    runtime = gr.runtime(top_block)
 
     try:
-        runtime.run()
+        top_block.run()
     except KeyboardInterrupt:
         pass
 
diff --git a/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py b/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
index e7fc3f60b..ae531d510 100755
--- a/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
+++ b/gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py
@@ -99,13 +99,9 @@ def main():
 				    options.verbose, options.degree, options.chip_rate,
 				    options.amplitude)
 			      
-	# Create an instance of a runtime, passing it the top block
-	# to process
-	runtime = gr.runtime(top_block)
-
 	try:    
             # Run forever
-            runtime.run()
+            top_block.run()
 	except KeyboardInterrupt:
             # Ctrl-C exits
             pass