Changeset 1437b5c

Timestamp:

Nov 28, 2016, 4:16:20 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

7e8b276

Parents:

5ee8dd3

git-author:

Paul Brossier <piem@piem.org> (10/03/16 18:41:10)

git-committer:

Paul Brossier <piem@piem.org> (11/28/16 16:16:20)

Message:

examples/: use PROG_HAS_OUTPUT, add PROG_HAS_SILENCE

Location:

examples

Files:

• aubionotes.c (modified) (1 diff)
• aubioonset.c (modified) (1 diff)
• aubiopitch.c (modified) (1 diff)
• aubioquiet.c (modified) (1 diff)
• aubiotrack.c (modified) (1 diff)
• parse_args.h (modified) (4 diffs)

examples/aubionotes.c

@@ -22 +22 @@
 #define PROG_HAS_PITCH 1
 #define PROG_HAS_ONSET 1
+#define PROG_HAS_SILENCE 1
 #define PROG_HAS_JACK 1
 // TODO add PROG_HAS_OUTPUT

examples/aubioonset.c

@@ -22 +22 @@
 #define PROG_HAS_ONSET 1
 #define PROG_HAS_OUTPUT 1
+#define PROG_HAS_SILENCE 1
 #define PROG_HAS_JACK 1
 #include "parse_args.h"

examples/aubiopitch.c

@@ -22 +22 @@
 #define PROG_HAS_PITCH 1
 #define PROG_HAS_OUTPUT 1
+#define PROG_HAS_SILENCE 1
 #define PROG_HAS_JACK 1
 #include "parse_args.h"

examples/aubioquiet.c

@@ -20 +20 @@
 
 #include "utils.h"
+#define PROG_HAS_SILENCE 1
 #include "parse_args.h"
 

examples/aubiotrack.c

@@ -22 +22 @@
 #define PROG_HAS_TEMPO 1
 #define PROG_HAS_ONSET 1
+#define PROG_HAS_SILENCE 1
 #define PROG_HAS_OUTPUT 1
 #define PROG_HAS_JACK 1

examples/parse_args.h

@@ -101 +101 @@
       "                 (yin, yinfft only) a value between 0.1 and 0.7; default=0.3\n"
 #endif /* PROG_HAS_PITCH */
+#ifdef PROG_HAS_SILENCE
       "       -s      --silence          select silence threshold\n"
       "                 a value in dB, for instance -70, or -100; default=-90\n"
+#endif /* PROG_HAS_SILENCE */
       "       -T      --time-format      select time values output format\n"
       "                 (samples, ms, seconds) default=seconds\n"
@@ -110 +112 @@
       "       -f      --force-overwrite  overwrite output file if needed\n"
       "                 do not fail if output file already exists\n"
-#endif
+#endif /* PROG_HAS_OUTPUT */
 #ifdef PROG_HAS_JACK
       "       -j      --jack             use Jack\n"
-#endif
+#endif /* PROG_HAS_JACK */
       "       -v      --verbose          be verbose\n"
       "       -h      --help             display this message\n"
@@ -143 +145 @@
 #endif /* PROG_HAS_PITCH */
     "T:"
-    "s:mf";
+#ifdef PROG_HAS_SILENCE
+    "s:"
+#endif /* PROG_HAS_SILENCE */
+#ifdef PROG_HAS_OUTPUT
+    "mf"
+#endif /* PROG_HAS_OUTPUT */
+    ;
   int next_option;
   struct option long_options[] = {
@@ -167 +175 @@
     {"pitch-tolerance",       1, NULL, 'l'},
 #endif /* PROG_HAS_PITCH */
+#ifdef PROG_HAS_SILENCE
     {"silence",               1, NULL, 's'},
+#endif /* PROG_HAS_SILENCE */
     {"time-format",           1, NULL, 'T'},
+#ifdef PROG_HAS_OUTPUT
     {"mix-input",             0, NULL, 'm'},
     {"force-overwrite",       0, NULL, 'f'},
+#endif /* PROG_HAS_OUTPUT */
     {NULL,                    0, NULL, 0}
   };