Changes in tests/src/io/test-source_multi.c [a06ab19:59c4e5d]

File:

• tests/src/io/test-source_multi.c (modified) (4 diffs)

tests/src/io/test-source_multi.c

@@ -17 +17 @@
     PRINT_MSG(" - read file.wav at original samplerate with 4096 blocks\n");
     PRINT_MSG("       %s file.wav 0 4096 \n", argv[0]);
-    PRINT_MSG(" - read file.wav at original samplerate with 256 frames blocks, mono\n");
-    PRINT_MSG("       %s file.wav 0 4096 1\n", argv[0]);
     return err;
   }
@@ -25 +23 @@
   uint_t hop_size = 256;
   uint_t n_frames = 0, read = 0;
-  uint_t n_channels = 0;
-  if ( argc >= 3 ) samplerate = atoi(argv[2]);
-  if ( argc >= 4 ) hop_size   = atoi(argv[3]);
-  if ( argc >= 5 ) n_channels = atoi(argv[4]);
+  if ( argc == 3 ) samplerate = atoi(argv[2]);
+  if ( argc == 4 ) hop_size = atoi(argv[3]);
 
   char_t *source_path = argv[1];
@@ -35 +31 @@
   if (!s) { err = -1; goto beach; }
 
-  if ( samplerate == 0 ) samplerate = aubio_source_get_samplerate(s);
+  if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(s);
 
-  if ( n_channels == 0 ) n_channels = aubio_source_get_channels(s);
-
-  fmat_t *mat = new_fmat(hop_size, n_channels);
+  fmat_t *mat = new_fmat(hop_size, aubio_source_get_channels(s) );
 
   do {
@@ -47 +41 @@
   } while ( read == hop_size );
 
-  PRINT_MSG("read %d frames in %d channels at %dHz (%d blocks) from %s\n",
-      n_frames, n_channels, samplerate, n_frames / hop_size, source_path);
+  PRINT_MSG("read %d frames at %dHz (%d blocks) from %s\n", n_frames, samplerate,
+    n_frames / hop_size, source_path);
 
   del_fmat (mat);