shithub: aubio

Info  •  Files  •  Log  •  Branches

Merge branch 'fix/negative_samplerate'

--- a/src/io/source_wavread.c

+++ b/src/io/source_wavread.c

@@ -195,8 +195,8 @@

     goto beach;

   }

-  if ( sr == 0 ) {

-    AUBIO_ERR("source_wavread: Failed opening %s (samplerate can not be 0)\n", s->path);

+  if ( (sint_t)sr <= 0 ) {

+    AUBIO_ERR("source_wavread: Failed opening %s (samplerate can not be <= 0)\n", s->path);

     goto beach;

   }

--- a/src/notes/notes.c

+++ b/src/notes/notes.c

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

   o->onset_output = new_fvec (1);

   o->pitch = new_aubio_pitch (pitch_method, o->pitch_buf_size, o->hop_size, o->samplerate);

+  if (o->pitch == NULL) goto fail;

   if (o->pitch_tolerance != 0.) aubio_pitch_set_tolerance (o->pitch, o->pitch_tolerance);

   aubio_pitch_set_unit (o->pitch, "midi");

   o->pitch_output = new_fvec (1);