ref: 515c7b25b49fa76c19b1aaffcdd495cf407cba91
parent: fe163ad79210270109544d4991b7130667712c8a
author: Paul Brossier <piem@piem.org>
date: Thu Oct 15 16:46:32 EDT 2009
python/: remove task.utils, not used anymore
--- 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
--- 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 @@
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,
--- 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 @@
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 = []
--- 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):
--- a/python/aubio/task/utils.py
+++ /dev/null
@@ -1,43 +1,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)