From ada5bafca49cca061545a85ec525fe180cbce1df Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Thu, 22 Dec 2005 16:57:50 +0000 Subject: [PATCH] add beat function add beat function --- python/aubiocut | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/python/aubiocut b/python/aubiocut index 85906677..d774be6f 100755 --- a/python/aubiocut +++ b/python/aubiocut @@ -16,7 +16,7 @@ def parse_args(): action="store", dest="filename", help="input sound file") parser.add_option("-m","--mode", - action="store", dest="mode", default=['dual'], + action="store", dest="mode", default='dual', help="onset detection mode [default=dual] \ complexdomain|hfc|phase|specdiff|energy|kl|mkl|dual") parser.add_option("-B","--bufsize", @@ -91,20 +91,22 @@ params.mintol = float(options.mintol) if options.delay: delay = float(options.delay) else: delay = 3./params.step -if options.beat: - #onsets = getbeats(filename,threshold,silence,mode=options.mode) - exit("not implemented yet") -elif options.silencecut: - onsets = getsilences(filename,hopsize=hopsize,silence=silence) -elif options.plot: params.storefunc=True -else: params.storefunc=False lonsets, lofunc = [], [] modes = options.mode.split(',') for i in range(len(modes)): params.onsetmode = modes[i] - filetask = taskonset(filename,params=params) + dotask = taskonset + if options.beat: + dotask = taskbeat + elif options.silencecut: + dotask = tasksilence + elif options.plot: + params.storefunc=True + else: + params.storefunc=False + filetask = dotask(filename,params=params) onsets = filetask.compute_all() ofunc = filetask.ofunc #onsets, ofunc = getonsets(filename,threshold,silence, @@ -133,8 +135,7 @@ for i in range(len(modes)): # print times in second if options.verbose: - print modes[i] - maxonset = 0 + #print modes[i] for i in range(len(onsets)): print onsets[i]*params.step -- 2.26.2