diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-04-28 02:20:28 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-04-28 02:20:28 +0000 |
| commit | b26ea69676c09f5366a9e2f33b11ae5a7521ffe5 (patch) | |
| tree | 0641c1c25d6e827f70941e07f4611d0a2b6b83cd /gnuradio-examples/python/hier/networking | |
| parent | 00696b9f754338de9362932c1ecfb1e144a38786 (diff) | |
Merged -r 5137:5174 from developer branch jcorgan/hb. Trunk passes distcheck. Converts gr.hier_block2 API to not use 'define_component' methodology anymore.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5177 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python/hier/networking')
6 files changed, 37 insertions, 75 deletions
diff --git a/gnuradio-examples/python/hier/networking/audio_sink.py b/gnuradio-examples/python/hier/networking/audio_sink.py index 1b182e97eb..4e5f647604 100755 --- a/gnuradio-examples/python/hier/networking/audio_sink.py +++ b/gnuradio-examples/python/hier/networking/audio_sink.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -24,18 +24,12 @@ from gnuradio import gr, audio from gnuradio.eng_option import eng_option from optparse import OptionParser -class audio_sink(gr.hier_block2): +class audio_sink(gr.top_block): def __init__(self, src, port, pkt_size, sample_rate): - gr.hier_block2.__init__(self, - "audio_sink", # Block type - gr.io_signature(0,0,0), # Input signature - gr.io_signature(0,0,0)) # Output signature - - - self.define_component("src", gr.udp_source(gr.sizeof_float, src, port, pkt_size)) - self.define_component("dst", audio.sink(sample_rate)) - - self.connect("src", 0, "dst", 0) + gr.top_block.__init__(self, "audio_sink") + src = gr.udp_source(gr.sizeof_float, src, port, pkt_size) + dst = audio.sink(sample_rate) + self.connect(src, dst) if __name__ == '__main__': parser = OptionParser(option_class=eng_option) diff --git a/gnuradio-examples/python/hier/networking/audio_source.py b/gnuradio-examples/python/hier/networking/audio_source.py index 24186895a3..168e1cba92 100755 --- a/gnuradio-examples/python/hier/networking/audio_source.py +++ b/gnuradio-examples/python/hier/networking/audio_source.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -24,16 +24,12 @@ from gnuradio import gr, audio from gnuradio.eng_option import eng_option from optparse import OptionParser -class audio_source(gr.hier_block2): +class audio_source(gr.top_block): def __init__(self, src, dst, port, pkt_size, sample_rate): - gr.hier_block2.__init__(self, - "audio_source", # Block type - gr.io_signature(0,0,0), # Input signature - gr.io_signature(0,0,0)) # Output signature - - self.define_component("src", audio.source(sample_rate)) - self.define_component("dst", gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size)) - self.connect("src", 0, "dst", 0) + gr.top_block.__init__(self, "audio_source") + self.audio = audio.source(sample_rate) + self.sink = gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size) + self.connect(self.audio, self.sink) if __name__ == '__main__': parser = OptionParser(option_class=eng_option) diff --git a/gnuradio-examples/python/hier/networking/dial_tone_sink.py b/gnuradio-examples/python/hier/networking/dial_tone_sink.py index 95419fbc94..de0db14d88 100755 --- a/gnuradio-examples/python/hier/networking/dial_tone_sink.py +++ b/gnuradio-examples/python/hier/networking/dial_tone_sink.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -24,18 +24,12 @@ from gnuradio import gr, audio from gnuradio.eng_option import eng_option from optparse import OptionParser -class dial_tone_sink(gr.hier_block2): +class dial_tone_sink(gr.top_block): def __init__(self, src, port, pkt_size, sample_rate): - gr.hier_block2.__init__(self, - "dial_tone_sink", # Block type - gr.io_signature(0,0,0), # Input signature - gr.io_signature(0,0,0)) # Output signature - - - self.define_component("src", gr.udp_source(gr.sizeof_float, src, port, pkt_size)) - self.define_component("dst", audio.sink(sample_rate)) - - self.connect("src", 0, "dst", 0) + gr.top_block.__init__(self, "dial_tone_sink") + udp = gr.udp_source(gr.sizeof_float, src, port, pkt_size) + sink = audio.sink(sample_rate) + self.connect(udp, sink) if __name__ == '__main__': parser = OptionParser(option_class=eng_option) diff --git a/gnuradio-examples/python/hier/networking/dial_tone_source.py b/gnuradio-examples/python/hier/networking/dial_tone_source.py index 40cb935536..5ef4f25d68 100755 --- a/gnuradio-examples/python/hier/networking/dial_tone_source.py +++ b/gnuradio-examples/python/hier/networking/dial_tone_source.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -24,30 +24,21 @@ from gnuradio import gr from gnuradio.eng_option import eng_option from optparse import OptionParser -class dial_tone_source(gr.hier_block2): +class dial_tone_source(gr.top_block): 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 - gr.io_signature(0,0,0)) # Output signature + gr.top_block.__init__(self, "dial_tone_source") amplitude = 0.3 - self.define_component("src0", gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, - 350, amplitude)) - self.define_component("src1", gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, - 440, amplitude)) - self.define_component("add", gr.add_ff()) + src0 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 350, amplitude) + src1 = gr.sig_source_f (sample_rate, gr.GR_SIN_WAVE, 440, amplitude) + 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, 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) - - + thr = gr.throttle(gr.sizeof_float, sample_rate) + sink = gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size) + self.connect(src0, (add, 0)) + self.connect(src1, (add, 1)) + self.connect(add, thr, sink) if __name__ == '__main__': parser = OptionParser(option_class=eng_option) diff --git a/gnuradio-examples/python/hier/networking/vector_sink.py b/gnuradio-examples/python/hier/networking/vector_sink.py index 54578078fd..35ea36e636 100755 --- a/gnuradio-examples/python/hier/networking/vector_sink.py +++ b/gnuradio-examples/python/hier/networking/vector_sink.py @@ -24,19 +24,13 @@ from gnuradio import gr from gnuradio.eng_option import eng_option from optparse import OptionParser -class vector_sink(gr.hier_block2): +class vector_sink(gr.top_block): def __init__(self, src, port, pkt_size): - gr.hier_block2.__init__(self, - "vector_sink", # Block type - gr.io_signature(0,0,0), # Input signature - gr.io_signature(0,0,0)) # Output signature + gr.top_block.__init__(self, "vector_sink") udp = gr.udp_source(gr.sizeof_float, src, port, pkt_size) - - self.define_component("src", udp) - self.define_component("dst", gr.file_sink(gr.sizeof_float, "received.dat")) - - self.connect("src", 0, "dst", 0) + sink = gr.file_sink(gr.sizeof_float, "received.dat") + self.connect(udp, sink) if __name__ == "__main__": parser = OptionParser(option_class=eng_option) diff --git a/gnuradio-examples/python/hier/networking/vector_source.py b/gnuradio-examples/python/hier/networking/vector_source.py index d31a0baa24..ad3c31be7d 100755 --- a/gnuradio-examples/python/hier/networking/vector_source.py +++ b/gnuradio-examples/python/hier/networking/vector_source.py @@ -24,20 +24,13 @@ from gnuradio import gr from gnuradio.eng_option import eng_option from optparse import OptionParser -class vector_source(gr.hier_block2): +class vector_source(gr.top_block): def __init__(self, src, dst, port, pkt_size): - gr.hier_block2.__init__(self, - "vector_source", # Block type - gr.io_signature(0,0,0), # Input signature - gr.io_signature(0,0,0)) # Output signature - + gr.top_block.__init__(self, "vector_source") data = [i*0.01 for i in range(1000)] - self.define_component("data", gr.vector_source_f(data, True)) - + vec = gr.vector_source_f(data, True) udp = gr.udp_sink(gr.sizeof_float, src, 0, dst, port, pkt_size) - self.define_component("dst", udp) - - self.connect("data", 0, "dst", 0) + self.connect(vec, udp) if __name__ == '__main__': parser = OptionParser(option_class=eng_option) |