Changeset 8b28524

Timestamp:

Oct 2, 2009, 1:05:26 AM (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:

d57c879

Parents:

47eabeb

Message:

src/mathutils.c: rename vec_mean to fvec_mean

Files:

• src/mathutils.c (modified) (1 diff)
• src/mathutils.h (modified) (1 diff)
• src/onset/onsetdetection.c (modified) (1 diff)
• src/onset/peakpick.c (modified) (2 diffs)
• swig/aubio.i (modified) (1 diff)

src/mathutils.c

@@ -84 +84 @@
 }
 
-smpl_t vec_mean(fvec_t *s) {
+smpl_t fvec_mean(fvec_t *s) {
   uint_t i,j;
   smpl_t tmp = 0.0f;

src/mathutils.h

@@ -68 +68 @@
  * \bug mono 
  */
-smpl_t vec_mean(fvec_t *s);
+smpl_t fvec_mean(fvec_t *s);
 /** returns the max of a vector
  *

src/onset/onsetdetection.c

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

src/onset/peakpick.c

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

swig/aubio.i

@@ -130 +130 @@
 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);