Changeset 41b985f for src/utils/log.c

Timestamp:

Mar 12, 2017, 11:26:24 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

bde49c4a

Parents:

71f2e5f (diff), 67b6618 (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 'origin/master' into sampler

Conflicts:

.travis.yml
Makefile
examples/aubionotes.c
examples/parse_args.h
python/demos/demo_timestretch_online.py
python/lib/moresetuptools.py
python/tests/test_source.py
setup.py
src/io/source.c

File:

• src/utils/log.c (modified) (2 diffs)

src/utils/log.c

@@ -19 +19 @@
 */
 
-#include "config.h"
 #include "aubio_priv.h"
 #include "log.h"
@@ -36 +35 @@
   FILE *out;
   out = stdout;
-  if (level == AUBIO_LOG_DBG || level == AUBIO_LOG_ERR) {
+  if (level == AUBIO_LOG_ERR || level == AUBIO_LOG_DBG || level == AUBIO_LOG_WRN) {
     out = stderr;
   }