src/tempo/tempo.{c,h}: rename aubio_tempo to aubio_tempo_do

diff --git a/examples/aubiotrack.c b/examples/aubiotrack.c
index 819bfc9575b15d61f12aaedb0b7afcf640662c9a..65a7a33080fa76b06e6b86214ddccf4e0b693e92 100644 (file)
--- a/examples/aubiotrack.c
+++ b/examples/aubiotrack.c
@@ -41,7 +41,7 @@ int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
     /*time for fft*/
     if (pos == overlap_size-1) {         
       /* block loop */
-      aubio_tempo(bt,ibuf,out);
+      aubio_tempo_do (bt,ibuf,out);
       if (out->data[0][0]>=1) 
         istactus = out->data[0][0];
       else 

diff --git a/plugins/puredata/aubiotempo~.c b/plugins/puredata/aubiotempo~.c
index 7fd34a368ef02272d01b3bffc1986b8d49580d73..8bc5aa442bfdc21364d0db9e05e8e66a089ee29b 100644 (file)
--- a/plugins/puredata/aubiotempo~.c
+++ b/plugins/puredata/aubiotempo~.c
@@ -43,7 +43,7 @@ static t_int *aubiotempo_tilde_perform(t_int *w)
     /*time for fft*/
     if (x->pos == x->hopsize-1) {         
       /* block loop */
-      aubio_tempo (x->t, x->vec, x->output);
+      aubio_tempo_do (x->t, x->vec, x->output);
       if (x->output->data[0][0]) {
         outlet_bang(x->tempobang);
       }

diff --git a/src/tempo/tempo.c b/src/tempo/tempo.c
index 16346a23102d08e683d3fc82e0e1371e1920a34f..6b7a7d438e7a78ac842f50a5e210663cf661725a 100644 (file)
--- a/src/tempo/tempo.c
+++ b/src/tempo/tempo.c
@@ -45,7 +45,7 @@ struct _aubio_tempo_t {
 };
 
 /* execute tempo detection function on iput buffer */
-void aubio_tempo(aubio_tempo_t *o, fvec_t * input, fvec_t * tempo)
+void aubio_tempo_do(aubio_tempo_t *o, fvec_t * input, fvec_t * tempo)
 {
   uint_t i;
   uint_t winlen = o->winlen;

diff --git a/src/tempo/tempo.h b/src/tempo/tempo.h
index ef3021895bab92c6e89dfd51e470b8801ed36e26..0c3f7721c0c4f187f75b3eca528817a722c4e464 100644 (file)
--- a/src/tempo/tempo.h
+++ b/src/tempo/tempo.h
@@ -41,7 +41,7 @@ aubio_tempo_t * new_aubio_tempo (aubio_onsetdetection_type type_onset,
     uint_t buf_size, uint_t hop_size, uint_t channels);
 
 /** execute tempo detection */
-void aubio_tempo(aubio_tempo_t *o, fvec_t * input, fvec_t * tempo);
+void aubio_tempo_do (aubio_tempo_t *o, fvec_t * input, fvec_t * tempo);
 
 /** set tempo detection silence threshold  */
 void aubio_tempo_set_silence(aubio_tempo_t * o, smpl_t silence);

diff --git a/tests/src/test-tempo.c b/tests/src/test-tempo.c
index 0b7133322ced06fa8627baf4b86a9bb08d50ff78..0c1ee25fd36e2a39907aa15b2f9eeea6537e97de 100644 (file)
--- a/tests/src/test-tempo.c
+++ b/tests/src/test-tempo.c
@@ -13,7 +13,7 @@ int main(){
         smpl_t curtempo, curtempoconf;
 
         while (i < 1000) {
-          aubio_tempo(o,in,out);
+          aubio_tempo_do(o,in,out);
           curtempo = aubio_tempo_get_bpm(o);
           if (curtempo != 0.) {
             fprintf(stdout,"%f\n",curtempo);