Changes in / [ce323e4:1cf031a]

Files:

• src/onset/onset.c (modified) (3 diffs)
• tests/src/onset/test-onset.c (modified) (3 diffs)

src/onset/onset.c

@@ -257 +257 @@
   o->pp = new_aubio_peakpicker();
   o->od = new_aubio_specdesc(onset_mode,buf_size);
+  if (o->od == NULL) goto beach_specdesc;
   o->fftgrain = new_cvec(buf_size);
   o->desc = new_fvec(1);
   o->spectral_whitening = new_aubio_spectral_whitening(buf_size, hop_size, samplerate);
 
-  if (!o->pv || !o->pp || !o->od || !o->fftgrain
-      || !o->desc || !o->spectral_whitening)
-    goto beach;
-
   /* initialize internal variables */
   aubio_onset_set_default_parameters (o, onset_mode);
@@ -271 +268 @@
   return o;
 
+beach_specdesc:
+  del_aubio_peakpicker(o->pp);
+  del_aubio_pvoc(o->pv);
 beach:
-  del_aubio_onset(o);
+  AUBIO_FREE(o);
   return NULL;
 }
@@ -340 +340 @@
 void del_aubio_onset (aubio_onset_t *o)
 {
-  if (o->spectral_whitening)
-    del_aubio_spectral_whitening(o->spectral_whitening);
-  if (o->od)
-    del_aubio_specdesc(o->od);
-  if (o->pp)
-    del_aubio_peakpicker(o->pp);
-  if (o->pv)
-    del_aubio_pvoc(o->pv);
-  if (o->desc)
-    del_fvec(o->desc);
-  if (o->fftgrain)
-    del_cvec(o->fftgrain);
+  del_aubio_spectral_whitening(o->spectral_whitening);
+  del_aubio_specdesc(o->od);
+  del_aubio_peakpicker(o->pp);
+  del_aubio_pvoc(o->pv);
+  del_fvec(o->desc);
+  del_cvec(o->fftgrain);
   AUBIO_FREE(o);
 }

tests/src/onset/test-onset.c

@@ -1 +1 @@
 #include <aubio.h>
 #include "utils_tests.h"
-
-int test_wrong_params(void);
 
 int main (int argc, char **argv)
@@ -9 +7 @@
   if (argc < 2) {
     err = 2;
-    PRINT_WRN("no arguments, running tests\n");
-    if (test_wrong_params() != 0) {
-      PRINT_ERR("tests failed!\n");
-      err = 1;
-    } else {
-      err = 0;
-    }
+    PRINT_ERR("not enough arguments\n");
+    PRINT_MSG("read a wave file as a mono vector\n");
     PRINT_MSG("usage: %s <source_path> [samplerate] [hop_size]\n", argv[0]);
     return err;
@@ -68 +61 @@
   return err;
 }
-
-int test_wrong_params(void)
-{
-  uint_t win_size = 1024;
-  uint_t hop_size = win_size / 2;
-  uint_t samplerate = 44100;
-  // hop_size < 1
-  if (new_aubio_onset("default", 5, 0, samplerate))
-    return 1;
-  // buf_size < 2
-  if (new_aubio_onset("default", 1, 1, samplerate))
-    return 1;
-  // buf_size < hop_size
-  if (new_aubio_onset("default", hop_size, win_size, samplerate))
-    return 1;
-  // samplerate < 1
-  if (new_aubio_onset("default", 1024, 512, 0))
-    return 1;
-
-  // specdesc creation failed
-  if (new_aubio_onset("abcd", win_size, win_size/2, samplerate))
-    return 1;
-  // pv creation failed
-  if (new_aubio_onset("default", 5, 2, samplerate))
-    return 1;
-
-  aubio_onset_t *o;
-  o = new_aubio_onset("default", win_size, hop_size, samplerate);
-  if (!aubio_onset_set_default_parameters(o, "wrong_type"))
-    return 1;
-  del_aubio_onset(o);
-
-  return 0;
-}