src/pitch/: change all _detect prototypes to _do

diff --git a/examples/aubionotes.c b/examples/aubionotes.c
index af7fd78add2943fedd1743ae863c49b1f5132d85..8e0c3fcba11a74f81bb50cd529fd13a0f4aa63c1 100644 (file)
--- a/examples/aubionotes.c
+++ b/examples/aubionotes.c
@@ -45,7 +45,7 @@ int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
       }
       isonset = aubio_peakpicker_do(parms, onset);
       
-      pitch = aubio_pitchdetection(pitchdet,ibuf);
+      pitch = aubio_pitchdetection_do (pitchdet,ibuf);
       if(median){
               note_append(note_buffer, pitch);
       }

diff --git a/python/aubio/aubioclass.py b/python/aubio/aubioclass.py
index 58c8fe17f1a076798e95eb6c84ac2ab49a60f149..277d1fc98754fef9a3fd2fd10e8b18c5331b7caf 100644 (file)
--- a/python/aubio/aubioclass.py
+++ b/python/aubio/aubioclass.py
@@ -134,7 +134,7 @@ class pitchdetection:
         del_aubio_pitchdetection(self.pitchp)
     def __call__(self,myvec): 
         #self.filt(myvec)
-        return aubio_pitchdetection(self.pitchp,myvec())
+        return aubio_pitchdetection_do(self.pitchp,myvec())
 
 class filter:
     def __init__(self,srate,type=None):

diff --git a/src/pitch/pitchdetection.c b/src/pitch/pitchdetection.c
index 3e9d245d4c3eff19fd06666e5a625bf197ada9e5..6969fd890c5efd3cc0ff3d31a3788fe3971ec3a0 100644 (file)
--- a/src/pitch/pitchdetection.c
+++ b/src/pitch/pitchdetection.c
@@ -195,7 +195,7 @@ void aubio_pitchdetection_set_yinthresh(aubio_pitchdetection_t *p, smpl_t thres)
   p->yinthres = thres;
 }
 
