Showing the changes to python (2 of 2 files). Show all
Unified · Split
| @@ -191,7 +191,8 @@ def cutfile(filein,slicetimes,zerothres=0.008,bufsize=1024,hopsize=512): · 190 unmodified lines | |||
| 191 | filei = sndfile(filein) | 191 | filei = sndfile(filein) |
| 192 | framestep = hopsize/(filei.samplerate()+0.) | 192 | framestep = hopsize/(filei.samplerate()+0.) |
| 193 | channels = filei.channels() | 193 | channels = filei.channels() |
| 194 | newname = "%s%f%s" % ("/tmp/",0.0000000,filein[-4:]) | 194 | newname = "%s%s%f%s%s" % (filein.split(".")[0].split("/")[-1],".", |
| 195 | frameread*framestep,".",filein.split(".")[-1]) | ||
| 195 | fileo = sndfile(newname,model=filei) | 196 | fileo = sndfile(newname,model=filei) |
| 196 | myvec = fvec(hopsize,channels) | 197 | myvec = fvec(hopsize,channels) |
| 197 | mycopy = fvec(hopsize,channels) | 198 | mycopy = fvec(hopsize,channels) |
| @@ -20,7 +20,7 @@ def parse_args(): · 19 unmodified lines | |||
| 20 | help="onset detection mode [default=dual] \ | 20 | help="onset detection mode [default=dual] \ |
| 21 | complexdomain|hfc|phase|specdiff|energy|kl|mkl|dual") | 21 | complexdomain|hfc|phase|specdiff|energy|kl|mkl|dual") |
| 22 | parser.add_option("-B","--bufsize", | 22 | parser.add_option("-B","--bufsize", |
| 23 | action="store", dest="bufsize", default=1024, | 23 | action="store", dest="bufsize", default=512, |
| 24 | help="buffer size [default=1024]") | 24 | help="buffer size [default=1024]") |
| 25 | parser.add_option("-H","--hopsize", | 25 | parser.add_option("-H","--hopsize", |
| 26 | action="store", dest="hopsize", default=256, | 26 | action="store", dest="hopsize", default=256, |
| @@ -37,7 +37,7 @@ def parse_args(): · 10 unmodified lines | |||
| 37 | parser.add_option("-D","--delay", | 37 | parser.add_option("-D","--delay", |
| 38 | action="store", dest="delay", | 38 | action="store", dest="delay", |
| 39 | help="number of seconds to take back [default=system]\ | 39 | help="number of seconds to take back [default=system]\ |
| 40 | default system delay is 2*hopsize/samplerate") | 40 | default system delay is 3*hopsize/samplerate") |
| 41 | parser.add_option("-L","--localmin", | 41 | parser.add_option("-L","--localmin", |
| 42 | action="store_true", dest="localmin", default=False, | 42 | action="store_true", dest="localmin", default=False, |
| 43 | help="use local minima after peak detection") | 43 | help="use local minima after peak detection") |
| @@ -53,7 +53,7 @@ def parse_args(): · 9 unmodified lines | |||
| 53 | help="outputs silence locations") | 53 | help="outputs silence locations") |
| 54 | parser.add_option("-z","--zerocross", | 54 | parser.add_option("-z","--zerocross", |
| 55 | action="store", dest="zerothres", default=0.008, | 55 | action="store", dest="zerothres", default=0.008, |
| 56 | help="zero-crossing threshold for slicing [default=0.008]") | 56 | help="zero-crossing threshold for slicing [default=0.00008]") |
| 57 | # plotting functions | 57 | # plotting functions |
| 58 | parser.add_option("-p","--plot", | 58 | parser.add_option("-p","--plot", |
| 59 | action="store_true", dest="plot", default=False, | 59 | action="store_true", dest="plot", default=False, |
| @@ -85,11 +85,12 @@ hopsize = int(options.hopsize) · 25 unmodified lines | |||
| 85 | bufsize = int(options.bufsize) | 85 | bufsize = int(options.bufsize) |
| 86 | step = float(samplerate)/float(hopsize) | 86 | step = float(samplerate)/float(hopsize) |
| 87 | threshold = float(options.threshold) | 87 | threshold = float(options.threshold) |
| 88 | zerothres = float(options.zerothres) | ||
| 88 | silence = float(options.silence) | 89 | silence = float(options.silence) |
| 89 | mintol = float(options.mintol)*step | 90 | mintol = float(options.mintol)*step |
| 90 | # default take back system delay | 91 | # default take back system delay |
| 91 | if options.delay: delay = float(options.delay) | 92 | if options.delay: delay = float(options.delay) |
| 92 | else: delay = 2./step | 93 | else: delay = 3./step |
| 93 | 94 | ||
| 94 | if options.beat: | 95 | if options.beat: |
| 95 | #onsets = getbeats(filename,threshold,silence,mode=options.mode) | 96 | #onsets = getbeats(filename,threshold,silence,mode=options.mode) |