Setting period size changes the pointed to int

git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@455 05730e5d-ab1b-0410-a4ac-84af385074fa

3 files changed, 167 insertions, 3 deletions

diff --git a/speexbuild/config.h b/speexbuild/config.h
new file mode 100644
index 000000000..ebcb4a7c3
--- /dev/null
+++ b/speexbuild/config.h
@@ -0,0 +1,148 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Make use of ARM4 assembly optimizations */
+/* #undef ARM4_ASM */
+
+/* Make use of ARM5E assembly optimizations */
+/* #undef ARM5E_ASM */
+
+/* Make use of Blackfin assembly optimizations */
+/* #undef BFIN_ASM */
+
+/* Disable wideband codec */
+/* #undef DISABLE_WIDEBAND */
+
+/* Enable valgrind extra checks */
+/* #undef ENABLE_VALGRIND */
+
+/* Enable support for Epic 4.8 kbps mode */
+/* #undef EPIC_48K */
+
+/* Debug fixed-point implementation */
+/* #undef FIXED_DEBUG */
+
+/* Compile as fixed-point */
+/* #undef FIXED_POINT */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `getopt_long' function. */
+#define HAVE_GETOPT_LONG 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* Define to 1 if you have the `winmm' library (-lwinmm). */
+/* #undef HAVE_LIBWINMM */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/audioio.h> header file. */
+/* #undef HAVE_SYS_AUDIOIO_H */
+
+/* Define to 1 if you have the <sys/soundcard.h> header file. */
+#define HAVE_SYS_SOUNDCARD_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Reduce precision to 16 bits (EXPERIMENTAL) */
+/* #undef PRECISION16 */
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* Version extra */
+#define SPEEX_EXTRA_VERSION "-svn"
+
+/* Version major */
+#define SPEEX_MAJOR_VERSION 1
+
+/* Version micro */
+#define SPEEX_MICRO_VERSION 14
+
+/* Version minor */
+#define SPEEX_MINOR_VERSION 1
+
+/* Complete version string */
+#define SPEEX_VERSION "1.2beta2"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Enable support for TI C55X DSP */
+/* #undef TI_C55X */
+
+/* Make use of alloca */
+/* #undef USE_ALLOCA */
+
+/* Use C99 variable-size arrays */
+#define VAR_ARRAYS 
+
+/* Enable Vorbis-style psychoacoustics (EXPERIMENTAL) */
+/* #undef VORBIS_PSYCHO */
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Enable SSE support */
+/* #undef _USE_SSE */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to equivalent of C99 restrict keyword, or to nothing if this is not
+   supported. Do not define if restrict is supported directly. */
+#define restrict __restrict
diff --git a/speexbuild/speex_config_types.h b/speexbuild/speex_config_types.h
new file mode 100644
index 000000000..bd548546b
--- /dev/null
+++ b/speexbuild/speex_config_types.h
@@ -0,0 +1,11 @@
+#ifndef __SPEEX_TYPES_H__
+#define __SPEEX_TYPES_H__
+
+/* these are filled in by configure */
+typedef short spx_int16_t;
+typedef unsigned short spx_uint16_t;
+typedef int spx_int32_t;
+typedef unsigned int spx_uint32_t;
+
+#endif
+
diff --git a/speexbuild/speexbuild.pro b/speexbuild/speexbuild.pro
index 63477fe15..b48b1b91e 100644
--- a/speexbuild/speexbuild.pro
+++ b/speexbuild/speexbuild.pro
@@ -6,12 +6,17 @@ CONFIG -= qt
 CONFIG += staticlib debug_and_release
 VPATH	= ../speex/libspeex
 TARGET = speex
-DEFINES += NDEBUG HAVE_CONFIG_H VAR_ARRAYS 
+DEFINES += NDEBUG HAVE_CONFIG_H
+INCLUDEPATH = ../speex/include ../speex/libspeex
 win32 {
-	DEFINES+=WIN32 _WINDOWS _USE_SSE
+	DEFINES+=WIN32 _WINDOWS _USE_SSE VAR_ARRAYS
+	INCLUDEPATH += ../speex/win32
 }
+unix {
+	INCLUDEPATH += ../speexbuild
+}
+
 #VORBIS_PSYCHO
-INCLUDEPATH = ../speex/win32 ../speex/include ../speex/libspeex
 DEF_FILE = speex.def
 SOURCES = bits.c cb_search.c exc_10_16_table.c exc_10_32_table.c exc_20_32_table.c exc_5_256_table.c exc_5_64_table.c exc_8_128_table.c filterbank.c filters.c fftwrap.c gain_table.c gain_table_lbr.c hexc_10_32_table.c hexc_table.c high_lsp_tables.c jitter.c lpc.c lsp.c lsp_tables_nb.c ltp.c math_approx.c misc.c mdf.c modes.c nb_celp.c preprocess.c quant_lsp.c sb_celp.c smallft.c speex.c speex_callbacks.c speex_header.c stereo.c vbr.c vq.c kiss_fft.c kiss_fftr.c vorbis_psy.c window.c