Changeset d4791e5

Timestamp:

Jan 3, 2014, 12:47:22 AM (10 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:

2e01060

Parents:

89e9e71 (diff), 4fe62ba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop

Files:

• examples/aubiomfcc.c (modified) (2 diffs)
• examples/aubionotes.c (modified) (3 diffs)
• examples/aubioonset.c (modified) (2 diffs)
• examples/aubiopitch.c (modified) (2 diffs)
• examples/aubioquiet.c (modified) (1 diff)
• examples/aubiotrack.c (modified) (1 diff)
• examples/parse_args.h (modified) (2 diffs)
• examples/utils.c (modified) (4 diffs)
• examples/utils.h (modified) (2 diffs)
• src/aubio_priv.h (modified) (2 diffs)
• src/cvec.c (modified) (1 diff)
• src/fmat.c (modified) (3 diffs)
• src/fvec.c (modified) (1 diff)
• src/io/sink_sndfile.c (modified) (4 diffs)
• src/io/source_avcodec.c (modified) (2 diffs)
• src/io/source_sndfile.c (modified) (2 diffs)
• src/lvec.c (modified) (2 diffs)
• src/mathutils.c (modified) (4 diffs)
• src/onset/peakpicker.c (modified) (1 diff)
• src/pitch/pitch.c (modified) (1 diff)
• src/pitch/pitchspecacf.c (modified) (2 diffs)
• src/pitch/pitchyinfft.c (modified) (2 diffs)
• src/spectral/filterbank_mel.c (modified) (7 diffs)
• src/spectral/mfcc.c (modified) (2 diffs)
• src/spectral/ooura_fft8g.c (modified) (1 diff)
• src/spectral/phasevoc.c (modified) (2 diffs)
• src/spectral/statistics.c (modified) (1 diff)
• src/synth/wavetable.c (modified) (4 diffs)
• src/tempo/beattracking.c (modified) (2 diffs)
• src/tempo/tempo.c (modified) (1 diff)
• src/temporal/a_weighting.c (modified) (1 diff)
• src/temporal/biquad.c (modified) (1 diff)
• src/temporal/c_weighting.c (modified) (1 diff)
• tests/src/onset/test-peakpicker.c (modified) (1 diff)
• tests/src/pitch/test-pitch.c (modified) (1 diff)
• tests/src/pitch/test-pitchfcomb.c (modified) (1 diff)
• tests/src/pitch/test-pitchmcomb.c (modified) (1 diff)
• tests/src/pitch/test-pitchschmitt.c (modified) (1 diff)
• tests/src/pitch/test-pitchspecacf.c (modified) (1 diff)
• tests/src/pitch/test-pitchyin.c (modified) (1 diff)
• tests/src/pitch/test-pitchyinfft.c (modified) (1 diff)
• tests/src/spectral/test-fft.c (modified) (1 diff)
• tests/src/spectral/test-filterbank.c (modified) (1 diff)
• tests/src/spectral/test-filterbank_mel.c (modified) (1 diff)
• tests/src/spectral/test-mfcc.c (modified) (1 diff)
• tests/src/spectral/test-phasevoc.c (modified) (1 diff)
• tests/src/spectral/test-specdesc.c (modified) (1 diff)
• tests/src/spectral/test-tss.c (modified) (1 diff)
• tests/src/tempo/test-beattracking.c (modified) (1 diff)
• tests/src/temporal/test-a_weighting.c (modified) (1 diff)
• tests/src/temporal/test-biquad.c (modified) (1 diff)
• tests/src/temporal/test-c_weighting.c (modified) (1 diff)
• tests/src/temporal/test-filter.c (modified) (1 diff)
• tests/src/temporal/test-resampler.c (modified) (1 diff)
• tests/src/test-cvec.c (modified) (1 diff)
• tests/src/test-delnull.c (modified) (1 diff)
• tests/src/test-fmat.c (modified) (1 diff)
• tests/src/test-fvec.c (modified) (1 diff)
• tests/src/test-lvec.c (modified) (1 diff)
• tests/src/test-mathutils-window.c (modified) (1 diff)
• tests/src/test-mathutils.c (modified) (5 diffs)
• tests/src/utils/test-hist.c (modified) (1 diff)
• tests/src/utils/test-parameter.c (modified) (2 diffs)
• tests/src/utils/test-scale.c (modified) (1 diff)
• tests/utils_tests.h (modified) (1 diff)
• wscript (modified) (2 diffs)

examples/aubiomfcc.c

@@ -30 +30 @@
 uint_t n_coefs = 13;
 
-static void
-process_block(fvec_t *ibuf, fvec_t *obuf) {
+void process_block (fvec_t *ibuf, fvec_t *obuf)
+{
   fvec_zeros(obuf);
   //compute mag spectrum
@@ -39 +39 @@
 }
 
-static void process_print (void) {
+void process_print (void)
+{
   /* output times in seconds and extracted mfccs */
   outmsg("%f\t",blocks*hop_size/(float)samplerate);

examples/aubionotes.c

@@ -46 +46 @@
 uint_t get_note (fvec_t * note_buffer, fvec_t * note_buffer2);
 
-static void
-process_block(fvec_t *ibuf, fvec_t *obuf) {
+void process_block (fvec_t *ibuf, fvec_t *obuf)
+{
+  smpl_t new_pitch, curlevel;
   fvec_zeros(obuf);
   aubio_onset_do(o, ibuf, onset);
 
   aubio_pitch_do (pitch, ibuf, pitch_obuf);
-  smpl_t new_pitch = fvec_get_sample(pitch_obuf, 0);
+  new_pitch = fvec_get_sample(pitch_obuf, 0);
   if(median){
     note_append(note_buffer, new_pitch);
@@ -58 +59 @@
 
   /* curlevel is negatif or 1 if silence */
-  smpl_t curlevel = aubio_level_detection(ibuf, silence_threshold);
+  curlevel = aubio_level_detection(ibuf, silence_threshold);
   if (fvec_get_sample(onset, 0)) {
     /* test for silence */
@@ -95 +96 @@
 }
 
-static void
-process_print (void) {
+void process_print (void)
+{
   //if (verbose) outmsg("%f\n",pitch_obuf->data[0]);
 }

examples/aubioonset.c

@@ -30 +30 @@
 smpl_t is_onset;
 
-void
-process_block(fvec_t *ibuf, fvec_t *obuf) {
-  fvec_zeros(obuf);
+void process_block(fvec_t *ibuf, fvec_t *obuf)
+{
   aubio_onset_do (o, ibuf, onset);
   is_onset = fvec_get_sample(onset, 0);
+  if ( !usejack && ! sink_uri ) return;
+  fvec_zeros(obuf);
   if ( is_onset ) {
     aubio_wavetable_play ( wavetable );
@@ -46 +47 @@
 }
 
-void
-process_print (void)
+void process_print (void)
 {
   if ( is_onset ) {

examples/aubiopitch.c

@@ -29 +29 @@
 fvec_t *pitch;
 
-void
-process_block(fvec_t * ibuf, fvec_t * obuf) {
+void process_block(fvec_t * ibuf, fvec_t * obuf)
+{
+  smpl_t freq;
+  aubio_pitch_do (o, ibuf, pitch);
+  if ( !usejack && ! sink_uri ) return;
   fvec_zeros(obuf);
-  aubio_pitch_do (o, ibuf, pitch);
-  smpl_t freq = fvec_get_sample(pitch, 0);
+  freq = fvec_get_sample(pitch, 0);
   aubio_wavetable_set_amp ( wavetable, aubio_level_lin (ibuf) );
   aubio_wavetable_set_freq ( wavetable, freq );
-
   if (mix_input)
     aubio_wavetable_do (wavetable, ibuf, obuf);
@@ -43 +44 @@
 }
 
-void
-process_print (void) {
+void process_print (void)
+{
   smpl_t pitch_found = fvec_get_sample(pitch, 0);
   outmsg("%f %f\n",(blocks)

examples/aubioquiet.c

@@ -37 +37 @@
 }
 
-static void process_print (void) {
+void process_print (void) {
   int curblocks = (blocks - 4) > 0 ? blocks - 4 : 0;
   if (issilence == -1) {

examples/aubiotrack.c

@@ -36 +36 @@
   if (silence_threshold != -90.)
     is_silence = aubio_silence_detection(ibuf, silence_threshold);
+  if ( !usejack && ! sink_uri ) return;
   fvec_zeros (obuf);
   if ( is_beat && !is_silence ) {

examples/parse_args.h

@@ -48 +48 @@
 extern void examples_common_process (aubio_process_func_t process_func,
     aubio_print_func_t print);
+int parse_args (int argc, char **argv);
 
 // internal stuff
@@ -57 +58 @@
 const char *prog_name;
 
-void
-usage (FILE * stream, int exit_code)
+void usage (FILE * stream, int exit_code);
+
+void usage (FILE * stream, int exit_code)
 {
   fprintf (stream, "usage: %s [ options ] \n", prog_name);

examples/utils.c

@@ -73 +73 @@
 #endif
 
-void
-examples_common_init (int argc, char **argv)
+void examples_common_init (int argc, char **argv);
+void examples_common_del (void);
+void examples_common_process (aubio_process_func_t process_func,
+    aubio_print_func_t print);
+
+void examples_common_init (int argc, char **argv)
 {
 
@@ -116 +120 @@
 }
 
-void
-examples_common_del (void)
+void examples_common_del (void)
 {
   del_fvec (ibuf);
@@ -126 +129 @@
 }
 
-void
-examples_common_process (aubio_process_func_t process_func,
+void examples_common_process (aubio_process_func_t process_func,
     aubio_print_func_t print)
 {
@@ -146 +148 @@
 
   } else {
-    /* phasevoc */
+
+    uint_t total_read = 0;
     blocks = 0;
-    uint_t total_read = 0;
 
     do {

examples/utils.h

@@ -42 +42 @@
 #define debug(...)                fprintf (stderr, format , **args)
 #else
-#define debug(...)                ()
+#define debug(...)
 #endif
 #define verbmsg(format, args...)  if (verbose) fprintf(stderr, format , ##args)
@@ -54 +54 @@
 /** common process function */
 typedef int (*aubio_process_func_t) (fvec_t * input, fvec_t * output);
+
+void process_block (fvec_t *ibuf, fvec_t *obuf);
+void process_print (void);

src/aubio_priv.h

@@ -34 +34 @@
  */
 
-#if 1 //HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #if HAVE_STDLIB_H
@@ -47 +45 @@
 
 /* must be included before fftw3.h */
-#if HAVE_COMPLEX_H
+#ifdef HAVE_COMPLEX_H
 #include <complex.h>
 #endif
 
-#if HAVE_FFTW3 || HAVE_FFTW3F
+#if defined(HAVE_FFTW3) || defined(HAVE_FFTW3F)
 #include <fftw3.h>
 #endif
 
-#if HAVE_MATH_H
+#ifdef HAVE_MATH_H
 #include <math.h>
 #endif
 
-#if HAVE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 
-#if HAVE_LIMITS_H
+#ifdef HAVE_LIMITS_H
 #include <limits.h> // for CHAR_BIT, in C99 standard
 #endif

src/cvec.c

@@ -23 +23 @@
 
 cvec_t * new_cvec( uint_t length) {
+  cvec_t * s;
   if ((sint_t)length <= 0) {
     return NULL;
   }
-  cvec_t * s = AUBIO_NEW(cvec_t);
+  s = AUBIO_NEW(cvec_t);
   s->length = length/2 + 1;
   s->norm = AUBIO_ARRAY(smpl_t,s->length);

src/fmat.c

@@ -23 +23 @@
 
 fmat_t * new_fmat (uint_t height, uint_t length) {
+  fmat_t * s;
+  uint_t i,j;
   if ((sint_t)length <= 0 || (sint_t)height <= 0 ) {
     return NULL;
   }
-  fmat_t * s = AUBIO_NEW(fmat_t);
-  uint_t i,j;
+  s = AUBIO_NEW(fmat_t);
   s->height = height;
   s->length = length;
@@ -127 +128 @@
 
 void fmat_copy(fmat_t *s, fmat_t *t) {
+  uint_t i;
+#if !HAVE_MEMCPY_HACKS
+  uint_t i,j;
+#endif
   if (s->height != t->height) {
     AUBIO_ERR("trying to copy %d rows to %d rows \n",
@@ -138 +143 @@
   }
 #if HAVE_MEMCPY_HACKS
-  uint_t i;
   for (i=0; i< s->height; i++) {
     memcpy(t->data[i], s->data[i], t->length * sizeof(smpl_t));
   }
 #else
-  uint_t i,j;
   for (i=0; i< t->height; i++) {
     for (j=0; j< t->length; j++) {

src/fvec.c

@@ -23 +23 @@
 
 fvec_t * new_fvec( uint_t length) {
+  fvec_t * s;
   if ((sint_t)length <= 0) {
     return NULL;
   }
-  fvec_t * s = AUBIO_NEW(fvec_t);
+  s = AUBIO_NEW(fvec_t);
   s->length = length;
   s->data = AUBIO_ARRAY(smpl_t, s->length);

src/io/sink_sndfile.c

@@ -47 +47 @@
 aubio_sink_sndfile_t * new_aubio_sink_sndfile(char_t * path, uint_t samplerate) {
   aubio_sink_sndfile_t * s = AUBIO_NEW(aubio_sink_sndfile_t);
+  SF_INFO sfinfo;
 
   if (path == NULL) {
@@ -59 +60 @@
 
   /* set output format */
-  SF_INFO sfinfo;
   AUBIO_MEMSET(&sfinfo, 0, sizeof (sfinfo));
   sfinfo.samplerate = s->samplerate;
@@ -92 +92 @@
   int nsamples = channels*write;
   smpl_t *pwrite;
+  sf_count_t written_frames;
 
   if (write > s->max_size) {
@@ -107 +108 @@
   }
 
-  sf_count_t written_frames = sf_write_float (s->handle, s->scratch_data, nsamples);
+  written_frames = sf_write_float (s->handle, s->scratch_data, nsamples);
   if (written_frames/channels != write) {
     AUBIO_WRN("trying to write %d frames to %s, but only %d could be written",

src/io/source_avcodec.c

@@ -62 +62 @@
 // hack to create or re-create the context the first time _do or _do_multi is called
 void aubio_source_avcodec_reset_resampler(aubio_source_avcodec_t * s, uint_t multi);
+void aubio_source_avcodec_readframe(aubio_source_avcodec_t *s, uint_t * read_samples);
 
 aubio_source_avcodec_t * new_aubio_source_avcodec(char_t * path, uint_t samplerate, uint_t hop_size) {
@@ -279 +280 @@
         (uint8_t **)avFrame->data, in_linesize, in_samples);
   if (out_samples <= 0) {
-    AUBIO_ERR("No sample found while converting frame (%s)\n", s->path);
+    //AUBIO_ERR("No sample found while converting frame (%s)\n", s->path);
     goto beach;
   }

src/io/source_sndfile.c

@@ -64 +64 @@
 aubio_source_sndfile_t * new_aubio_source_sndfile(char_t * path, uint_t samplerate, uint_t hop_size) {
   aubio_source_sndfile_t * s = AUBIO_NEW(aubio_source_sndfile_t);
+  SF_INFO sfinfo;
 
   if (path == NULL) {
@@ -83 +84 @@
 
   // try opening the file, getting the info in sfinfo
-  SF_INFO sfinfo;
   AUBIO_MEMSET(&sfinfo, 0, sizeof (sfinfo));
   s->handle = sf_open (s->path, SFM_READ, &sfinfo);

src/lvec.c

@@ -23 +23 @@
 
 lvec_t * new_lvec( uint_t length) {
+  lvec_t * s;
   if ((sint_t)length <= 0) {
     return NULL;
   }
-  lvec_t * s = AUBIO_NEW(lvec_t);
+  s = AUBIO_NEW(lvec_t);
   s->length = length;
   s->data = AUBIO_ARRAY(lsmp_t, s->length);
@@ -37 +38 @@
 }
 
-void lvec_write_sample(lvec_t *s, lsmp_t data, uint_t position) {
+void lvec_set_sample(lvec_t *s, lsmp_t data, uint_t position) {
   s->data[position] = data;
 }
+
 lsmp_t lvec_get_sample(lvec_t *s, uint_t position) {
   return s->data[position];

src/mathutils.c

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

src/onset/peakpicker.c

@@ -166 +166 @@
 
 aubio_peakpicker_t *
-new_aubio_peakpicker ()
+new_aubio_peakpicker (void)
 {
   aubio_peakpicker_t *t = AUBIO_NEW (aubio_peakpicker_t);

src/pitch/pitch.c

@@ -367 +367 @@
 aubio_pitch_do_specacf (aubio_pitch_t * p, fvec_t * ibuf, fvec_t * out)
 {
+  smpl_t pitch = 0., period;
   aubio_pitch_slideblock (p, ibuf);
   aubio_pitchspecacf_do (p->p_object, p->buf, out);
   //out->data[0] = aubio_bintofreq (out->data[0], p->samplerate, p->bufsize);
-  smpl_t pitch = 0., period = out->data[0];
+  period = out->data[0];
   if (period > 0) {
     pitch = p->samplerate / period;

src/pitch/pitchspecacf.c

@@ -57 +57 @@
 aubio_pitchspecacf_do (aubio_pitchspecacf_t * p, fvec_t * input, fvec_t * output)
 {
-  uint_t l;
+  uint_t l, tau;
   fvec_t *fftout = p->fftout;
   // window the input
@@ -75 +75 @@
   }
   // get the minimum
-  uint_t tau = fvec_min_elem (p->acf);
+  tau = fvec_min_elem (p->acf);
   // get the interpolated minimum
   output->data[0] = fvec_quadratic_peak_pos (p->acf, tau) * 2.;

src/pitch/pitchyinfft.c

@@ -58 +58 @@
 new_aubio_pitchyinfft (uint_t samplerate, uint_t bufsize)
 {
+  uint_t i = 0, j = 1;
+  smpl_t freq = 0, a0 = 0, a1 = 0, f0 = 0, f1 = 0;
   aubio_pitchyinfft_t *p = AUBIO_NEW (aubio_pitchyinfft_t);
   p->winput = new_fvec (bufsize);
@@ -67 +69 @@
   p->win = new_aubio_window ("hanningz", bufsize);
   p->weight = new_fvec (bufsize / 2 + 1);
-  uint_t i = 0, j = 1;
-  smpl_t freq = 0, a0 = 0, a1 = 0, f0 = 0, f1 = 0;
   for (i = 0; i < p->weight->length; i++) {
     freq = (smpl_t) i / (smpl_t) bufsize *(smpl_t) samplerate;

src/spectral/filterbank_mel.c

@@ -25 +25 @@
 #include "cvec.h"
 #include "spectral/filterbank.h"
+#include "spectral/filterbank_mel.h"
 #include "mathutils.h"
 
@@ -34 +35 @@
   fmat_t *filters = aubio_filterbank_get_coeffs (fb);
   uint_t n_filters = filters->height, win_s = filters->length;
+  fvec_t *lower_freqs, *upper_freqs, *center_freqs;
+  fvec_t *triangle_heights, *fft_freqs;
 
   uint_t fn;                    /* filter counter */
   uint_t bin;                   /* bin counter */
+
+  smpl_t riseInc, downInc;
 
   /* freqs define the bands of triangular overlapping windows.
@@ -56 +61 @@
 
   /* convenience reference to lower/center/upper frequency for each triangle */
-  fvec_t *lower_freqs = new_fvec (n_filters);
-  fvec_t *upper_freqs = new_fvec (n_filters);
-  fvec_t *center_freqs = new_fvec (n_filters);
+  lower_freqs = new_fvec (n_filters);
+  upper_freqs = new_fvec (n_filters);
+  center_freqs = new_fvec (n_filters);
 
   /* height of each triangle */
-  fvec_t *triangle_heights = new_fvec (n_filters);
+  triangle_heights = new_fvec (n_filters);
 
   /* lookup table of each bin frequency in hz */
-  fvec_t *fft_freqs = new_fvec (win_s);
+  fft_freqs = new_fvec (win_s);
 
   /* fill up the lower/center/upper */
@@ -112 +117 @@
 
     /* compute positive slope step size */
-    smpl_t riseInc =
+    riseInc =
         triangle_heights->data[fn] /
         (center_freqs->data[fn] - lower_freqs->data[fn]);
@@ -128 +133 @@
 
     /* compute negative slope step size */
-    smpl_t downInc =
+    downInc =
         triangle_heights->data[fn] /
         (upper_freqs->data[fn] - center_freqs->data[fn]);
@@ -176 +181 @@
   uint_t fn;                    /* filter counter */
 
+  smpl_t lastlinearCF;
+
   /* buffers to compute filter frequencies */
   fvec_t *freqs = new_fvec (n_filters + 2);
@@ -183 +190 @@
     freqs->data[fn] = lowestFrequency + fn * linearSpacing;
   }
-  smpl_t lastlinearCF = freqs->data[fn - 1];
+  lastlinearCF = freqs->data[fn - 1];
 
   /* second step: fill all the log filter frequencies */

src/spectral/mfcc.c

@@ -52 +52 @@
   /* allocate space for mfcc object */
   aubio_mfcc_t *mfcc = AUBIO_NEW (aubio_mfcc_t);
+  smpl_t scaling;
 
   uint_t i, j;
@@ -71 +72 @@
   /* compute DCT transform dct_coeffs[i][j] as
      cos ( j * (i+.5) * PI / n_filters ) */
-  smpl_t scaling = 1. / SQRT (n_filters / 2.);
+  scaling = 1. / SQRT (n_filters / 2.);
   for (i = 0; i < n_filters; i++) {
     for (j = 0; j < n_coefs; j++) {

src/spectral/ooura_fft8g.c

@@ -1 @@
-// 2 modifications made for aubio:
+// modifications made for aubio:
 //  - replace all 'double' with 'smpl_t'
 //  - include "aubio_priv.h" (for config.h and types.h)
+//  - add missing prototypes
 
 #include "aubio_priv.h"
+
+void cdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
+void rdft(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
+void ddct(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
+void ddst(int n, int isgn, smpl_t *a, int *ip, smpl_t *w);
+void dfct(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w);
+void dfst(int n, smpl_t *a, smpl_t *t, int *ip, smpl_t *w);
+void makewt(int nw, int *ip, smpl_t *w);
+void makect(int nc, int *ip, smpl_t *c);
+void bitrv2(int n, int *ip, smpl_t *a);
+void bitrv2conj(int n, int *ip, smpl_t *a);
+void cftfsub(int n, smpl_t *a, smpl_t *w);
+void cftbsub(int n, smpl_t *a, smpl_t *w);
+void cft1st(int n, smpl_t *a, smpl_t *w);
+void cftmdl(int n, int l, smpl_t *a, smpl_t *w);
+void rftfsub(int n, smpl_t *a, int nc, smpl_t *c);
+void rftbsub(int n, smpl_t *a, int nc, smpl_t *c);
+void dctsub(int n, smpl_t *a, int nc, smpl_t *c);
+void dstsub(int n, smpl_t *a, int nc, smpl_t *c);
 
 /*

src/spectral/phasevoc.c

@@ -120 +120 @@
     const smpl_t * datanew, uint_t win_s, uint_t hop_s)
 {
+#if !HAVE_MEMCPY_HACKS
   uint_t i;
   for (i = 0; i < win_s - hop_s; i++)
@@ -127 +128 @@
   for (i = 0; i < win_s - hop_s; i++)
     dataold[i] = data[i + hop_s];
+#else
+  memcpy(data, dataold, (win_s - hop_s) * sizeof(smpl_t));
+  data += win_s - hop_s;
+  memcpy(data, datanew, hop_s * sizeof(smpl_t));
+  data -= win_s - hop_s;
+  data += hop_s;
+  memcpy(dataold, data, (win_s - hop_s) * sizeof(smpl_t));
+#endif
 }
 

src/spectral/statistics.c

@@ -22 +22 @@
 #include "cvec.h"
 #include "spectral/specdesc.h"
+
+void aubio_specdesc_centroid (aubio_specdesc_t * o, cvec_t * spec,
+    fvec_t * desc);
+void aubio_specdesc_spread (aubio_specdesc_t * o, cvec_t * spec,
+    fvec_t * desc);
+void aubio_specdesc_skewness (aubio_specdesc_t * o, cvec_t * spec,
+    fvec_t * desc);
+void aubio_specdesc_kurtosis (aubio_specdesc_t * o, cvec_t * spec,
+    fvec_t * desc);
+void aubio_specdesc_slope (aubio_specdesc_t * o, cvec_t * spec,
+    fvec_t * desc);
+void aubio_specdesc_decrease (aubio_specdesc_t * o, cvec_t * spec,
+    fvec_t * desc);
+void aubio_specdesc_rolloff (aubio_specdesc_t * o, cvec_t * spec,
+    fvec_t * desc);
+
+
+smpl_t cvec_sum (cvec_t * s);
+smpl_t cvec_mean (cvec_t * s);
+smpl_t cvec_centroid (cvec_t * s);
+smpl_t cvec_moment (cvec_t * s, uint_t moment);
 
 smpl_t

src/synth/wavetable.c

@@ -43 +43 @@
 aubio_wavetable_t *new_aubio_wavetable(uint_t samplerate, uint_t blocksize)
 {
+  uint_t i = 0;
   aubio_wavetable_t *s = AUBIO_NEW(aubio_wavetable_t);
   if ((sint_t)samplerate <= 0) {
@@ -48 +49 @@
     goto beach;
   }
-  uint_t i = 0;
   s->samplerate = samplerate;
   s->blocksize = blocksize;
@@ -115 +115 @@
     for (j = 0; j < output->length; j++) {
       smpl_t inc = aubio_parameter_get_next_value( s->freq );
+      smpl_t amp = aubio_parameter_get_next_value ( s->amp );
       inc *= (smpl_t)(s->wavetable_length) / (smpl_t) (s->samplerate);
       pos += inc;
@@ -120 +121 @@
         pos -= s->wavetable_length;
       }
-      smpl_t amp = aubio_parameter_get_next_value ( s->amp );
       for (i = 0; i < output->height; i++) {
         output->data[i][j] = amp * interp_2(s->wavetable, pos);

src/tempo/beattracking.c

@@ -62 +62 @@
   aubio_beattracking_t *p = AUBIO_NEW (aubio_beattracking_t);
   uint_t i = 0;
-  p->hop_size = hop_size;
-  p->samplerate = samplerate;
   /* default value for rayleigh weighting - sets preferred tempo to 120bpm */
   smpl_t rayparam = 60. * samplerate / 120. / hop_size;
@@ -73 +71 @@
   uint_t step = winlen / 4;     /* 1.5 seconds */
 
+  p->hop_size = hop_size;
+  p->samplerate = samplerate;
   p->lastbeat = 0;
   p->counter = 0;

src/tempo/tempo.c

@@ -28 +28 @@
 #include "mathutils.h"
 #include "tempo/tempo.h"
+
+// TODO implement get/set_delay
+
+/** set current delay
+
+  \param o beat tracking object
+
+  \return current delay, in samples
+
+ */
+uint_t aubio_tempo_get_delay(aubio_tempo_t * o);
+
+/** set current delay
+
+  \param o beat tracking object
+  \param delay delay to set tempo to, in samples
+
+  \return `0` if successful, non-zero otherwise
+
+ */
+uint_t aubio_tempo_set_delay(aubio_tempo_t * o, uint_t delay);
 
 /* structure to store object state */

src/temporal/a_weighting.c

@@ -29 +29 @@
 aubio_filter_set_a_weighting (aubio_filter_t * f, uint_t samplerate)
 {
+  uint_t order; lsmp_t *a, *b; lvec_t *as, *bs;
   aubio_filter_set_samplerate (f, samplerate);
-  lvec_t *bs = aubio_filter_get_feedforward (f);
-  lvec_t *as = aubio_filter_get_feedback (f);
-  lsmp_t *b = bs->data, *a = as->data;
-  uint_t order = aubio_filter_get_order (f);
+  bs = aubio_filter_get_feedforward (f);
+  as = aubio_filter_get_feedback (f);
+  b = bs->data, a = as->data;
+  order = aubio_filter_get_order (f);
 
   if (order != 7) {

src/temporal/biquad.c

@@ -23 +23 @@
 #include "lvec.h"
 #include "temporal/filter.h"
+#include "temporal/biquad.h"
 
 uint_t

src/temporal/c_weighting.c

@@ -29 +29 @@
 aubio_filter_set_c_weighting (aubio_filter_t * f, uint_t samplerate)
 {
+  uint_t order; lsmp_t *a, *b; lvec_t *as, *bs;
   aubio_filter_set_samplerate (f, samplerate);
-  lvec_t *bs = aubio_filter_get_feedforward (f);
-  lvec_t *as = aubio_filter_get_feedback (f);
-  lsmp_t *b = bs->data, *a = as->data;
-  uint_t order = aubio_filter_get_order (f);
+  bs = aubio_filter_get_feedforward (f);
+  as = aubio_filter_get_feedback (f);
+  b = bs->data, a = as->data;
+  order = aubio_filter_get_order (f);
 
   if ( order != 5 ) {

tests/src/onset/test-peakpicker.c

@@ -3 +3 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t win_s = 1024; // window size

tests/src/pitch/test-pitch.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   // 1. allocate some memory

tests/src/pitch/test-pitchfcomb.c

@@ -6 +6 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t i = 0;

tests/src/pitch/test-pitchmcomb.c

@@ -6 +6 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t n = 10; // compute n times

tests/src/pitch/test-pitchschmitt.c

@@ -6 +6 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t n = 10; // compute n times

tests/src/pitch/test-pitchspecacf.c

@@ -6 +6 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t n = 10; // compute n times

tests/src/pitch/test-pitchyin.c

@@ -6 +6 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t n = 10; // compute n times

tests/src/pitch/test-pitchyinfft.c

@@ -6 +6 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t n = 10; // compute n times

tests/src/spectral/test-fft.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t win_s = 8; // window size

tests/src/spectral/test-filterbank.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t win_s = 1024; // window size

tests/src/spectral/test-filterbank_mel.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t samplerate = 16000; // samplerate of signal to filter

tests/src/spectral/test-mfcc.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t win_s = 512; // fft size

tests/src/spectral/test-phasevoc.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t n = 6; // compute n times

tests/src/spectral/test-specdesc.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t win_s = 1024; // window size

tests/src/spectral/test-tss.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t n = 10; // compute n times

tests/src/tempo/test-beattracking.c

@@ -4 +4 @@
 #include <stdio.h>
 
-int main ()
+int main (void)
 {
   uint_t i = 0;

tests/src/temporal/test-a_weighting.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   

tests/src/temporal/test-biquad.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t win_s = 64; // window size

tests/src/temporal/test-c_weighting.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   aubio_filter_t * f;

tests/src/temporal/test-filter.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t win_s = 16; // window size

tests/src/temporal/test-resampler.c

@@ -1 +1 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t win_s = 1024; // window size

tests/src/test-cvec.c

@@ -2 +2 @@
 #include "utils_tests.h"
 
-int main ()
+int main (void)
 {
   uint_t i, window_size = 16; // window size

tests/src/test-delnull.c

@@ -5 +5 @@
 // Programs that call these functions should check for null pointers.
 
-int main ()
+int main (void)
 {
   del_fvec(NULL);

tests/src/test-fmat.c

@@ -5 +5 @@
 // and j the column.
 
-int main ()
+int main (void)
 {
   uint_t height = 3, length = 9, i, j;

tests/src/test-fvec.c

@@ -2 +2 @@
 #include <assert.h>
 
-int main ()
+int main (void)
 {
   uint_t vec_size = 10, i;

tests/src/test-lvec.c

@@ -1 +1 @@
 #include <aubio.h>
+#include "utils_tests.h"
 
-int main()
+int main (void)
 {
-  uint_t win_s = 1024; // window size
+  uint_t win_s = 32; // window size
   lvec_t * sp = new_lvec (win_s); // input buffer
+  lvec_set_sample (sp, 2./3., 0);
+  PRINT_MSG("%lf\n", lvec_get_sample (sp, 0));
+  lvec_print (sp);
+  lvec_ones (sp);
+  lvec_print (sp);
+  lvec_set_all (sp, 3./5.);
+  lvec_print (sp);
   del_lvec(sp);
   return 0;

tests/src/test-mathutils-window.c

@@ -3 +3 @@
 #include <stdio.h>
 
-int main ()
+int main (void)
 {
   uint_t length = 0;

tests/src/test-mathutils.c

@@ -4 +4 @@
 #include <aubio.h>
 
-int test_next_power_of_two()
+int test_next_power_of_two (void);
+int test_miditofreq (void);
+int test_freqtomidi (void);
+int test_aubio_window (void);
+
+int test_next_power_of_two (void)
 {
   uint_t a, b;
@@ -25 +30 @@
 }
 
-int test_miditofreq()
+int test_miditofreq (void)
 {
   smpl_t a, b;
@@ -56 +61 @@
 }
 
-int test_freqtomidi()
+int test_freqtomidi (void)
 {
   smpl_t midi, freq;
@@ -88 +93 @@
 }
 
-int test_aubio_window()
+int test_aubio_window (void)
 {
   uint_t window_size = 16;
@@ -108 +113 @@
 }
 
-int main ()
+int main (void)
 {
   test_next_power_of_two();

tests/src/utils/test-hist.c

@@ -3 +3 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t length;

tests/src/utils/test-parameter.c

@@ -1 +1 @@
 #include <aubio.h>
 #include "utils_tests.h"
+
+void get_some_steps ( aubio_parameter_t * param );
 
 void get_some_steps ( aubio_parameter_t * param )
@@ -21 +23 @@
 }
 
-int main ()
+int main (void)
 {
   smpl_t max_value = 100.;

tests/src/utils/test-scale.c

@@ -3 +3 @@
 #include <aubio.h>
 
-int main ()
+int main (void)
 {
   uint_t n = 0;

tests/utils_tests.h

@@ -27 +27 @@
 #endif
 
-void utils_init_random () {
+void utils_init_random (void);
+
+void utils_init_random (void) {
   time_t now = time(0);
   struct tm *tm_struct = localtime(&now);

wscript

@@ -86 +86 @@
     ctx.load('gnu_dirs')
 
-    ctx.env.CFLAGS += ['-g', '-Wall', '-Wextra']
-
     target_platform = Options.platform
     if ctx.options.target_platform:
         target_platform = ctx.options.target_platform
     ctx.env['DEST_OS'] = target_platform
+
+    if 'CL.exe' not in ctx.env.CC[0]:
+        ctx.env.CFLAGS += ['-g', '-Wall', '-Wextra']
+    else:
+        ctx.env.CFLAGS += ['-Wall']
 
     if target_platform not in ['win32', 'win64']:
@@ -152 +155 @@
     if ctx.check_cc(fragment = check_c99_varargs,
             type='cstlib',
-            msg = 'Checking for C99 __VA_ARGS__ macro'):
+            msg = 'Checking for C99 __VA_ARGS__ macro',
+            mandatory = False):
         ctx.define('HAVE_C99_VARARGS_MACROS', 1)