Changes in tests/src/io/base-sink_custom.h [43ea60d:05774ba3]

File:

• tests/src/io/base-sink_custom.h (modified) (2 diffs)

tests/src/io/base-sink_custom.h

@@ -26 +26 @@
   char_t *sink_path = argv[2];
 
-  aubio_source_t *src = NULL;
-  aubio_sink_custom_t *snk = NULL;
-
   if ( argc >= 4 ) samplerate = atoi(argv[3]);
   if ( argc >= 5 ) hop_size = atoi(argv[4]);
 
   fvec_t *vec = new_fvec(hop_size);
-  if (!vec) { err = 1; goto failure; }
 
-  src = new_aubio_source(source_path, samplerate, hop_size);
-  if (!src) { err = 1; goto failure; }
-  if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(src);
+  aubio_source_t *i = new_aubio_source(source_path, samplerate, hop_size);
+  if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(i);
 
-  snk = new_aubio_sink_custom(sink_path, samplerate);
-  if (!snk) { err = 1; goto failure; }
+  aubio_sink_custom_t *o = new_aubio_sink_custom(sink_path, samplerate);
+
+  if (!vec || !i || !o) { err = 1; goto failure; }
 
   do {
-    aubio_source_do(src, vec, &read);
-    aubio_sink_custom_do(snk, vec, read);
+    aubio_source_do(i, vec, &read);
+    aubio_sink_custom_do(o, vec, read);
     n_frames += read;
   } while ( read == hop_size );
@@ -53 +49 @@
 
   // close sink now (optional)
-  aubio_sink_custom_close(snk);
+  aubio_sink_custom_close(o);
 
 failure:
-  if (snk)
-    del_aubio_sink_custom(snk);
-  if (src)
-    del_aubio_source(src);
+  if (o)
+    del_aubio_sink_custom(o);
+  if (i)
+    del_aubio_source(i);
   if (vec)
     del_fvec(vec);