Changeset 7fc5ba2 for python

Timestamp:

Oct 17, 2013, 2:54:51 PM (11 years ago)

Author:

Paul Brossier <piem@piem.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:

dc467b5d

Parents:

7079887

Message:

python/scripts/aubiocut: add -b option

File:

• python/scripts/aubiocut (modified) (6 diffs)

python/scripts/aubiocut

@@ -9 +9 @@
 
 usage = "usage: %s [options] -i soundfile" % sys.argv[0]
-usage += "\nhelp: %s -h" % sys.argv[0]
+usage += "\n help: %s -h" % sys.argv[0]
 
 def parse_args():
@@ -22 +22 @@
                     complexdomain|hfc|phase|specdiff|energy|kl|mkl")
     # cutting methods
-    """
     parser.add_option("-b","--beat",
             action="store_true", dest="beat", default=False,
             help="use beat locations")
+    """
     parser.add_option("-S","--silencecut",
             action="store_true", dest="silencecut", default=False,
@@ -41 +41 @@
     parser.add_option("-B","--bufsize",
             action="store", dest="bufsize", default=512,
-            metavar = "<size>",
+            metavar = "<size>", type='int',
             help="buffer size [default=512]")
     parser.add_option("-H","--hopsize",
-            metavar = "<size>",
+            metavar = "<size>", type='int',
             action="store", dest="hopsize", default=256,
             help="overlap size [default=256]")
@@ -127 +127 @@
     source_file = options.source_file
 
-    from aubio import onset, source, sink
+    from aubio import onset, tempo, source, sink
 
     s = source(source_file, samplerate, hopsize)
     if samplerate == 0: samplerate = s.get_samplerate()
 
-    o = onset(options.onset_method, bufsize, hopsize)
+    if options.beat:
+        o = tempo(options.onset_method, bufsize, hopsize)
+    else:
+        o = onset(options.onset_method, bufsize, hopsize)
     o.set_threshold(options.threshold)
 
@@ -141 +144 @@
         samples, read = s()
         if o(samples):
-            this_onset = o.get_last_onset()
-            if options.verbose: print "%.4f" % o.get_last_onset_s()
-            timestamps.append (this_onset)
+            timestamps.append (o.get_last())
+            if options.verbose: print "%.4f" % o.get_last_s()
         total_frames += read
         if read < hopsize: break
-
+    del s
     # print some info
     nstamps = len(timestamps)
@@ -162 +164 @@
             return source_base_name + '_%02.3f' % (timestamp) + '.wav'
         # reopen source file
-        del s
         s = source(source_file, samplerate, hopsize)
+        if samplerate == 0: samplerate = s.get_samplerate()
         # create first sink at 0
         g = sink(new_sink_name(source_base_name, 0.), samplerate)