Showing the changes to python (1 of 1 file). Show all
Unified · Split
| @@ -6,38 +6,46 @@ from aubio.aubioclass import * · 5 unmodified lines | ||
| 6 | 6 | |
| 7 | 7 | usage = "usage: %s [options] soundfile" % sys.argv[0] |
| 8 | 8 | |
| 9 | +def check_mode(option, opt, value, parser): | |
| 10 | + nvalue = parser.rargs[0] | |
| 11 | + if nvalue == 'complexdomain' : | |
| 12 | + setattr(parser.values, option.dest, complexdomain) | |
| 13 | + elif nvalue == 'hfc' : | |
| 14 | + setattr(parser.values, option.dest, hfc) | |
| 15 | + elif nvalue == 'phase' : | |
| 16 | + setattr(parser.values, option.dest, phase) | |
| 17 | + elif nvalue == 'specdiff' : | |
| 18 | + setattr(parser.values, option.dest, specdiff) | |
| 19 | + elif nvalue == 'energy' : | |
| 20 | + setattr(parser.values, option.dest, energy) | |
| 21 | + elif nvalue == 'dual' : | |
| 22 | + setattr(parser.values, option.dest, 'dual') | |
| 23 | + | |
| 9 | 24 | def parse_args(): |
| 10 | 25 | from optparse import OptionParser |
| 11 | 26 | parser = OptionParser(usage=usage) |
| 12 | − parser.add_option("-v","--verbose", | |
| 13 | − action="store_true", dest="verbose", default=False, | |
| 14 | − help="make lots of noise") | |
| 15 | − parser.add_option("-q","--quiet", | |
| 16 | − action="store_false", dest="verbose", default=True, | |
| 17 | − help="be quiet [default]") | |
| 27 | + parser.add_option("-m","--mode", action="callback", | |
| 28 | + callback=check_mode, dest="mode", default='dual', | |
| 29 | + help="onsetdetection mode [default=dual] \ | |
| 30 | + complexdomain|hfc|phase|specdiff|energy|dual") | |
| 31 | + parser.add_option("-o","--outplot", | |
| 32 | + action="store", dest="outplot", default=None, | |
| 33 | + help="be quiet [default=None]") | |
| 18 | 34 | parser.add_option("-t","--threshold", |
| 19 | 35 | action="store", dest="threshold", default=0.3, |
| 20 | 36 | help="onset detection threshold [default=0.3]") |
| 21 | 37 | parser.add_option("-s","--silence", |
| 22 | 38 | action="store", dest="silence", default=-70, |
| 23 | 39 | help="silence [default=-70]") |
| 24 | − def check_mode(option, opt, value, parser): | |
| 25 | − nvalue = parser.rargs[0] | |
| 26 | − if nvalue == 'complexdomain' : setattr(parser.values, option.dest, complexdomain) | |
| 27 | − elif nvalue == 'hfc' : setattr(parser.values, option.dest, hfc) | |
| 28 | − elif nvalue == 'phase' : setattr(parser.values, option.dest, phase) | |
| 29 | − elif nvalue == 'specdiff' : setattr(parser.values, option.dest, specdiff) | |
| 30 | − elif nvalue == 'energy' : setattr(parser.values, option.dest, energy) | |
| 31 | − elif nvalue == 'dual' : setattr(parser.values, option.dest, 'dual') | |
| 32 | − parser.add_option("-m","--mode", | |
| 33 | − action="callback", callback=check_mode, dest="mode", default='dual', | |
| 34 | − help="onsetdetection mode [default=dual]") | |
| 35 | − parser.add_option("-o","--outplot", | |
| 36 | − action="store", dest="outplot", default=None, | |
| 37 | − help="be quiet [default=None]") | |
| 38 | 40 | parser.add_option("-M","--mintol", |
| 39 | − action="store", dest="mintol", default=-70, | |
| 40 | − help="mintol [default=0.48]") | |
| 41 | + action="store", dest="mintol", default=0.048, | |
| 42 | + help="minimum inter onset interval [default=0.048]") | |
| 43 | + parser.add_option("-v","--verbose", | |
| 44 | + action="store_true", dest="verbose", default=False, | |
| 45 | + help="make lots of noise") | |
| 46 | + parser.add_option("-q","--quiet", | |
| 47 | + action="store_false", dest="verbose", default=True, | |
| 48 | + help="be quiet [default]") | |
| 41 | 49 | (options, args) = parser.parse_args() |
| 42 | 50 | if not len(args): |
| 43 | 51 | print "no file name given\n", usage |