python/: remove task.utils, not used anymore

diff --git a/python/aubio/task/__init__.py b/python/aubio/task/__init__.py
index 1c6942053c4d036417662bd9fde60992ad810a0a..9d274eaa177601093c995871acd1934469750cfe 100644 (file)
--- a/python/aubio/task/__init__.py
+++ b/python/aubio/task/__init__.py
@@ -1,6 +1,5 @@
 from aubio.aubioclass import *
 from aubio.task.task import task
-from aubio.task.utils import *
 from aubio.task.params import taskparams
 from aubio.task.silence import tasksilence
 from aubio.task.onset import taskonset

diff --git a/python/aubio/task/notes.py b/python/aubio/task/notes.py
index 2554c98f978e6078da1b12bd42bf79babf6b94cc..924f6235ba8a62dfc4594791f01003f041c0ac06 100644 (file)
--- a/python/aubio/task/notes.py
+++ b/python/aubio/task/notes.py
@@ -1,6 +1,5 @@
 
 from aubio.task import task
-from aubio.task.utils import *
 from aubio.aubioclass import *
 
 class tasknotes(task):
@@ -11,10 +10,10 @@ class tasknotes(task):
                        self.channels,
                        self.myvec,
                        self.params.threshold,
-                       mode=get_onset_mode(self.params.onsetmode),
+                       mode=self.params.onsetmode,
                        dcthreshold=self.params.dcthreshold,
                        derivate=self.params.derivate)
-               self.pitchdet  = pitchdetection(mode=get_pitch_mode(self.params.pitchmode),
+               self.pitchdet  = pitchdetection(mode=self.params.pitchmode,
                        bufsize=self.params.pbufsize,
                        hopsize=self.params.phopsize,
                        channels=self.channels,

diff --git a/python/aubio/task/onset.py b/python/aubio/task/onset.py
index 0d816031a923121bd492735c5a118eb443dc3fae..83835b8ef849f88e3213b37f2abc9ac426d6de32 100644 (file)
--- a/python/aubio/task/onset.py
+++ b/python/aubio/task/onset.py
@@ -1,5 +1,4 @@
 from aubio.task.task import task
-from aubio.task.utils import * 
 from aubio.aubioclass import *
 
 class taskonset(task):
@@ -13,7 +12,7 @@ class taskonset(task):
                        self.channels,
                        self.myvec,
                        self.params.threshold,
-                       mode=get_onset_mode(self.params.onsetmode),
+                       mode=self.params.onsetmode,
                        dcthreshold=self.params.dcthreshold,
                        derivate=self.params.derivate)
                self.olist = [] 

diff --git a/python/aubio/task/pitch.py b/python/aubio/task/pitch.py
index 1a10327d7045c6a962b30a6445e4d8e9d61f1be7..7eed5e8f9a9e6a7e9ca9867d65c6713e581104b0 100644 (file)
--- a/python/aubio/task/pitch.py
+++ b/python/aubio/task/pitch.py
@@ -1,6 +1,5 @@
 from aubio.task.task import task
 from aubio.task.silence import tasksilence
-from aubio.task.utils import * 
 from aubio.aubioclass import *
 
 class taskpitch(task):

diff --git a/python/aubio/task/utils.py b/python/aubio/task/utils.py
deleted file mode 100644 (file)
index eb33f72..0000000
--- a/python/aubio/task/utils.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from aubio.aubioclass import *
-
-def get_onset_mode(nvalue):
-       """ utility function to convert a string to aubio_onsetdetection_type """
-       if   nvalue == 'complexdomain' or nvalue == 'complex' :
-                return aubio_onset_complex
-       elif nvalue == 'hfc'           :
-                return aubio_onset_hfc
-       elif nvalue == 'phase'         :
-                return aubio_onset_phase
-       elif nvalue == 'specdiff'      :
-                return aubio_onset_specdiff
-       elif nvalue == 'energy'        :
-                return aubio_onset_energy
-       elif nvalue == 'kl'            :
-                return aubio_onset_kl
-       elif nvalue == 'mkl'           :
-                return aubio_onset_mkl
-       elif nvalue == 'specflux'      :
-                return aubio_onset_specflux
-       elif nvalue == 'dual'          :
-                return 'dual'
-       else:
-                import sys
-                print "unknown onset detection function selected: %s" % nvalue
-                sys.exit(1)
-
-def check_onset_mode(option, opt, value, parser):
-       """ wrapper function to convert a list of modes to 
-               aubio_onsetdetection_type """
-       nvalues = parser.rargs[0].split(',')
-       val =  []
-       for nvalue in nvalues:
-               val.append(get_onset_mode(nvalue))
-               setattr(parser.values, option.dest, val)
-
-def check_pitch_mode(option, opt, value, parser):
-       """ utility function to convert a string to aubio_pitchdetection_type"""
-       nvalues = parser.rargs[0].split(',')
-       val = []
-       for nvalue in nvalues:
-               val.append(get_pitch_mode(nvalue))
-               setattr(parser.values, option.dest, val)