From b5a1af8a470da2895913181b08425a857d57c1b3 Mon Sep 17 00:00:00 2001 From: Jamie Bullock Date: Tue, 20 Mar 2007 07:57:56 +0000 Subject: Fixed constants in xtract_macros_private.h so that defaults work out OK --- src/xtract_macros_private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/xtract_macros_private.h') diff --git a/src/xtract_macros_private.h b/src/xtract_macros_private.h index 3a479ed..7f06960 100644 --- a/src/xtract_macros_private.h +++ b/src/xtract_macros_private.h @@ -31,13 +31,13 @@ #define XTRACT_NEEDS_FFTW printf("LibXtract must be compiled with fftw support to use this function.\n") #define XTRACT_VERY_SMALL_NUMBER 2e-42 #define XTRACT_LOG_LIMIT XTRACT_VERY_SMALL_NUMBER -#define XTRACT_LOG_LIMIT_DB -96 -#define XTRACT_DB_SCALE_OFFSET 96 +#define XTRACT_LOG_LIMIT_DB -96.0 +#define XTRACT_DB_SCALE_OFFSET 96.0 #define XTRACT_VERY_BIG_NUMBER 2e42 -#define XTRACT_SR_UPPER_LIMIT 192000 -#define XTRACT_SR_LOWER_LIMIT 22050 -#define XTRACT_SR_DEFAULT 44100 -#define XTRACT_FUNDAMENTAL_DEFAULT 440 +#define XTRACT_SR_UPPER_LIMIT 192000.0 +#define XTRACT_SR_LOWER_LIMIT 22050.0 +#define XTRACT_SR_DEFAULT 44100.0 +#define XTRACT_FUNDAMENTAL_DEFAULT 440.0 #define XTRACT_CHECK_nyquist if(!nyquist) nyquist = XTRACT_SR_DEFAULT / 2 #define XTRACT_CHECK_q if(!q) q = XTRACT_SR_DEFAULT / N #define XTRACT_IS_ODD(x) (x % 2 != 0 ? 1 : 0) @@ -47,7 +47,7 @@ #define XTRACT_FFT_BANDS_DEF 1024 #define XTRACT_SPEC_BW_MIN 0.168 /* Minimum spectral bandwidth \ (= SR_LOWER_LIMIT / FFT_BANDS_MAX*/ -#define XTRACT_SPEC_BW_MAX 12000 /* SR_UPPER_LIMIT / FFT_BANDS_MIN */ +#define XTRACT_SPEC_BW_MAX 12000.0 /* SR_UPPER_LIMIT / FFT_BANDS_MIN */ #define XTRACT_SPEC_BW_DEF 43.066 /* SR_DEFAULT / FFT_BANDS_DEF */ #ifdef __cplusplus -- cgit v1.2.3