Changes in src/mathutils.c [5644069:ca45e58]

File:

• src/mathutils.c (modified) (4 diffs)

src/mathutils.c

@@ -50 +50 @@
 {
   fvec_t * win = new_fvec (length);
-  uint_t err;
   if (win == NULL) {
     return NULL;
   }
-  err = fvec_set_window (win, window_type);
+  uint_t err = fvec_set_window (win, window_type);
   if (err != 0) {
     del_fvec(win);
@@ -418 +417 @@
 
 smpl_t fvec_quadratic_peak_pos (fvec_t * x, uint_t pos) {
-  smpl_t s0, s1, s2; uint_t x0, x2;
+  smpl_t s0, s1, s2;
   if (pos == 0 || pos == x->length - 1) return pos;
-  x0 = (pos < 1) ? pos : pos - 1;
-  x2 = (pos + 1 < x->length) ? pos + 1 : pos;
+  uint_t x0 = (pos < 1) ? pos : pos - 1;
+  uint_t x2 = (pos + 1 < x->length) ? pos + 1 : pos;
   if (x0 == pos) return (x->data[pos] <= x->data[x2]) ? pos : x2;
   if (x2 == pos) return (x->data[pos] <= x->data[x0]) ? pos : x0;
@@ -449 +448 @@
 aubio_freqtomidi (smpl_t freq)
 {
-  smpl_t midi;
   if (freq < 2. || freq > 100000.) return 0.; // avoid nans and infs
   /* log(freq/A-2)/log(2) */
-  midi = freq / 6.875;
+  smpl_t midi = freq / 6.875;
   midi = LOG (midi) / 0.69314718055995;
   midi *= 12;
@@ -462 +460 @@
 aubio_miditofreq (smpl_t midi)
 {
-  smpl_t freq;
   if (midi > 140.) return 0.; // avoid infs
-  freq = (midi + 3.) / 12.;
+  smpl_t freq = (midi + 3.) / 12.;
   freq = EXP (freq * 0.69314718055995);
   freq *= 6.875;