diff options
| author | jcorgan | 2006-12-18 04:35:19 +0000 |
|---|---|---|
| committer | jcorgan | 2006-12-18 04:35:19 +0000 |
| commit | 95144e53f0285d9e5ea897348030a33c18773b60 (patch) | |
| tree | 6b75ec33498b91cadf3e25ba90d9ee4970e8617d /gnuradio-examples | |
| parent | 88c16d7192ccf1caf14c2417959ab675b1f6a79e (diff) | |
| download | gnuradio-95144e53f0285d9e5ea897348030a33c18773b60.tar.gz gnuradio-95144e53f0285d9e5ea897348030a33c18773b60.tar.bz2 gnuradio-95144e53f0285d9e5ea897348030a33c18773b60.zip | |
Merged jcorgan/sfg r4097:4124 into trunk, fixing hier_block2 threading issues.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4126 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples')
| -rw-r--r-- | gnuradio-examples/c++/dialtone/dialtone.cc | 4 | ||||
| -rwxr-xr-x | gnuradio-examples/python/audio/dial_tone2.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-examples/c++/dialtone/dialtone.cc b/gnuradio-examples/c++/dialtone/dialtone.cc index 08ecccf75..0debb2856 100644 --- a/gnuradio-examples/c++/dialtone/dialtone.cc +++ b/gnuradio-examples/c++/dialtone/dialtone.cc @@ -36,8 +36,8 @@ gr_hier_block2("dialtone", gr_make_io_signature(0,0,0), gr_make_io_signature(0,0,0)) { - define_component("source0", gr_make_sig_source_f(48000, GR_SIN_WAVE, 350, 0.5)); - define_component("source1", gr_make_sig_source_f(48000, GR_SIN_WAVE, 440, 0.5)); + define_component("source0", gr_make_sig_source_f(48000, GR_SIN_WAVE, 350, 0.1)); + define_component("source1", gr_make_sig_source_f(48000, GR_SIN_WAVE, 440, 0.1)); define_component("sink", audio_alsa_make_sink(48000)); connect("source0", 0, "sink", 0); diff --git a/gnuradio-examples/python/audio/dial_tone2.py b/gnuradio-examples/python/audio/dial_tone2.py index a91c6ff4d..5881f06f7 100755 --- a/gnuradio-examples/python/audio/dial_tone2.py +++ b/gnuradio-examples/python/audio/dial_tone2.py @@ -55,7 +55,7 @@ if __name__ == '__main__': top_block = dial_tone() runtime = gr.runtime(top_block) - try: - runtime.run() + try: + runtime.run() except KeyboardInterrupt: - runtime.stop() + pass |