Showing the changes to python (3 of 8 files). Show all
Unified · Split
| @@ -79,8 +79,8 @@ class onsetpick: · 78 unmodified lines | |||
| 79 | self.myfft = cvec(bufsize,channels) | 79 | self.myfft = cvec(bufsize,channels) |
| 80 | self.pv = pvoc(bufsize,hopsize,channels) | 80 | self.pv = pvoc(bufsize,hopsize,channels) |
| 81 | if mode in ['dual'] : | 81 | if mode in ['dual'] : |
| 82 | self.myod = onsetdetection(hfc,bufsize,channels) | 82 | self.myod = onsetdetection(aubio_onset_hfc,bufsize,channels) |
| 83 | self.myod2 = onsetdetection(complexdomain,bufsize,channels) | 83 | self.myod2 = onsetdetection(aubio_onset_complex,bufsize,channels) |
| 84 | self.myonset = fvec(1,channels) | 84 | self.myonset = fvec(1,channels) |
| 85 | self.myonset2 = fvec(1,channels) | 85 | self.myonset2 = fvec(1,channels) |
| 86 | else: | 86 | else: |
| @@ -105,6 +105,43 @@ class onsetpick: · 18 unmodified lines | |||
| 105 | else: self.myonset.set(0.,0,0) | 105 | else: self.myonset.set(0.,0,0) |
| 106 | return self.pp.do(self.myonset),self.myonset.get(0,0) | 106 | return self.pp.do(self.myonset),self.myonset.get(0,0) |
| 107 | 107 | ||
| 108 | def check_onset_mode(option, opt, value, parser): | ||
| 109 | nvalue = parser.rargs[0] | ||
| 110 | if nvalue == 'complexdomain' or nvalue == 'complex' : | ||
| 111 | setattr(parser.values, option.dest, aubio_onset_complex) | ||
| 112 | elif nvalue == 'hfc' : | ||
| 113 | setattr(parser.values, option.dest, aubio_onset_hfc) | ||
| 114 | elif nvalue == 'phase' : | ||
| 115 | setattr(parser.values, option.dest, aubio_onset_phase) | ||
| 116 | elif nvalue == 'specdiff' : | ||
| 117 | setattr(parser.values, option.dest, aubio_onset_specdiff) | ||
| 118 | elif nvalue == 'energy' : | ||
| 119 | setattr(parser.values, option.dest, aubio_onset_energy) | ||
| 120 | elif nvalue == 'kl' : | ||
| 121 | setattr(parser.values, option.dest, aubio_onset_kl) | ||
| 122 | elif nvalue == 'mkl' : | ||
| 123 | setattr(parser.values, option.dest, aubio_onset_mkl) | ||
| 124 | elif nvalue == 'dual' : | ||
| 125 | setattr(parser.values, option.dest, 'dual') | ||
| 126 | else: | ||
| 127 | print "unknown detection function selected\n", usage | ||
| 128 | sys.exit(1) | ||
| 129 | |||
| 130 | def check_pitch_mode(option, opt, value, parser): | ||
| 131 | nvalue = parser.rargs[0] | ||
| 132 | if nvalue == 'mcomb' : | ||
| 133 | setattr(parser.values, option.dest, aubio_pitch_mcomb) | ||
| 134 | elif nvalue == 'yin' : | ||
| 135 | setattr(parser.values, option.dest, aubio_pitch_yin) | ||
| 136 | elif nvalue == 'fcomb' : | ||
| 137 | setattr(parser.values, option.dest, aubio_pitch_fcomb) | ||
| 138 | elif nvalue == 'schmitt' : | ||
| 139 | setattr(parser.values, option.dest, aubio_pitch_schmitt) | ||
| 140 | else: | ||
| 141 | print "unknown detection function selected\n", usage | ||
| 142 | sys.exit(1) | ||
| 143 | |||
| 144 | |||
| 108 | def getonsets(filein,threshold=0.2,silence=-70.,bufsize=1024,hopsize=512, | 145 | def getonsets(filein,threshold=0.2,silence=-70.,bufsize=1024,hopsize=512, |
| 109 | mode='dual',localmin=False,storefunc=False,derivate=False): | 146 | mode='dual',localmin=False,storefunc=False,derivate=False): |
| 110 | frameread = 0 | 147 | frameread = 0 |
| @@ -9,28 +9,6 @@ from aubio.aubioclass import * · 8 unmodified lines | |||
| 9 | 9 | ||
| 10 | usage = "usage: %s [options] -i soundfile" % sys.argv[0] | 10 | usage = "usage: %s [options] -i soundfile" % sys.argv[0] |
| 11 | 11 | ||
| 12 | def check_mode(option, opt, value, parser): | ||
| 13 | nvalue = parser.rargs[0] | ||
| 14 | if nvalue == 'complexdomain' : | ||
| 15 | setattr(parser.values, option.dest, complexdomain) | ||
| 16 | elif nvalue == 'hfc' : | ||
| 17 | setattr(parser.values, option.dest, hfc) | ||
| 18 | elif nvalue == 'phase' : | ||
| 19 | setattr(parser.values, option.dest, phase) | ||
| 20 | elif nvalue == 'specdiff' : | ||
| 21 | setattr(parser.values, option.dest, specdiff) | ||
| 22 | elif nvalue == 'energy' : | ||
| 23 | setattr(parser.values, option.dest, energy) | ||
| 24 | elif nvalue == 'kl' : | ||
| 25 | setattr(parser.values, option.dest, kl) | ||
| 26 | elif nvalue == 'mkl' : | ||
| 27 | setattr(parser.values, option.dest, mkl) | ||
| 28 | elif nvalue == 'dual' : | ||
| 29 | setattr(parser.values, option.dest, 'dual') | ||
| 30 | else: | ||
| 31 | print "unknown detection function selected\n", usage | ||
| 32 | sys.exit(1) | ||
| 33 | |||
| 34 | def parse_args(): | 12 | def parse_args(): |
| 35 | from optparse import OptionParser | 13 | from optparse import OptionParser |
| 36 | parser = OptionParser(usage=usage) | 14 | parser = OptionParser(usage=usage) |
| @@ -38,7 +16,7 @@ def parse_args(): · 1 unmodified line | |||
| 38 | action="store", dest="filename", | 16 | action="store", dest="filename", |
| 39 | help="input sound file") | 17 | help="input sound file") |
| 40 | parser.add_option("-m","--mode", action="callback", | 18 | parser.add_option("-m","--mode", action="callback", |
| 41 | callback=check_mode, dest="mode", default='dual', | 19 | callback=check_onset_mode, dest="mode", default='dual', |
| 42 | help="onset detection mode [default=dual] \ | 20 | help="onset detection mode [default=dual] \ |
| 43 | complexdomain|hfc|phase|specdiff|energy|kl|mkl|dual") | 21 | complexdomain|hfc|phase|specdiff|energy|kl|mkl|dual") |
| 44 | parser.add_option("-B","--bufsize", | 22 | parser.add_option("-B","--bufsize", |
| @@ -10,17 +10,6 @@ from aubio.aubioclass import * · 9 unmodified lines | |||
| 10 | 10 | ||
| 11 | usage = "usage: %s [options] -i soundfile" % sys.argv[0] | 11 | usage = "usage: %s [options] -i soundfile" % sys.argv[0] |
| 12 | 12 | ||
| 13 | def check_mode(option, opt, value, parser): | ||
| 14 | nvalue = parser.rargs[0] | ||
| 15 | if nvalue == 'mcomb' : | ||
| 16 | setattr(parser.values, option.dest, aubio_pitch_mcomb) | ||
| 17 | elif nvalue == 'yin' : | ||
| 18 | setattr(parser.values, option.dest, aubio_pitch_yin) | ||
| 19 | elif nvalue == 'fcomb' : | ||
| 20 | setattr(parser.values, option.dest, aubio_pitch_fcomb) | ||
| 21 | elif nvalue == 'schmitt' : | ||
| 22 | setattr(parser.values, option.dest, aubio_pitch_schmitt) | ||
| 23 | |||
| 24 | 13 | ||
| 25 | def parse_args(): | 14 | def parse_args(): |
| 26 | from optparse import OptionParser | 15 | from optparse import OptionParser |
| @@ -29,7 +18,8 @@ def parse_args(): · 2 unmodified lines | |||
| 29 | action="store", dest="filename", | 18 | action="store", dest="filename", |
| 30 | help="input sound file") | 19 | help="input sound file") |
| 31 | parser.add_option("-m","--mode", action="callback", | 20 | parser.add_option("-m","--mode", action="callback", |
| 32 | callback=check_mode, dest="mode", default=aubio_pitch_mcomb, | 21 | callback=check_pitch_mode, dest="mode", |
| 22 | default=aubio_pitch_mcomb, | ||
| 33 | help="pitch detection mode [default=mcomb] \ | 23 | help="pitch detection mode [default=mcomb] \ |
| 34 | mcomb|yin|fcomb|schmitt") | 24 | mcomb|yin|fcomb|schmitt") |
| 35 | parser.add_option("-B","--bufsize", | 25 | parser.add_option("-B","--bufsize", |