Changeset dffe76f

Timestamp:

Sep 17, 2009, 7:14:19 AM (15 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:

4369cb9

Parents:

b16fc82

Message:

src/aubio_priv.h: add AUBIO_WRN, add message to _WRN and _ERR, use double precision functions if AUBIO_SINGLE_PRECISION is not defined

File:

• src/aubio_priv.h (modified) (3 diffs)

src/aubio_priv.h

@@ -106 +106 @@
 
 #ifdef HAVE_C99_VARARGS_MACROS
-#define AUBIO_ERR(...)               fprintf(stderr,__VA_ARGS__)
-#define AUBIO_MSG(...)               fprintf(stdout,__VA_ARGS__)
-#define AUBIO_DBG(...)               fprintf(stderr,__VA_ARGS__)
+#define AUBIO_ERR(...)               fprintf(stderr, "AUBIO ERROR: " __VA_ARGS__)
+#define AUBIO_MSG(...)               fprintf(stdout, __VA_ARGS__)
+#define AUBIO_DBG(...)               fprintf(stderr, __VA_ARGS__)
+#define AUBIO_WRN(...)               fprintf(stderr, "AUBIO WARNING: " __VA_ARGS__)
 #else
-#define AUBIO_ERR(format, args...)   fprintf(stderr, format , ##args)
+#define AUBIO_ERR(format, args...)   fprintf(stderr, "AUBIO ERROR: " format , ##args)
 #define AUBIO_MSG(format, args...)   fprintf(stdout, format , ##args)
 #define AUBIO_DBG(format, args...)   fprintf(stderr, format , ##args)
+#define AUBIO_WRN(...)               fprintf(stderr, "AUBIO WARNING: " format, ##args)
 #endif
 
@@ -123 +125 @@
 
 /* aliases to math.h functions */
+#if AUBIO_SINGLE_PRECISION
 #define EXP        expf
 #define COS        cosf
@@ -133 +136 @@
 #define FLOOR      floorf
 #define CEIL       ceilf
+#else
+#define EXP        exp
+#define COS        cos
+#define SIN        sin
+#define ABS        fabs
+#define POW        pow
+#define SQRT       sqrt
+#define LOG10      log10
+#define LOG        log
+#define FLOOR      floor
+#define CEIL       ceil
+#endif
 #define ROUND(x)   FLOOR(x+.5)
 
 /* aliases to complex.h functions */
-#if !defined(HAVE_COMPLEX_H) || defined(WIN32)
+#if !defined(AUBIO_SINGLE_PRECISION) || !defined(HAVE_COMPLEX_H) || defined(WIN32)
 /* mingw32 does not know about c*f functions */
 #define EXPC      cexp