Changeset 1294862 for src

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

Location:

src/pitch

Files:

• pitchdetection.c (modified) (4 diffs)
• pitchdetection.h (modified) (1 diff)
• pitchfcomb.c (modified) (1 diff)
• pitchfcomb.h (modified) (1 diff)
• pitchmcomb.c (modified) (1 diff)
• pitchmcomb.h (modified) (1 diff)
• pitchschmitt.c (modified) (1 diff)
• pitchschmitt.h (modified) (1 diff)
• pitchyinfft.c (modified) (1 diff)
• pitchyinfft.h (modified) (1 diff)

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);
+}

src/pitch/pitchdetection.h

@@ -59 +59 @@
 
 */
-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

src/pitch/pitchfcomb.c

@@ -59 +59 @@
 
 /* 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;

src/pitch/pitchfcomb.h

@@ -48 +48 @@
  
 */
-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
  

src/pitch/pitchmcomb.c

@@ -90 +90 @@
 
 
-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;

src/pitch/pitchmcomb.h

@@ -49 +49 @@
  
 */
-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);

src/pitch/pitchschmitt.c

@@ -43 +43 @@
 }
 
-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;

src/pitch/pitchschmitt.h

@@ -48 +48 @@
  
 */
-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
  

src/pitch/pitchyinfft.c

@@ -88 +88 @@
 }
 
-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;

src/pitch/pitchyinfft.h

@@ -49 +49 @@
  
 */
-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