Changeset ada5baf

Timestamp:

Dec 22, 2005, 5:57:50 PM (19 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

e8d0c06

Parents:

c32976a5

Message:

add beat function
add beat function

File:

• python/aubiocut (modified) (4 diffs)

python/aubiocut

@@ -17 +17 @@
                           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")
@@ -92 +92 @@
 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 = [], []
@@ -105 +98 @@
 
         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
@@ -134 +136 @@
         # 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