X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-examples%2Fpython%2Fdigital%2Frx_voice.py;h=1aad1ff8e6a42c7e64af9de66df7ff52cd6742f7;hb=refs%2Fremotes%2Forigin%2Fupstream;hp=c9c33c3d569ba0105326da355910384491f9b18d;hpb=09a1e803a9e6587c78d20cdf16891e5295874668;p=debian%2Fgnuradio

diff --git a/gnuradio-examples/python/digital/rx_voice.py b/gnuradio-examples/python/digital/rx_voice.py
index c9c33c3d..1aad1ff8 100755
--- a/gnuradio-examples/python/digital/rx_voice.py
+++ b/gnuradio-examples/python/digital/rx_voice.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -31,37 +31,40 @@ from gnuradio.vocoder import gsm_full_rate
 
 import random
 import struct
+import sys
 
 # from current dir
-from receive_path import receive_path
-import fusb_options
+import usrp_receive_path
 
 #import os
 #print os.getpid()
 #raw_input('Attach and press enter')
 
 
-class audio_tx(gr.hier_block):
-    def __init__(self, fg, audio_output_dev):
+class audio_tx(gr.hier_block2):
+    def __init__(self, audio_output_dev):
+	gr.hier_block2.__init__(self, "audio_tx",
+				gr.io_signature(0, 0, 0), # Input signature
+				gr.io_signature(0, 0, 0)) # Output signature
+				
         self.packet_src = gr.message_source(33)
         voice_decoder = gsm_full_rate.decode_ps()
         s2f = gr.short_to_float ()
         sink_scale = gr.multiply_const_ff(1.0/32767.)
         audio_sink = audio.sink(8000, audio_output_dev)
-        fg.connect(self.packet_src, voice_decoder, s2f, sink_scale, audio_sink)
-        gr.hier_block.__init__(self, fg, self.packet_src, audio_sink)
+        self.connect(self.packet_src, voice_decoder, s2f, sink_scale, audio_sink)
         
     def msgq(self):
         return self.packet_src.msgq()
 
 
-class my_graph(gr.flow_graph):
-
+class my_top_block(gr.top_block):
     def __init__(self, demod_class, rx_callback, options):
-        gr.flow_graph.__init__(self)
-        self.rxpath = receive_path(self, demod_class, rx_callback, options)
-        self.audio_tx = audio_tx(self, options.audio_output)
-        
+        gr.top_block.__init__(self)
+        self.rxpath = usrp_receive_path.usrp_receive_path(demod_class, rx_callback, options)
+        self.audio_tx = audio_tx(options.audio_output)
+	self.connect(self.rxpath)
+	self.connect(self.audio_tx)        
 
 # /////////////////////////////////////////////////////////////////////////////
 #                                   main
@@ -81,7 +84,7 @@ def main():
         if ok:
             n_right += 1
 
-        fg.audio_tx.msgq().insert_tail(gr.message_from_string(payload))
+        tb.audio_tx.msgq().insert_tail(gr.message_from_string(payload))
         
         print "ok = %r  n_rcvd = %4d  n_right = %4d" % (
             ok, n_rcvd, n_right)
@@ -98,14 +101,11 @@ def main():
                             % (', '.join(demods.keys()),))
     parser.add_option("-O", "--audio-output", type="string", default="",
                       help="pcm output device name.  E.g., hw:0,0 or /dev/dsp")
-
-    receive_path.add_options(parser, expert_grp)
+    usrp_receive_path.add_options(parser, expert_grp)
 
     for mod in demods.values():
         mod.add_options(expert_grp)
 
-    fusb_options.add_options(expert_grp)
-
     parser.set_defaults(bitrate=50e3)  # override default bitrate default
     (options, args) = parser.parse_args ()
 
@@ -120,14 +120,13 @@ def main():
 
 
     # build the graph
-    fg = my_graph(demods[options.modulation], rx_callback, options)
+    tb = my_top_block(demods[options.modulation], rx_callback, options)
 
     r = gr.enable_realtime_scheduling()
     if r != gr.RT_OK:
         print "Warning: Failed to enable realtime scheduling."
 
-    fg.start()        # start flow graph
-    fg.wait()         # wait for it to finish
+    tb.run()
 
 if __name__ == '__main__':
     try: