From e921d54419e95c097cdecf21a2de7c393eb75f18 Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 10 Jul 2009 00:36:36 +0000
Subject: Merged r11401:11405 from jblum/digital into trunk. Restores
tunnel.py, rx_voice.py, and tx_voice.py operation after transmit/receive path
refactoring.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11406 221aa14e-8319-0410-a670-987f0aec2ac5
---
gnuradio-examples/python/digital/rx_voice.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
(limited to 'gnuradio-examples/python/digital/rx_voice.py')
diff --git a/gnuradio-examples/python/digital/rx_voice.py b/gnuradio-examples/python/digital/rx_voice.py
index fa9e50b8e4..1aad1ff8e6 100755
--- a/gnuradio-examples/python/digital/rx_voice.py
+++ b/gnuradio-examples/python/digital/rx_voice.py
@@ -34,7 +34,7 @@ import struct
import sys
# from current dir
-from receive_path import receive_path
+import usrp_receive_path
#import os
#print os.getpid()
@@ -61,7 +61,7 @@ class audio_tx(gr.hier_block2):
class my_top_block(gr.top_block):
def __init__(self, demod_class, rx_callback, options):
gr.top_block.__init__(self)
- self.rxpath = receive_path(demod_class, rx_callback, options)
+ 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)
@@ -101,8 +101,7 @@ 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)
--
cgit v1.2.3