Changes in / [af27265:eadd8d5]

Files:

• src/io/sink_sndfile.c (modified) (2 diffs)
• tests/src/io/test-sink.c (modified) (2 diffs)

src/io/sink_sndfile.c

@@ -71 +71 @@
     /* show libsndfile err msg */
     AUBIO_ERR("Failed opening %s. %s\n", s->path, sf_strerror (NULL));
-    AUBIO_FREE(s);
     return NULL;
   }     
@@ -80 +79 @@
     AUBIO_ERR("%d x %d exceeds maximum aubio_sink_sndfile buffer size %d\n",
         s->max_size, s->channels, MAX_CHANNELS * MAX_CHANNELS);
-    AUBIO_FREE(s);
     return NULL;
   }

tests/src/io/test-sink.c

@@ -9 +9 @@
     err = 2;
     PRINT_ERR("not enough arguments\n");
-    PRINT_MSG("usage: %s <input_path> <output_path> [samplerate] [hop_size]\n", argv[0]);
+    PRINT_MSG("usage: %s <input_path> <output_path> [samplerate]\n", argv[0]);
     return err;
   }
 
+  uint_t samplerate = 44100;
+  uint_t hop_size = 512;
+  uint_t n_frames = 0, read = 0;
+
   char_t *source_path = argv[1];
   char_t *sink_path = argv[2];
-
-  uint_t samplerate = 0;
-  uint_t hop_size = 256;
-  if ( argc >= 4 ) samplerate = atoi(argv[3]);
-  if ( argc >= 5 ) hop_size = atoi(argv[4]);
-  if ( argc >= 6 ) {
-    err = 2;
-    PRINT_ERR("too many arguments\n");
-    return err;
-  }
+  if ( argc == 4 ) samplerate = atoi(argv[3]);
 
   fvec_t *vec = new_fvec(hop_size);
-  if (!vec) { err = 1; goto beach_fvec; }
+  aubio_source_t *i = new_aubio_source(source_path, samplerate, hop_size);
+  if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(i);
+  aubio_sink_t *o = new_aubio_sink(sink_path, samplerate);
 
-  aubio_source_t *i = new_aubio_source(source_path, samplerate, hop_size);
-  if (!i) { err = 1; goto beach_source; }
-
-  if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(i);
-
-  aubio_sink_t *o = new_aubio_sink(sink_path, samplerate);
-  if (!o) { err = 1; goto beach_sink; }
-
-  uint_t n_frames = 0, read = 0;
+  if (!i || !o) { err = 1; goto beach; }
 
   do {
@@ -45 +34 @@
   } while ( read == hop_size );
 
-  PRINT_MSG("read %d frames at %dHz (%d blocks) from %s written to %s\n",
-      n_frames, samplerate, n_frames / hop_size,
-      source_path, sink_path);
+  PRINT_MSG("wrote %d frames at %dHz from %s written to %s\n",
+      n_frames, samplerate, source_path, sink_path);
 
+beach:
+  del_aubio_source(i);
   del_aubio_sink(o);
-beach_sink:
-  del_aubio_source(i);
-beach_source:
   del_fvec(vec);
-beach_fvec:
   return err;
 }