diff options
| author | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-02-09 22:49:09 +0000 |
|---|---|---|
| committer | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-02-09 22:49:09 +0000 |
| commit | 3e7f3d33cfbd4f64a90aa43c8e8505213362faee (patch) | |
| tree | 4a6805309e517619bcee88e755ec03efca6e48e0 /gnuradio-examples/python/hier/networking/dial_tone_source.py | |
| parent | ad798c9a53e0c4cbee7ba3b47966c0882e22e8e1 (diff) | |
merging r4318:4437 to fix ticket:131 from branche trondeau/udp udp source/sink pairs working
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4438 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python/hier/networking/dial_tone_source.py')
| -rwxr-xr-x | gnuradio-examples/python/hier/networking/dial_tone_source.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gnuradio-examples/python/hier/networking/dial_tone_source.py b/gnuradio-examples/python/hier/networking/dial_tone_source.py index 4f973ebca4..40cb935536 100755 --- a/gnuradio-examples/python/hier/networking/dial_tone_source.py +++ b/gnuradio-examples/python/hier/networking/dial_tone_source.py @@ -25,7 +25,7 @@ from gnuradio.eng_option import eng_option from optparse import OptionParser class dial_tone_source(gr.hier_block2): - def __init__(self, local_ipaddress, remote_ipaddress, port, mtu, sample_rate): + def __init__(self, src, dst, port, pkt_size, sample_rate): gr.hier_block2.__init__(self, "dial_tone_source", # Block type gr.io_signature(0,0,0), # Input signature @@ -38,37 +38,37 @@ class dial_tone_source(gr.hier_block2): 440, amplitude)) self.define_component("add", gr.add_ff()) + # Throttle needed here to account for the other side's audio card sampling rate self.define_component("thr", gr.throttle(gr.sizeof_float, sample_rate)) - self.define_component("dst", gr.udp_sink(gr.sizeof_float, - local_ipaddress, 0, - remote_ipaddress, port, - mtu)) - + self.define_component("dst", gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size)) + self.connect("src0", 0, "add", 0) self.connect("src1", 0, "add", 1) self.connect("add", 0, "thr", 0) self.connect("thr", 0, "dst", 0) + + if __name__ == '__main__': parser = OptionParser(option_class=eng_option) - parser.add_option("", "--local-ipaddr", type="string", default="127.0.0.1", - help="local IP address") - parser.add_option("", "--remote-ipaddr", type="string", default="127.0.0.1", - help="Remote IP address") - parser.add_option("", "--remote-port", type="int", default=65500, + parser.add_option("", "--src-name", type="string", default="localhost", + help="local host name (domain name or IP address)") + parser.add_option("", "--dst-name", type="string", default="localhost", + help="Remote host name (domain name or IP address") + parser.add_option("", "--dst-port", type="int", default=65500, help="port value to connect to") - parser.add_option("", "--mtu", type="int", default=540, - help="packet size.") + parser.add_option("", "--packet-size", type="int", default=1472, + help="packet size.") parser.add_option("-r", "--sample-rate", type="int", default=8000, - help="audio signal sample rate [default=%default]") + help="audio signal sample rate [default=%default]") (options, args) = parser.parse_args() if len(args) != 0: parser.print_help() raise SystemExit, 1 # Create an instance of a hierarchical block - top_block = dial_tone_source(options.local_ipaddr, options.remote_ipaddr, - options.remote_port, options.mtu, options.sample_rate) + top_block = dial_tone_source(options.src_name, options.dst_name, options.dst_port, + options.packet_size, options.sample_rate) # Create an instance of a runtime, passing it the top block runtime = gr.runtime(top_block) |