changeset 73:af512645a7d3

Fixed constants in xtract_macros_private.h so that defaults work out OK
author Jamie Bullock <jamie@postlude.co.uk>
date Tue, 20 Mar 2007 07:57:56 +0000
parents 814930781861
children de94190a63b7
files src/xtract_macros_private.h
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/xtract_macros_private.h	Tue Mar 20 07:39:11 2007 +0000
+++ b/src/xtract_macros_private.h	Tue Mar 20 07:57:56 2007 +0000
@@ -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