Changeset fe163ad for python/aubio

Timestamp:

Oct 15, 2009, 6:54:23 PM (15 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:

515c7b2

Parents:

cd77c15

Message:

src/pitch: use a string to set pitch method, add a new function to set pitch unit, keep pitch enums private, update pitch methods where they are used

Location:

python/aubio

Files:

• aubioclass.py (modified) (1 diff)
• task/params.py (modified) (2 diffs)
• task/pitch.py (modified) (1 diff)
• task/utils.py (modified) (2 diffs)

python/aubio/aubioclass.py

@@ -125 +125 @@
 
 class pitchdetection:
-    def __init__(self,mode=aubio_pitch_mcomb,bufsize=2048,hopsize=1024,
-        channels=1,samplerate=44100.,omode=aubio_pitchm_freq,tolerance=0.1):
-        self.pitchp = new_aubio_pitchdetection(bufsize,hopsize,channels,
-                samplerate,mode,omode)
+    def __init__(self,mode="mcomb",bufsize=2048,hopsize=1024,
+        channels=1,samplerate=44100.,omode="freq",tolerance=0.1):
+        self.pitchp = new_aubio_pitchdetection(mode,bufsize,hopsize,channels,
+            samplerate)
         self.mypitch = fvec(1, channels)
+        aubio_pitchdetection_set_unit(self.pitchp,omode)
         aubio_pitchdetection_set_tolerance(self.pitchp,tolerance)
         #self.filt     = filter(srate,"adsgn")

python/aubio/task/params.py

@@ -1 @@
-from aubio.aubioclass import aubio_pitchm_freq
 
 class taskparams(object):
@@ -30 +29 @@
                 self.pitchdelay = -0.5
                 self.dcthreshold = -1.
-                self.omode = aubio_pitchm_freq
+                self.omode = "freq"
                 self.verbose   = False
 

python/aubio/task/pitch.py

@@ -14 +14 @@
                 else:
                         tolerance = 0.
-                self.pitchdet   = pitchdetection(mode=get_pitch_mode(self.params.pitchmode),
+                self.pitchdet   = pitchdetection(mode=self.params.pitchmode,
                         bufsize=self.params.bufsize,
                         hopsize=self.params.hopsize,

python/aubio/task/utils.py

@@ -26 +26 @@
                  sys.exit(1)
 
-def get_pitch_mode(nvalue):
-        """ utility function to convert a string to aubio_pitchdetection_type """
-        if   nvalue == 'mcomb'  :
-                 return aubio_pitch_mcomb
-        elif nvalue == 'yin'    :
-                 return aubio_pitch_yin
-        elif nvalue == 'fcomb'  :
-                 return aubio_pitch_fcomb
-        elif nvalue == 'schmitt':
-                 return aubio_pitch_schmitt
-        elif nvalue == 'yinfft':
-                 return aubio_pitch_yinfft
-        else:
-                 import sys
-                 print "error: unknown pitch detection function selected"
-                 sys.exit(1)
-
 def check_onset_mode(option, opt, value, parser):
         """ wrapper function to convert a list of modes to 
@@ -59 +42 @@
                 val.append(get_pitch_mode(nvalue))
                 setattr(parser.values, option.dest, val)
-
-def check_pitchm_mode(option, opt, value, parser):
-        """ utility function to convert a string to aubio_pitchdetection_mode """
-        nvalue = parser.rargs[0]
-        if   nvalue == 'freq'  :
-                 setattr(parser.values, option.dest, aubio_pitchm_freq)
-        elif nvalue == 'midi'  :
-                 setattr(parser.values, option.dest, aubio_pitchm_midi)
-        elif nvalue == 'cent'  :
-                 setattr(parser.values, option.dest, aubio_pitchm_cent)
-        elif nvalue == 'bin'   :
-                 setattr(parser.values, option.dest, aubio_pitchm_bin)
-        else:
-                 import sys
-                 print "error: unknown pitch detection output selected"
-                 sys.exit(1)
-
-