Changeset 3da8187 for examples

Timestamp:

Dec 7, 2013, 5:22:21 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

61ecd1a

Parents:

466dff3

Message:

examples/: remove -o and -j when unused

Location:

examples

Files:

• aubionotes.c (modified) (1 diff)
• aubioonset.c (modified) (2 diffs)
• aubiopitch.c (modified) (2 diffs)
• aubiotrack.c (modified) (2 diffs)
• parse_args.h (modified) (6 diffs)
• utils.c (modified) (1 diff)

examples/aubionotes.c

@@ -23 +23 @@
 #define PROG_HAS_PITCH 1
 #define PROG_HAS_ONSET 1
+#define PROG_HAS_JACK 1
+// TODO add PROG_HAS_OUTPUT
 #include "parse_args.h"
 

examples/aubioonset.c

@@ -21 +21 @@
 #include "utils.h"
 #define PROG_HAS_ONSET 1
+#define PROG_HAS_OUTPUT 1
+#define PROG_HAS_JACK 1
 #include "parse_args.h"
 
@@ -36 +38 @@
     aubio_wavetable_stop ( wavetable );
   }
-  aubio_wavetable_do (wavetable, obuf, obuf);
+  if (mix_input)
+    aubio_wavetable_do (wavetable, ibuf, obuf);
+  else
+    aubio_wavetable_do (wavetable, obuf, obuf);
 }
 

examples/aubiopitch.c

@@ -21 +21 @@
 #include "utils.h"
 #define PROG_HAS_PITCH 1
+#define PROG_HAS_OUTPUT 1
+#define PROG_HAS_JACK 1
 #include "parse_args.h"
 
@@ -33 +35 @@
   smpl_t freq = fvec_read_sample(pitch, 0);
   aubio_wavetable_set_amp ( wavetable, aubio_level_lin (ibuf) );
-  if (freq != 0.0) {
-    aubio_wavetable_set_freq ( wavetable, freq );
-  } else {
-    aubio_wavetable_set_freq ( wavetable, 0.0 );
-  }
-  aubio_wavetable_do (wavetable, obuf, obuf);
+  aubio_wavetable_set_freq ( wavetable, freq );
+
+  if (mix_input)
+    aubio_wavetable_do (wavetable, ibuf, obuf);
+  else
+    aubio_wavetable_do (wavetable, obuf, obuf);
 }
 

examples/aubiotrack.c

@@ -21 +21 @@
 #include "utils.h"
 #define PROG_HAS_TEMPO 1
+#define PROG_HAS_OUTPUT 1
+#define PROG_HAS_JACK 1
 #include "parse_args.h"
 
@@ -39 +41 @@
     aubio_wavetable_stop ( wavetable );
   }
-  aubio_wavetable_do (wavetable, obuf, obuf);
+  if (mix_input)
+    aubio_wavetable_do (wavetable, ibuf, obuf);
+  else
+    aubio_wavetable_do (wavetable, obuf, obuf);
 }
 

examples/parse_args.h

@@ -63 +63 @@
       "       -h      --help             display this message\n"
       "       -v      --verbose          be verbose\n"
-#ifdef HAVE_JACK
+#ifdef PROG_HAS_JACK
       "       -j      --jack             use Jack\n"
 #endif
       "       -i      --input            input type\n"
+#ifdef PROG_HAS_OUTPUT
       "       -o      --output           output type\n"
+#endif
       "       -r      --samplerate       select samplerate\n"
       "       -B      --bufsize          set buffer size\n"
@@ -81 +83 @@
 #endif /* PROG_HAS_PITCH */
       "       -s      --silence          select silence threshold\n"
+#ifdef PROG_HAS_OUTPUT
       "       -m      --mix-input        mix input signal with output signal\n"
+#endif
       );
   exit (exit_code);
@@ -90 +94 @@
 {
   const char *options = "hv"
-#ifdef HAVE_JACK
+    "i:r:B:H:"
+#ifdef PROG_HAS_JACK
     "j"
-#endif
-    "i:o:r:B:H:"
+#endif /* PROG_HAS_JACK */
+#ifdef PROG_HAS_OUTPUT
+    "o:"
+#endif /* PROG_HAS_OUTPUT */
 #ifdef PROG_HAS_ONSET
     "O:t:"
@@ -105 +112 @@
     {"help",                  0, NULL, 'h'},
     {"verbose",               0, NULL, 'v'},
-#ifdef HAVE_JACK
-    {"jack",                  0, NULL, 'j'},
-#endif
     {"input",                 1, NULL, 'i'},
-    {"output",                1, NULL, 'o'},
     {"samplerate",            1, NULL, 'r'},
     {"bufsize",               1, NULL, 'B'},
     {"hopsize",               1, NULL, 'H'},
+#ifdef PROG_HAS_JACK
+    {"jack",                  0, NULL, 'j'},
+#endif /* PROG_HAS_JACK */
+#ifdef PROG_HAS_OUTPUT
+    {"output",                1, NULL, 'o'},
+#endif /* PROG_HAS_OUTPUT */
 #ifdef PROG_HAS_ONSET
     {"onset",                 1, NULL, 'O'},
@@ -191 +200 @@
   while (next_option != -1);
 
+  // if unique, use the non option argument as the source
   if ( source_uri == NULL ) {
     if (argc - optind == 1) {
@@ -203 +213 @@
   }
 
-  if (source_uri != NULL) {
-    debug ("Input file : %s\n", source_uri);
-  } else if (source_uri != NULL && sink_uri != NULL) {
-    debug ("Input file : %s\n", source_uri);
-    debug ("Output file : %s\n", sink_uri);
-  } else {
+  // if no source, show a message
+  if (source_uri == NULL) {
 #if HAVE_JACK
-    debug ("Jack input output\n");
+    verbmsg("No input source given, using jack\n");
     usejack = 1;
 #else

examples/utils.c

@@ -186 +186 @@
 #endif
   if (velo == 0) {
-    outmsg ("%f\n", blocks * hop_size / (float) samplerate);
+    verbmsg ("%f\n", blocks * hop_size / (float) samplerate);
   } else {
-    outmsg ("%f\t%f\t", mpitch, blocks * hop_size / (float) samplerate);
+    verbmsg ("%f\t%f\t", mpitch, blocks * hop_size / (float) samplerate);
   }
 }