Resampler can now compile outside of Speex in fixed-point too.

git-svn-id: http://svn.xiph.org/trunk/speex@12781 0101bb08-14d6-0310-b084-bc0e0c8e3800

Author: jmvalin

include/speex/speex_resampler.h

@@ -78,20 +78,7 @@
 #define spx_int32_t int
 #define spx_uint16_t unsigned short
 #define spx_uint32_t unsigned int
-
-#ifdef FIXED_POINT
-#define spx_word16_t spx_int16_t
-#define spx_word32_t spx_int32_t
-
-#else /* FIXED_POINT */
-
-#define spx_word16_t float
-#define spx_word32_t float
-#define MULT16_16(a,b) ((a)*(b))
-#define MULT16_32_Q15(a,b) ((a)*(b))
-#define PSHR32(a,b) (a)
-#endif /* FIXED_POINT */
-
+      
 #else /* OUTSIDE_SPEEX */
 
 #include "speex/speex_types.h"

libspeex/arch.h

@@ -35,7 +35,9 @@
 #ifndef ARCH_H
 #define ARCH_H
 
+#ifndef OUTSIDE_SPEEX
 #include "speex/speex_types.h"
+#endif
 
 #define ABS(x) ((x) < 0 ? (-(x)) : (x))      /**< Absolute integer value. */
 #define ABS16(x) ((x) < 0 ? (-(x)) : (x))    /**< Absolute 16-bit value.  */

libspeex/resample.c

@@ -60,10 +60,12 @@ void *speex_alloc (int size) {return calloc(size,1);}
 void *speex_realloc (void *ptr, int size) {return realloc(ptr, size);}
 void speex_free (void *ptr) {free(ptr);}
 #include "speex_resampler.h"
-#else
+#include "arch.h"
+#else /* OUTSIDE_SPEEX */
+               
 #include "speex/speex_resampler.h"
 #include "misc.h"
-#endif
+#endif /* OUTSIDE_SPEEX */
 
 #include <math.h>