Changeset 1294862 for src/pitch/pitchdetection.c

Timestamp:

Oct 7, 2009, 7:33:51 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:

e5e693e

Parents:

1b88289

Message:

src/pitch/: change all _detect prototypes to _do

File:

• src/pitch/pitchdetection.c (modified) (4 diffs)

src/pitch/pitchdetection.c

@@ -196 +196 @@
 }
 
-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);
 }
@@ -204 +204 @@
   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.) {
@@ -230 +230 @@
   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.);
@@ -241 +241 @@
 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);
+}