[Commit-gnuradio] r3655 - gnuradio/branches/developers/eb/digital-wip/gnuradio-examples/python/gmsk2

[eb]

Author: eb
Date: 2006-09-26 20:53:26 -0600 (Tue, 26 Sep 2006)
New Revision: 3655

Modified:
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-examples/python/gmsk2/rx_voice.py
Log:
Changed default bitrate to 50k, added --audio-output arg


Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-examples/python/gmsk2/rx_voice.py
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-examples/python/gmsk2/rx_voice.py
      2006-09-27 02:13:01 UTC (rev 3654)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-examples/python/gmsk2/rx_voice.py
      2006-09-27 02:53:26 UTC (rev 3655)
@@ -42,12 +42,12 @@
 
 
 class audio_tx(gr.hier_block):
-    def __init__(self, fg):
+    def __init__(self, fg, audio_output_dev):
         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_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)
         
@@ -60,7 +60,7 @@
     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)
+        self.audio_tx = audio_tx(self, options.audio_output)
         
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -96,6 +96,8 @@
                       default='gmsk',
                       help="Select modulation from: %s [default=%%default]"
                             % (', '.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)
 
@@ -103,6 +105,8 @@
         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 ()
 
     if len(args) != 0: