Changeset 3a83821

Timestamp:

Jul 1, 2020, 8:08:51 PM (4 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

4c9aa80

Parents:

08d07ce (diff), eadb7f6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/timestretch

Files:

• doc/develop.rst (modified) (5 diffs)
• examples/parse_args.h (modified) (5 diffs)
• examples/utils.c (modified) (2 diffs)
• scripts/get_waf.sh (modified) (1 diff)
• src/aubio_priv.h (modified) (2 diffs)
• wscript (modified) (1 diff)

doc/develop.rst

@@ -93 +93 @@
 .. literalinclude:: ../tests/src/io/test-source.c
    :language: C
-   :lines: 22-24, 30-32, 34
+   :lines: 24-26, 30, 32-34
 
 .. note::
@@ -103 +103 @@
 .. literalinclude:: ../tests/src/io/test-source.c
    :language: C
-   :lines: 40-44
+   :lines: 41-45
 
 At the end of the processing loop, memory is deallocated:
@@ -109 +109 @@
 .. literalinclude:: ../tests/src/io/test-source.c
    :language: C
-   :lines: 55-56
+   :lines: 55-58
 
 See the complete example: :download:`test-source.c
@@ -127 +127 @@
 .. literalinclude:: ../tests/src/spectral/test-phasevoc.c
    :language: C
-   :lines: 20-37
+   :lines: 27-44
 
 Time to clean up the previously allocated memory:
@@ -133 +133 @@
 .. literalinclude:: ../tests/src/spectral/test-phasevoc.c
    :language: C
-   :lines: 39-44
+   :lines: 47-50
 
 See the complete example: :download:`test-phasevoc.c

examples/parse_args.h

@@ -26 +26 @@
 
 extern int verbose;
+extern int quiet;
 // input / output
 extern int usejack;
@@ -128 +129 @@
 #endif /* defined(PROG_HAS_ONSET) && !defined(PROG_HAS_PITCH) */
 #endif /* defined(PROG_HAS_JACK) && defined(HAVE_JACK) */
+      "       -q      --quiet            be quiet\n"
       "       -v      --verbose          be verbose\n"
       "       -h      --help             display this message\n"
@@ -142 +144 @@
 {
 #ifdef HAVE_GETOPT_H
-  const char *options = "hv"
+  const char *options = "hvq"
     "i:r:B:H:"
 #ifdef PROG_HAS_JACK
@@ -174 +176 @@
     {"help",                  0, NULL, 'h'},
     {"verbose",               0, NULL, 'v'},
+    {"quiet",                 0, NULL, 'q'},
     {"input",                 1, NULL, 'i'},
     {"samplerate",            1, NULL, 'r'},
@@ -227 +230 @@
         verbose = 1;
         break;
+      case 'q':                /* quiet */
+        quiet = 1;
+        break;
       case 'j':
         usejack = 1;

examples/utils.c

@@ -33 +33 @@
 
 int verbose = 0;
+int quiet = 0;
 int usejack = 0;
 // input / output
@@ -170 +171 @@
       process_func (input_buffer, output_buffer);
       // print to console if verbose or no output given
-      if (verbose || sink_uri == NULL) {
+      if ((verbose || sink_uri == NULL) && !quiet) {
         print();
       }

scripts/get_waf.sh

@@ -49 +49 @@
 popd
 
-cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf $PWD
+cp -prv $WAFBUILDDIR/waf-$WAFVERSION/waf "$PWD"
 chmod +x waf
 

src/aubio_priv.h

@@ -237 +237 @@
 #define AUBIO_INF(...)               aubio_log(AUBIO_LOG_INF, "AUBIO INFO: " __VA_ARGS__)
 #define AUBIO_MSG(...)               aubio_log(AUBIO_LOG_MSG, __VA_ARGS__)
-#define AUBIO_DBG(...)               aubio_log(AUBIO_LOG_DBG, __VA_ARGS__)
+#define _AUBIO_DBG(...)              aubio_log(AUBIO_LOG_DBG, __VA_ARGS__)
 #define AUBIO_WRN(...)               aubio_log(AUBIO_LOG_WRN, "AUBIO WARNING: " __VA_ARGS__)
 #else
@@ -243 +243 @@
 #define AUBIO_INF(format, args...)   aubio_log(AUBIO_LOG_INF, "AUBIO INFO: " format , ##args)
 #define AUBIO_MSG(format, args...)   aubio_log(AUBIO_LOG_MSG, format , ##args)
-#define AUBIO_DBG(format, args...)   aubio_log(AUBIO_LOG_DBG, format , ##args)
+#define _AUBIO_DBG(format, args...)  aubio_log(AUBIO_LOG_DBG, format , ##args)
 #define AUBIO_WRN(format, args...)   aubio_log(AUBIO_LOG_WRN, "AUBIO WARNING: " format, ##args)
+#endif
+
+#ifdef DEBUG
+#define AUBIO_DBG _AUBIO_DBG
+#else
+// disable debug output
+#ifdef HAVE_C99_VARARGS_MACROS
+#define AUBIO_DBG(...)               {}
+#else
+#define AUBIO_DBG(format, args...)   {}
+#endif
 #endif
 

wscript

@@ -46 +46 @@
                     ' or without (--build-type=debug)' \
                     ' compiler opimizations [default: release]')
+    ctx.add_option('--debug', action = 'store_const',
+            dest = 'build_type', const = 'debug',
+            help = 'build in debug mode (see --build-type)')
     add_option_enable_disable(ctx, 'fftw3f', default = False,
             help_str = 'compile with fftw3f instead of ooura (recommended)',