shithub: aubio

Info  •  Files  •  Log  •  Branches

src/utils/scale.c: rename aubio_scale_set to aubio_scale_set_limits

--- a/src/utils/hist.c

+++ b/src/utils/hist.c

@@ -113,7 +113,7 @@

   smpl_t step = (ihig-ilow)/(smpl_t)(s->nelems);

   /* readapt */

-  aubio_scale_set(s->scaler, ilow, ihig, 0, s->nelems);

+  aubio_scale_set_limits (s->scaler, ilow, ihig, 0, s->nelems);

   /* recalculate centers */

   s->cent->data[0][0] = ilow + 0.5f * step;

--- a/src/utils/scale.c

+++ b/src/utils/scale.c

@@ -39,7 +39,7 @@

 aubio_scale_t * new_aubio_scale (smpl_t ilow, smpl_t ihig, 

     smpl_t olow, smpl_t ohig) {

   aubio_scale_t * s = AUBIO_NEW(aubio_scale_t);

-  aubio_scale_set (s, ilow, ihig, olow, ohig);

+  aubio_scale_set_limits (s, ilow, ihig, olow, ohig);

   return s;

 }

@@ -47,7 +47,7 @@

   AUBIO_FREE(s);

 }

-void aubio_scale_set (aubio_scale_t *s, smpl_t ilow, smpl_t ihig,

+void aubio_scale_set_limits (aubio_scale_t *s, smpl_t ilow, smpl_t ihig,

     smpl_t olow, smpl_t ohig) {

   smpl_t inputrange = ihig - ilow;

   smpl_t outputrange= ohig - olow;

--- a/src/utils/scale.h

+++ b/src/utils/scale.h

@@ -68,7 +68,7 @@

   \param ihig higher value of output function

 */

-void aubio_scale_set (aubio_scale_t *s, smpl_t ilow, smpl_t ihig,

+void aubio_scale_set_limits (aubio_scale_t *s, smpl_t ilow, smpl_t ihig,

     smpl_t olow, smpl_t ohig);

 #ifdef __cplusplus

--- a/swig/aubio.i

+++ b/swig/aubio.i

@@ -175,7 +175,7 @@

 /* scale */

 extern aubio_scale_t * new_aubio_scale(smpl_t flow, smpl_t fhig, smpl_t ilow, smpl_t ihig);

-extern void aubio_scale_set (aubio_scale_t *s, smpl_t ilow, smpl_t ihig, smpl_t olow, smpl_t ohig);

+extern void aubio_scale_set_limits (aubio_scale_t *s, smpl_t ilow, smpl_t ihig, smpl_t olow, smpl_t ohig);

 extern void aubio_scale_do(aubio_scale_t *s, fvec_t * input);

 extern void del_aubio_scale(aubio_scale_t *s);

@@ -240,7 +240,6 @@

 /* pitch mcomb */

 aubio_pitchmcomb_t * new_aubio_pitchmcomb(uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);

 smpl_t aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, cvec_t * fftgrain);

-uint_t aubio_pitch_cands(aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands);

 void del_aubio_pitchmcomb (aubio_pitchmcomb_t *p);

 /* pitch yin */

--- a/tests/src/test-scale.c

+++ b/tests/src/test-scale.c

@@ -6,7 +6,7 @@

         uint_t channels   = 1;                          /* number of channel */

         fvec_t * in       = new_fvec (win_s, channels); /* input buffer */

         aubio_scale_t * o = new_aubio_scale(0,1,2,3);

-        aubio_scale_set(o,0,1,2,3);

+        aubio_scale_set_limits (o,0,1,2,3);

         uint_t i = 0;

         while (i < 1000) {