Changeset 5cf415f for python

Timestamp:

Aug 9, 2005, 8:35:14 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:

b1f723d

Parents:

a29ad46

Message:

protected onset enumerators, factorise python check_modes

Location:

python

Files:

• aubio/aubioclass.py (modified) (2 diffs)
• aubiocut (modified) (2 diffs)
• aubiopitch (modified) (2 diffs)

python/aubio/aubioclass.py

@@ -80 +80 @@
         self.pv       = pvoc(bufsize,hopsize,channels)
         if mode in ['dual'] :
-                self.myod     = onsetdetection(hfc,bufsize,channels)
-                self.myod2    = onsetdetection(complexdomain,bufsize,channels)
+                self.myod     = onsetdetection(aubio_onset_hfc,bufsize,channels)
+                self.myod2    = onsetdetection(aubio_onset_complex,bufsize,channels)
                 self.myonset  = fvec(1,channels)
                 self.myonset2 = fvec(1,channels)
@@ -105 +105 @@
                 else:  self.myonset.set(0.,0,0)
         return self.pp.do(self.myonset),self.myonset.get(0,0)
+
+def check_onset_mode(option, opt, value, parser):
+        nvalue = parser.rargs[0]
+        if   nvalue == 'complexdomain' or nvalue == 'complex' :
+                 setattr(parser.values, option.dest, aubio_onset_complex)
+        elif nvalue == 'hfc'           :
+                 setattr(parser.values, option.dest, aubio_onset_hfc)
+        elif nvalue == 'phase'         :
+                 setattr(parser.values, option.dest, aubio_onset_phase)
+        elif nvalue == 'specdiff'      :
+                 setattr(parser.values, option.dest, aubio_onset_specdiff)
+        elif nvalue == 'energy'        :
+                 setattr(parser.values, option.dest, aubio_onset_energy)
+        elif nvalue == 'kl'            :
+                 setattr(parser.values, option.dest, aubio_onset_kl)
+        elif nvalue == 'mkl'           :
+                 setattr(parser.values, option.dest, aubio_onset_mkl)
+        elif nvalue == 'dual'          :
+                 setattr(parser.values, option.dest, 'dual')
+        else:
+                 print "unknown detection function selected\n", usage
+                 sys.exit(1)
+
+def check_pitch_mode(option, opt, value, parser):
+        nvalue = parser.rargs[0]
+        if   nvalue == 'mcomb' :
+                 setattr(parser.values, option.dest, aubio_pitch_mcomb)
+        elif nvalue == 'yin'           :
+                 setattr(parser.values, option.dest, aubio_pitch_yin)
+        elif nvalue == 'fcomb'         :
+                 setattr(parser.values, option.dest, aubio_pitch_fcomb)
+        elif nvalue == 'schmitt'      :
+                 setattr(parser.values, option.dest, aubio_pitch_schmitt)
+        else:
+                 print "unknown detection function selected\n", usage
+                 sys.exit(1)
+
 
 def getonsets(filein,threshold=0.2,silence=-70.,bufsize=1024,hopsize=512,

python/aubiocut

@@ -10 +10 @@
 usage = "usage: %s [options] -i soundfile" % sys.argv[0]
 
-def check_mode(option, opt, value, parser):
-        nvalue = parser.rargs[0]
-        if   nvalue == 'complexdomain' :
-                 setattr(parser.values, option.dest, complexdomain)
-        elif nvalue == 'hfc'           :
-                 setattr(parser.values, option.dest, hfc)
-        elif nvalue == 'phase'         :
-                 setattr(parser.values, option.dest, phase)
-        elif nvalue == 'specdiff'      :
-                 setattr(parser.values, option.dest, specdiff)
-        elif nvalue == 'energy'        :
-                 setattr(parser.values, option.dest, energy)
-        elif nvalue == 'kl'            :
-                 setattr(parser.values, option.dest, kl)
-        elif nvalue == 'mkl'           :
-                 setattr(parser.values, option.dest, mkl)
-        elif nvalue == 'dual'          :
-                 setattr(parser.values, option.dest, 'dual')
-        else:
-                 print "unknown detection function selected\n", usage
-                 sys.exit(1)
-
 def parse_args():
         from optparse import OptionParser
@@ -39 +17 @@
                           help="input sound file")
         parser.add_option("-m","--mode", action="callback", 
-                          callback=check_mode, dest="mode", default='dual', 
+                          callback=check_onset_mode, dest="mode", default='dual', 
                           help="onset detection mode [default=dual] \
                           complexdomain|hfc|phase|specdiff|energy|kl|mkl|dual")

python/aubiopitch

@@ -11 +11 @@
 usage = "usage: %s [options] -i soundfile" % sys.argv[0]
 
-def check_mode(option, opt, value, parser):
-        nvalue = parser.rargs[0]
-        if   nvalue == 'mcomb' :
-                 setattr(parser.values, option.dest, aubio_pitch_mcomb)
-        elif nvalue == 'yin'           :
-                 setattr(parser.values, option.dest, aubio_pitch_yin)
-        elif nvalue == 'fcomb'         :
-                 setattr(parser.values, option.dest, aubio_pitch_fcomb)
-        elif nvalue == 'schmitt'      :
-                 setattr(parser.values, option.dest, aubio_pitch_schmitt)
-
 
 def parse_args():
@@ -30 +19 @@
                           help="input sound file")
         parser.add_option("-m","--mode", action="callback", 
-                          callback=check_mode, dest="mode", default=aubio_pitch_mcomb,
+                          callback=check_pitch_mode, dest="mode", 
+                          default=aubio_pitch_mcomb,
                           help="pitch detection mode [default=mcomb] \
                           mcomb|yin|fcomb|schmitt")