-smpl_t aubio_pitchdetection(aubio_pitchdetection_t *p, fvec_t * ibuf) {
+smpl_t aubio_pitchdetection_do (aubio_pitchdetection_t *p, fvec_t * ibuf) {
   return p->freqconv(p->callback(p,ibuf),p->srate,p->bufsize);
 }
 
@@ -203,7 +203,7 @@ smpl_t aubio_pitchdetection_mcomb(aubio_pitchdetection_t *p, fvec_t *ibuf) {
   smpl_t pitch = 0.;
   aubio_filter_do(p->filter,ibuf);
   aubio_pvoc_do(p->pv,ibuf,p->fftgrain);
-  pitch = aubio_pitchmcomb_detect(p->mcomb,p->fftgrain);
+  pitch = aubio_pitchmcomb_do(p->mcomb,p->fftgrain);
   /** \bug should move the >0 check within aubio_bintofreq */
   if (pitch>0.) {
     pitch = aubio_bintofreq(pitch,p->srate,p->bufsize);
@@ -229,7 +229,7 @@ smpl_t aubio_pitchdetection_yin(aubio_pitchdetection_t *p, fvec_t *ibuf) {
 smpl_t aubio_pitchdetection_yinfft(aubio_pitchdetection_t *p, fvec_t *ibuf){
   smpl_t pitch = 0.;
   aubio_pitchdetection_slideblock(p,ibuf);
-  pitch = aubio_pitchyinfft_detect(p->yinfft,p->buf,p->yinthres);
+  pitch = aubio_pitchyinfft_do(p->yinfft,p->buf,p->yinthres);
   if (pitch>0) {
     pitch = p->srate/(pitch+0.);
   } else {
@@ -240,10 +240,10 @@ smpl_t aubio_pitchdetection_yinfft(aubio_pitchdetection_t *p, fvec_t *ibuf){
 
 smpl_t aubio_pitchdetection_fcomb(aubio_pitchdetection_t *p, fvec_t *ibuf){
   aubio_pitchdetection_slideblock(p,ibuf);
-  return aubio_pitchfcomb_detect(p->fcomb,p->buf);
+  return aubio_pitchfcomb_do(p->fcomb,p->buf);
 }
 
 smpl_t aubio_pitchdetection_schmitt(aubio_pitchdetection_t *p, fvec_t *ibuf){
   aubio_pitchdetection_slideblock(p,ibuf);
-  return aubio_pitchschmitt_detect(p->schmitt,p->buf);
+  return aubio_pitchschmitt_do(p->schmitt,p->buf);
 }

diff --git a/src/pitch/pitchdetection.h b/src/pitch/pitchdetection.h
index 164b1f53738cf125d8e618ec3d6fc21c3f926550..528387b907fd1f76833579d4ff445a7042e98f39 100644 (file)
--- a/src/pitch/pitchdetection.h
+++ b/src/pitch/pitchdetection.h
@@ -58,7 +58,7 @@ typedef struct _aubio_pitchdetection_t aubio_pitchdetection_t;
   \param ibuf input signal of length hopsize
 
 */
-smpl_t aubio_pitchdetection(aubio_pitchdetection_t * p, fvec_t * ibuf);
+smpl_t aubio_pitchdetection_do (aubio_pitchdetection_t * p, fvec_t * ibuf);
 
 /** change yin or yinfft tolerance threshold
 

diff --git a/src/pitch/pitchfcomb.c b/src/pitch/pitchfcomb.c
index 45a5a1a453d76551a799febbce0916e82f6ae74e..f7c43aca84e832574af68de22d944e165af83432 100644 (file)
--- a/src/pitch/pitchfcomb.c
+++ b/src/pitch/pitchfcomb.c
@@ -58,7 +58,7 @@ aubio_pitchfcomb_t * new_aubio_pitchfcomb (uint_t bufsize, uint_t hopsize, uint_
 }
 
 /* input must be stepsize long */
-smpl_t aubio_pitchfcomb_detect (aubio_pitchfcomb_t * p, fvec_t * input)
+smpl_t aubio_pitchfcomb_do (aubio_pitchfcomb_t * p, fvec_t * input)
 {
   uint_t k, l, maxharm = 0;
   smpl_t freqPerBin = p->rate/(smpl_t)p->fftSize,

diff --git a/src/pitch/pitchfcomb.h b/src/pitch/pitchfcomb.h
index 1f1974b5b6726fdb05d59ceaa951143820ecd717..f17c72885dccf68618067b7ce0155e8cb78313ff 100644 (file)
--- a/src/pitch/pitchfcomb.h
+++ b/src/pitch/pitchfcomb.h
@@ -47,7 +47,7 @@ typedef struct _aubio_pitchfcomb_t aubio_pitchfcomb_t;
   \param input input signal window (length as specified at creation time) 
  
 */
-smpl_t aubio_pitchfcomb_detect (aubio_pitchfcomb_t *p, fvec_t * input);
+smpl_t aubio_pitchfcomb_do (aubio_pitchfcomb_t *p, fvec_t * input);
 /** creation of the pitch detection object
  
   \param bufsize size of the input buffer to analyse 

diff --git a/src/pitch/pitchmcomb.c b/src/pitch/pitchmcomb.c
index cf284b7ac3ba6e9d9c5807e675a723422ecfbb70..ca1cc1303a40c132599d55b996cf7bd4185ec709 100644 (file)
--- a/src/pitch/pitchmcomb.c
+++ b/src/pitch/pitchmcomb.c
@@ -89,7 +89,7 @@ struct _aubio_spectralcandidate_t {
 };
 
 
-smpl_t aubio_pitchmcomb_detect(aubio_pitchmcomb_t * p, cvec_t * fftgrain) {
+smpl_t aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, cvec_t * fftgrain) {
   uint_t i=0,j;
   smpl_t instfreq;
   fvec_t * newmag = (fvec_t *)p->newmag;

diff --git a/src/pitch/pitchmcomb.h b/src/pitch/pitchmcomb.h
index 492c35ecd69cabef721f968172fda91fc42f8e16..9185a7f298cf40ded9a2e83edc2905362a46ba30 100644 (file)
--- a/src/pitch/pitchmcomb.h
+++ b/src/pitch/pitchmcomb.h
@@ -48,7 +48,7 @@ typedef struct _aubio_pitchmcomb_t aubio_pitchmcomb_t;
   \param fftgrain input signal spectrum as computed by aubio_pvoc_do 
  
 */
-smpl_t aubio_pitchmcomb_detect(aubio_pitchmcomb_t * p, cvec_t * fftgrain);
+smpl_t aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, cvec_t * fftgrain);
 /** select the best candidates */
 uint_t aubio_pitch_cands(aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands);
 /** creation of the pitch detection object

diff --git a/src/pitch/pitchschmitt.c b/src/pitch/pitchschmitt.c
index fee4ca879a43d6cf71f3b3ee5c2911d7e11adf5e..b1c0ededf6995ef6deb2b329a0db327e8f7f5881 100644 (file)
--- a/src/pitch/pitchschmitt.c
+++ b/src/pitch/pitchschmitt.c
@@ -42,7 +42,7 @@ aubio_pitchschmitt_t * new_aubio_pitchschmitt (uint_t size, uint_t samplerate)
   return p;
 }
 
-smpl_t aubio_pitchschmitt_detect (aubio_pitchschmitt_t *p, fvec_t * input)
+smpl_t aubio_pitchschmitt_do (aubio_pitchschmitt_t *p, fvec_t * input)
 {
   uint_t i;
   for (i=0; i<input->length; i++) {

diff --git a/src/pitch/pitchschmitt.h b/src/pitch/pitchschmitt.h
index 8a3192e268275fdf8f4fe95b788b318adc0e2733..d134888003a90e48596b993630c13e6d90f35ab6 100644 (file)
--- a/src/pitch/pitchschmitt.h
+++ b/src/pitch/pitchschmitt.h
@@ -47,7 +47,7 @@ typedef struct _aubio_pitchschmitt_t aubio_pitchschmitt_t;
   \param input input signal window (length as specified at creation time) 
  
 */
-smpl_t aubio_pitchschmitt_detect (aubio_pitchschmitt_t *p, fvec_t * input);
+smpl_t aubio_pitchschmitt_do (aubio_pitchschmitt_t *p, fvec_t * input);
 /** creation of the pitch detection object
  
   \param size size of the input buffer to analyse 

diff --git a/src/pitch/pitchyinfft.c b/src/pitch/pitchyinfft.c
index 0c4120959934eab4a6adb0cffea1e951a8c016ad..c53e283a19854dfb9bff033719e282193128e172 100644 (file)
--- a/src/pitch/pitchyinfft.c
+++ b/src/pitch/pitchyinfft.c
@@ -87,7 +87,7 @@ aubio_pitchyinfft_t * new_aubio_pitchyinfft (uint_t bufsize)
   return p;
 }
 
-smpl_t aubio_pitchyinfft_detect(aubio_pitchyinfft_t * p, fvec_t * input, smpl_t tol) {
+smpl_t aubio_pitchyinfft_do (aubio_pitchyinfft_t * p, fvec_t * input, smpl_t tol) {
   uint_t tau, l = 0;
   uint_t halfperiod;
   smpl_t tmp = 0, sum = 0;

diff --git a/src/pitch/pitchyinfft.h b/src/pitch/pitchyinfft.h
index cccacd6dc2bcbf0239f84e78d4decf2fab5ac0c8..155fcdca0b578e62d9e678c4b118b12d07b9886b 100644 (file)
--- a/src/pitch/pitchyinfft.h
+++ b/src/pitch/pitchyinfft.h
@@ -48,7 +48,7 @@ typedef struct _aubio_pitchyinfft_t aubio_pitchyinfft_t;
   \param tol tolerance parameter for minima selection [default 0.85] 
  
 */
-smpl_t aubio_pitchyinfft_detect (aubio_pitchyinfft_t *p, fvec_t * input, smpl_t tol);
+smpl_t aubio_pitchyinfft_do (aubio_pitchyinfft_t *p, fvec_t * input, smpl_t tol);
 /** creation of the pitch detection object
  
   \param bufsize size of the input buffer to analyse 

diff --git a/swig/aubio.i b/swig/aubio.i
index d51e3c5f898551ed0f27852e573150b5ffe71d04..939d835ff8e0aea3b4f1962c1f0bb54fd93275c1 100644 (file)
--- a/swig/aubio.i
+++ b/swig/aubio.i
@@ -162,7 +162,7 @@ smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate);
 
 /* filterbank */
 aubio_filterbank_t * new_aubio_filterbank(uint_t win_s, uint_t channels);
-void aubio_filterbank_set_mel_coeffs(aubio_filterbank_t *fb, fvec_t *freqs, uint_t samplerate);
+void aubio_filterbank_set_mel_coeffs(aubio_filterbank_t *fb, uint_t samplerate, fvec_t *freqs);
 void aubio_filterbank_set_mel_coeffs_slaney(aubio_filterbank_t *fb, uint_t samplerate);
 void del_aubio_filterbank(aubio_filterbank_t * fb);
 void aubio_filterbank_do(aubio_filterbank_t * fb, cvec_t * in, fvec_t *out);
@@ -232,7 +232,7 @@ typedef enum {
         aubio_pitchm_bin
 } aubio_pitchdetection_mode;
 
-smpl_t aubio_pitchdetection(aubio_pitchdetection_t * p, fvec_t * ibuf);
+smpl_t aubio_pitchdetection_do (aubio_pitchdetection_t * p, fvec_t * ibuf);
 
 void aubio_pitchdetection_set_yinthresh(aubio_pitchdetection_t *p, smpl_t thres);
 
@@ -248,7 +248,7 @@ aubio_pitchdetection_t * new_aubio_pitchdetection(uint_t bufsize,
 
 /* pitch mcomb */
 aubio_pitchmcomb_t * new_aubio_pitchmcomb(uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);
-smpl_t aubio_pitchmcomb_detect(aubio_pitchmcomb_t * p, cvec_t * fftgrain);
+smpl_t aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, cvec_t * fftgrain);
 uint_t aubio_pitch_cands(aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands);
 void del_aubio_pitchmcomb (aubio_pitchmcomb_t *p);
 
@@ -260,12 +260,12 @@ smpl_t aubio_pitchyin_getpitchfast(fvec_t * input, fvec_t *yin, smpl_t tol);
 
 /* pitch schmitt */
 aubio_pitchschmitt_t * new_aubio_pitchschmitt (uint_t size, uint_t samplerate);
-smpl_t aubio_pitchschmitt_detect (aubio_pitchschmitt_t *p, fvec_t * input);
+smpl_t aubio_pitchschmitt_do (aubio_pitchschmitt_t *p, fvec_t * input);
 void del_aubio_pitchschmitt (aubio_pitchschmitt_t *p);
 
 /* pitch fcomb */
 aubio_pitchfcomb_t * new_aubio_pitchfcomb (uint_t size, uint_t hopsize, uint_t samplerate);
-smpl_t aubio_pitchfcomb_detect (aubio_pitchfcomb_t *p, fvec_t * input);
+smpl_t aubio_pitchfcomb_do (aubio_pitchfcomb_t *p, fvec_t * input);
 void del_aubio_pitchfcomb (aubio_pitchfcomb_t *p);
 
 /* peakpicker */