src/mathutils.c: rename vec_mean to fvec_mean

diff --git a/src/mathutils.c b/src/mathutils.c
index 13e0b948079f7ee5921821a9aad524a95aab2e70..5334d6c7c7f2605c58444970065c8dfd189b24e6 100644 (file)
--- a/src/mathutils.c
+++ b/src/mathutils.c
@@ -83,7 +83,7 @@ smpl_t aubio_unwrap2pi(smpl_t phase) {
   return phase + TWO_PI * (1. + FLOOR(-(phase+PI)/TWO_PI));
 }
 
-smpl_t vec_mean(fvec_t *s) {
+smpl_t fvec_mean(fvec_t *s) {
   uint_t i,j;
   smpl_t tmp = 0.0f;
   for (i=0; i < s->channels; i++)

diff --git a/src/mathutils.h b/src/mathutils.h
index 59f3342d191318868a73a33d150c2af3feeee82d..1fd05dd9802559f72c8f7f266336142903e07571 100644 (file)
--- a/src/mathutils.h
+++ b/src/mathutils.h
@@ -67,7 +67,7 @@ smpl_t aubio_unwrap2pi (smpl_t phase);
  *
  * \bug mono 
  */
-smpl_t vec_mean(fvec_t *s);
+smpl_t fvec_mean(fvec_t *s);
 /** returns the max of a vector
  *
  * \bug mono 

diff --git a/src/onset/onsetdetection.c b/src/onset/onsetdetection.c
index 2b5dc1a6af5b3365f48afb6a910b93ab85f0d6d1..ffcc03129bd9c6c322f7e2fc22717cd58549d79d 100644 (file)
--- a/src/onset/onsetdetection.c
+++ b/src/onset/onsetdetection.c
@@ -119,7 +119,7 @@ void aubio_onsetdetection_phase(aubio_onsetdetection_t *o,
     aubio_hist_weight(o->histog);
     /* its mean is the result */
     onset->data[i][0] = aubio_hist_mean(o->histog);  
-    //onset->data[i][0] = vec_mean(o->dev1);
+    //onset->data[i][0] = fvec_mean(o->dev1);
   }
 }
 

diff --git a/src/onset/peakpick.c b/src/onset/peakpick.c
index 6b320bd183bcc3175dd47421e8ec32db9dee89c6..8ec845915442cdddb7457797ae84c36dc6fdbeee 100644 (file)
--- a/src/onset/peakpick.c
+++ b/src/onset/peakpick.c
@@ -93,7 +93,7 @@ uint_t aubio_peakpick_pimrt(fvec_t * onset,  aubio_pickpeak_t * p) {
 
        /* calculate mean and median for onset_proc */
        /* for (i=0;i<onset_proc->channels;i++) { */
-       mean = vec_mean(onset_proc);
+       mean = fvec_mean(onset_proc);
        /* copy to scratch */
        for (j = 0; j < length; j++)
                scratch->data[i][j] = onset_proc->data[i][j];
@@ -160,7 +160,7 @@ aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold) {
        t->win_post  = 5;
        t->win_pre   = 1;
 
-       t->thresholdfn = (aubio_thresholdfn_t)(vec_median); /* (vec_mean); */
+       t->thresholdfn = (aubio_thresholdfn_t)(vec_median); /* (fvec_mean); */
        t->pickerfn = (aubio_pickerfn_t)(vec_peakpick);
 
        t->scratch = new_fvec(t->win_post+t->win_pre+1,1);

diff --git a/swig/aubio.i b/swig/aubio.i
index 8ed5dc181ef830bd5293d9868ea435034da4a4e8..b3a2a65109f3d5ed0d7c0f63db156d25dd26ffed 100644 (file)
--- a/swig/aubio.i
+++ b/swig/aubio.i
@@ -129,7 +129,7 @@ typedef enum {
 
 fvec_t * new_aubio_window(uint_t size, aubio_window_type wintype);
 smpl_t aubio_unwrap2pi (smpl_t phase);
-smpl_t vec_mean(fvec_t *s);
+smpl_t fvec_mean(fvec_t *s);
 smpl_t vec_max(fvec_t *s);
 smpl_t vec_min(fvec_t *s);
 uint_t vec_min_elem(fvec_t *s);