diff options
Diffstat (limited to 'gr-audio/examples/python/multi_tone.py')
| -rwxr-xr-x | gr-audio/examples/python/multi_tone.py | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/gr-audio/examples/python/multi_tone.py b/gr-audio/examples/python/multi_tone.py index 6232cbef52..00c052794a 100755 --- a/gr-audio/examples/python/multi_tone.py +++ b/gr-audio/examples/python/multi_tone.py @@ -22,8 +22,8 @@ from gnuradio import gr from gnuradio import audio -from gnuradio.eng_option import eng_option -from optparse import OptionParser +from gnuradio.eng_arg import eng_float, intx +from argparse import ArgumentParser try: from gnuradio import analog @@ -40,22 +40,18 @@ class my_top_block(gr.top_block): def __init__(self): gr.top_block.__init__(self) - parser = OptionParser(option_class=eng_option) - parser.add_option("-O", "--audio-output", type="string", default="", + parser = ArgumentParser() + parser.add_argument("-O", "--audio-output", default="", help="pcm output device name. E.g., hw:0,0 or /dev/dsp") - parser.add_option("-r", "--sample-rate", type="eng_float", default=48000, - help="set sample rate to RATE (48000)") - parser.add_option ("-m", "--max-channels", type="int", default="16", + parser.add_argument("-r", "--sample-rate", type=eng_float, default=48000, + help="set sample rate to RATE (%(default)r)") + parser.add_argument ("-m", "--max-channels", type=int, default=16, help="set maximum channels to use") - parser.add_option("-D", "--dont-block", action="store_false", default=True, + parser.add_argument("-D", "--dont-block", action="store_false", dest="ok_to_block") - (options, args) = parser.parse_args() - if len(args) != 0: - parser.print_help() - raise SystemExit, 1 - - sample_rate = int(options.sample_rate) - limit_channels = options.max_channels + args = parser.parse_args() + sample_rate = int(args.sample_rate) + limit_channels = args.max_channels ampl = 0.1 @@ -76,8 +72,8 @@ class my_top_block(gr.top_block): progression = (7, 11, 1, 5, 9) dst = audio.sink(sample_rate, - options.audio_output, - options.ok_to_block) + args.audio_output, + args.ok_to_block) max_chan = dst.input_signature().max_streams() if (max_chan == -1) or (max_chan > limit_channels): |