Changeset 0ce97483

Timestamp:

Oct 7, 2009, 11:19:36 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:

277918b

Parents:

01b8fcc

Message:

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

Files:

• src/utils/hist.c (modified) (1 diff)
• src/utils/scale.c (modified) (2 diffs)
• src/utils/scale.h (modified) (1 diff)
• swig/aubio.i (modified) (2 diffs)
• tests/src/test-scale.c (modified) (1 diff)

src/utils/hist.c

@@ -114 +114 @@
 
   /* readapt */
-  aubio_scale_set(s->scaler, ilow, ihig, 0, s->nelems);
+  aubio_scale_set_limits (s->scaler, ilow, ihig, 0, s->nelems);
 
   /* recalculate centers */

src/utils/scale.c

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

src/utils/scale.h

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

swig/aubio.i

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

tests/src/test-scale.c

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