Split libspeex and libspeexdsp

177 files changed, 52 insertions, 13606 deletions

diff --git a/Makefile.am b/Makefile.am
index 4b99faf..88ca1e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,18 +4,15 @@
 # gcc and gmake, add the option 'no-dependencies'
 AUTOMAKE_OPTIONS = 1.8
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = speex.m4
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = speex.pc speexdsp.pc
+pkgconfig_DATA = speexdsp.pc
 
-EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
+EXTRA_DIST = SpeexDSP.spec SpeexDSP.spec.in SpeexDSP.kdevelop speexdsp.pc.in README.blackfin README.symbian README.TI-DSP
 
 #Fools KDevelop into including all files
-SUBDIRS = libspeex include @src@ doc win32 symbian ti
+SUBDIRS = libspeexdsp include doc win32 symbian ti
 
-DIST_SUBDIRS = libspeex include src doc win32 symbian ti
+DIST_SUBDIRS = libspeexdsp include doc win32 symbian ti
 
 rpm: dist
 	rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
diff --git a/Speex.kdevelop b/SpeexDSP.kdevelop
index 1b3d683..1b3d683 100644
--- a/Speex.kdevelop
+++ b/SpeexDSP.kdevelop
diff --git a/Speex.spec.in b/SpeexDSP.spec.in
index bccfc23..440856b 100644
--- a/Speex.spec.in
+++ b/SpeexDSP.spec.in
@@ -56,8 +56,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %defattr(644,root,root,755)
 %doc COPYING AUTHORS ChangeLog NEWS README
 %doc doc/manual.pdf
-/usr/share/man/man1/speexenc.1*
-/usr/share/man/man1/speexdec.1*
 %attr(755,root,root) %{_bindir}/speex*
 %attr(755,root,root) %{_libdir}/libspeex*.so*
 
@@ -65,7 +63,5 @@ make DESTDIR=$RPM_BUILD_ROOT install
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libspeex*.la
 %{_includedir}/speex/speex*.h
-/usr/share/aclocal/speex.m4
-%{_libdir}/pkgconfig/speex.pc
 %{_libdir}/pkgconfig/speexdsp.pc
 %{_libdir}/libspeex*.a
diff --git a/configure.ac b/configure.ac
index 3179521..3bb1079 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
-AC_INIT(libspeex/speex.c)
+AC_INIT(libspeexdsp/preprocess.c)
 
 AM_CONFIG_HEADER([config.h])
 
@@ -22,7 +22,7 @@ AC_SUBST(SPEEX_LT_AGE)
 
 # For automake.
 VERSION=$SPEEX_VERSION
-PACKAGE=speex
+PACKAGE=speexdsp
 
 AC_SUBST(SPEEX_VERSION)
 
@@ -112,7 +112,6 @@ AC_MSG_RESULT($has_visibility)
 
 AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
 
-XIPH_PATH_OGG([src="src"], [src=""])
 AC_SUBST(src)
 
 AC_CHECK_LIB(m, sin)
@@ -204,12 +203,6 @@ AC_ARG_ENABLE(ti-c55x, [  --enable-ti-c55x        Enable support for TI C55X DSP
   AC_DEFINE([TI_C55X], , [Enable support for TI C55X DSP])
 fi])
 
-AC_ARG_ENABLE(vorbis-psy, [  --enable-psy    Enable the Vorbis psy model],
-[if test "$enableval" = yes; then
-  vorbis_psy=yes;
-  AC_DEFINE([VORBIS_PSYCHO], , [Enable support for the Vorbis psy model])
-fi])
-
 AC_ARG_WITH([fft], [AS_HELP_STRING([--with-fft=choice],[use an alternate FFT implementation. The available choices are
 kiss (default fixed point), smallft (default floating point), gpl-fftw3 and proprietary-intel-mkl])],
 [FFT=$withval]
@@ -247,8 +240,6 @@ AM_CONDITIONAL(BUILD_KISS_FFT, [test "$FFT" = "kiss"])
 AM_CONDITIONAL(BUILD_SMALLFT, [test "$FFT" = "smallft"])
 AC_SUBST(FFT_PKGCONFIG)
 
-AM_CONDITIONAL(BUILD_VORBIS_PSY, [test "x$vorbis_psy" = "xyes"])
-
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
@@ -284,36 +275,24 @@ AC_SUBST(SIZE32)
 
 AC_DEFINE([_BUILD_SPEEX], [], [Defined only when Speex itself is build built])
 
-AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
-           include/Makefile include/speex/Makefile speex.pc speexdsp.pc
-           win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile
-           win32/speexdec/Makefile symbian/Makefile 
+AC_OUTPUT([Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
+           include/Makefile include/speex/Makefile speexdsp.pc
+           win32/Makefile win32/libspeexdsp/Makefile
+           symbian/Makefile 
+
            win32/VS2003/Makefile
-           win32/VS2003/tests/Makefile
-           win32/VS2003/libspeex/Makefile
            win32/VS2003/libspeexdsp/Makefile
-           win32/VS2003/speexdec/Makefile
-           win32/VS2003/speexenc/Makefile
+           win32/VS2003/tests/Makefile
+
            win32/VS2005/Makefile
-           win32/VS2005/libspeex/Makefile
-           win32/VS2005/speexdec/Makefile
-           win32/VS2005/speexenc/Makefile
            win32/VS2005/libspeexdsp/Makefile
            win32/VS2005/tests/Makefile
-           win32/VS2008/libspeexdsp/Makefile
+
            win32/VS2008/Makefile
-           win32/VS2008/speexdec/Makefile
+           win32/VS2008/libspeexdsp/Makefile
            win32/VS2008/tests/Makefile
-           win32/VS2008/libspeex/Makefile
-           win32/VS2008/speexenc/Makefile
-           include/speex/speex_config_types.h ti/Makefile 
+           include/speex/speexdsp_config_types.h ti/Makefile 
 	   ti/speex_C54_test/Makefile ti/speex_C55_test/Makefile
 	   ti/speex_C64_test/Makefile ])
 
-if test "x$src" = "x"; then 
-echo "**IMPORTANT**"
-echo "You don't seem to have the development package for libogg (libogg-devel) installed. Only the Speex library (libspeex) will be built (no encoder/decoder executable)"
-echo "You can download libogg from http://downloads.xiph.org/releases/ogg/"
-fi
-
 echo "Type \"make; make install\" to compile and install Speex";
diff --git a/include/speex/Makefile.am b/include/speex/Makefile.am
index 2ae34f9..c462a05 100644
--- a/include/speex/Makefile.am
+++ b/include/speex/Makefile.am
@@ -1,9 +1,7 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-nodist_pkginclude_HEADERS = speex_config_types.h
-
-pkginclude_HEADERS = speex.h speex_bits.h speex_buffer.h speex_callbacks.h \
-	speex_echo.h speex_header.h speex_jitter.h speex_preprocess.h speex_resampler.h \
-	speex_stereo.h speex_types.h
+nodist_pkginclude_HEADERS = speexdsp_config_types.h
 
+pkginclude_HEADERS = speex_echo.h speex_jitter.h speex_preprocess.h speex_resampler.h \
+	speexdsp_types.h
diff --git a/include/speex/speex.h b/include/speex/speex.h
deleted file mode 100644
index 157e7aa..0000000
--- a/include/speex/speex.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/* Copyright (C) 2002-2006 Jean-Marc Valin*/
-/**
-  @file speex.h
-  @brief Describes the different modes of the codec
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef SPEEX_H
-#define SPEEX_H
-/** @defgroup Codec Speex encoder and decoder
- *  This is the Speex codec itself.
- *  @{
- */
-
-#ifdef _BUILD_SPEEX
-# include "speex_types.h"
-# include "speex_bits.h"
-#else
-# include <speex/speex_types.h>
-# include <speex/speex_bits.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Values allowed for *ctl() requests */
-
-/** Set enhancement on/off (decoder only) */
-#define SPEEX_SET_ENH 0
-/** Get enhancement state (decoder only) */
-#define SPEEX_GET_ENH 1
-
-/*Would be SPEEX_SET_FRAME_SIZE, but it's (currently) invalid*/
-/** Obtain frame size used by encoder/decoder */
-#define SPEEX_GET_FRAME_SIZE 3
-
-/** Set quality value */
-#define SPEEX_SET_QUALITY 4
-/** Get current quality setting */
-/* #define SPEEX_GET_QUALITY 5 -- Doesn't make much sense, does it? */
-
-/** Set sub-mode to use */
-#define SPEEX_SET_MODE 6
-/** Get current sub-mode in use */
-#define SPEEX_GET_MODE 7
-
-/** Set low-band sub-mode to use (wideband only)*/
-#define SPEEX_SET_LOW_MODE 8
-/** Get current low-band mode in use (wideband only)*/
-#define SPEEX_GET_LOW_MODE 9
-
-/** Set high-band sub-mode to use (wideband only)*/
-#define SPEEX_SET_HIGH_MODE 10
-/** Get current high-band mode in use (wideband only)*/
-#define SPEEX_GET_HIGH_MODE 11
-
-/** Set VBR on (1) or off (0) */
-#define SPEEX_SET_VBR 12
-/** Get VBR status (1 for on, 0 for off) */
-#define SPEEX_GET_VBR 13
-
-/** Set quality value for VBR encoding (0-10) */
-#define SPEEX_SET_VBR_QUALITY 14
-/** Get current quality value for VBR encoding (0-10) */
-#define SPEEX_GET_VBR_QUALITY 15
-
-/** Set complexity of the encoder (0-10) */
-#define SPEEX_SET_COMPLEXITY 16
-/** Get current complexity of the encoder (0-10) */
-#define SPEEX_GET_COMPLEXITY 17
-
-/** Set bit-rate used by the encoder (or lower) */
-#define SPEEX_SET_BITRATE 18
-/** Get current bit-rate used by the encoder or decoder */
-#define SPEEX_GET_BITRATE 19
-
-/** Define a handler function for in-band Speex request*/
-#define SPEEX_SET_HANDLER 20
-
-/** Define a handler function for in-band user-defined request*/
-#define SPEEX_SET_USER_HANDLER 22
-
-/** Set sampling rate used in bit-rate computation */
-#define SPEEX_SET_SAMPLING_RATE 24
-/** Get sampling rate used in bit-rate computation */
-#define SPEEX_GET_SAMPLING_RATE 25
-
-/** Reset the encoder/decoder memories to zero*/
-#define SPEEX_RESET_STATE 26
-
-/** Get VBR info (mostly used internally) */
-#define SPEEX_GET_RELATIVE_QUALITY 29
-
-/** Set VAD status (1 for on, 0 for off) */
-#define SPEEX_SET_VAD 30
-
-/** Get VAD status (1 for on, 0 for off) */
-#define SPEEX_GET_VAD 31
-
-/** Set Average Bit-Rate (ABR) to n bits per seconds */
-#define SPEEX_SET_ABR 32
-/** Get Average Bit-Rate (ABR) setting (in bps) */
-#define SPEEX_GET_ABR 33
-
-/** Set DTX status (1 for on, 0 for off) */
-#define SPEEX_SET_DTX 34
-/** Get DTX status (1 for on, 0 for off) */
-#define SPEEX_GET_DTX 35
-
-/** Set submode encoding in each frame (1 for yes, 0 for no, setting to no breaks the standard) */
-#define SPEEX_SET_SUBMODE_ENCODING 36
-/** Get submode encoding in each frame */
-#define SPEEX_GET_SUBMODE_ENCODING 37
-
-/*#define SPEEX_SET_LOOKAHEAD 38*/
-/** Returns the lookahead used by Speex separately for an encoder and a decoder.
- *  Sum encoder and decoder lookahead values to get the total codec lookahead. */
-#define SPEEX_GET_LOOKAHEAD 39
-
-/** Sets tuning for packet-loss concealment (expected loss rate) */
-#define SPEEX_SET_PLC_TUNING 40
-/** Gets tuning for PLC */
-#define SPEEX_GET_PLC_TUNING 41
-
-/** Sets the max bit-rate allowed in VBR mode */
-#define SPEEX_SET_VBR_MAX_BITRATE 42
-/** Gets the max bit-rate allowed in VBR mode */
-#define SPEEX_GET_VBR_MAX_BITRATE 43
-
-/** Turn on/off input/output high-pass filtering */
-#define SPEEX_SET_HIGHPASS 44
-/** Get status of input/output high-pass filtering */
-#define SPEEX_GET_HIGHPASS 45
-
-/** Get "activity level" of the last decoded frame, i.e.
-    how much damage we cause if we remove the frame */
-#define SPEEX_GET_ACTIVITY 47
-
-
-/* Preserving compatibility:*/
-/** Equivalent to SPEEX_SET_ENH */
-#define SPEEX_SET_PF 0
-/** Equivalent to SPEEX_GET_ENH */
-#define SPEEX_GET_PF 1
-
-
-
-
-/* Values allowed for mode queries */
-/** Query the frame size of a mode */
-#define SPEEX_MODE_FRAME_SIZE 0
-
-/** Query the size of an encoded frame for a particular sub-mode */
-#define SPEEX_SUBMODE_BITS_PER_FRAME 1
-
-
-
-/** Get major Speex version */
-#define SPEEX_LIB_GET_MAJOR_VERSION 1
-/** Get minor Speex version */
-#define SPEEX_LIB_GET_MINOR_VERSION 3
-/** Get micro Speex version */
-#define SPEEX_LIB_GET_MICRO_VERSION 5
-/** Get extra Speex version */
-#define SPEEX_LIB_GET_EXTRA_VERSION 7
-/** Get Speex version string */
-#define SPEEX_LIB_GET_VERSION_STRING 9
-
-/*#define SPEEX_LIB_SET_ALLOC_FUNC 10
-#define SPEEX_LIB_GET_ALLOC_FUNC 11
-#define SPEEX_LIB_SET_FREE_FUNC 12
-#define SPEEX_LIB_GET_FREE_FUNC 13
-
-#define SPEEX_LIB_SET_WARNING_FUNC 14
-#define SPEEX_LIB_GET_WARNING_FUNC 15
-#define SPEEX_LIB_SET_ERROR_FUNC 16
-#define SPEEX_LIB_GET_ERROR_FUNC 17
-*/
-
-/** Number of defined modes in Speex */
-#define SPEEX_NB_MODES 3
-
-/** modeID for the defined narrowband mode */
-#define SPEEX_MODEID_NB 0
-
-/** modeID for the defined wideband mode */
-#define SPEEX_MODEID_WB 1
-
-/** modeID for the defined ultra-wideband mode */
-#define SPEEX_MODEID_UWB 2
-
-struct SpeexMode;
-
-
-/* Prototypes for mode function pointers */
-
-/** Encoder state initialization function */
-typedef void *(*encoder_init_func)(const struct SpeexMode *mode);
-
-/** Encoder state destruction function */
-typedef void (*encoder_destroy_func)(void *st);
-
-/** Main encoding function */
-typedef int (*encode_func)(void *state, void *in, SpeexBits *bits);
-
-/** Function for controlling the encoder options */
-typedef int (*encoder_ctl_func)(void *state, int request, void *ptr);
-
-/** Decoder state initialization function */
-typedef void *(*decoder_init_func)(const struct SpeexMode *mode);
-
-/** Decoder state destruction function */
-typedef void (*decoder_destroy_func)(void *st);
-
-/** Main decoding function */
-typedef int  (*decode_func)(void *state, SpeexBits *bits, void *out);
-
-/** Function for controlling the decoder options */
-typedef int (*decoder_ctl_func)(void *state, int request, void *ptr);
-
-
-/** Query function for a mode */
-typedef int (*mode_query_func)(const void *mode, int request, void *ptr);
-
-/** Struct defining a Speex mode */ 
-typedef struct SpeexMode {
-   /** Pointer to the low-level mode data */
-   const void *mode;
-
-   /** Pointer to the mode query function */
-   mode_query_func query;
-   
-   /** The name of the mode (you should not rely on this to identify the mode)*/
-   const char *modeName;
-
-   /**ID of the mode*/
-   int modeID;
-
-   /**Version number of the bitstream (incremented every time we break
-    bitstream compatibility*/
-   int bitstream_version;
-
-   /** Pointer to encoder initialization function */
-   encoder_init_func enc_init;
-
-   /** Pointer to encoder destruction function */
-   encoder_destroy_func enc_destroy;
-
-   /** Pointer to frame encoding function */
-   encode_func enc;
-
-   /** Pointer to decoder initialization function */
-   decoder_init_func dec_init;
-
-   /** Pointer to decoder destruction function */
-   decoder_destroy_func dec_destroy;
-
-   /** Pointer to frame decoding function */
-   decode_func dec;
-
-   /** ioctl-like requests for encoder */
-   encoder_ctl_func enc_ctl;
-
-   /** ioctl-like requests for decoder */
-   decoder_ctl_func dec_ctl;
-
-} SpeexMode;
-
-/**
- * Returns a handle to a newly created Speex encoder state structure. For now, 
- * the "mode" argument can be &nb_mode or &wb_mode . In the future, more modes 
- * may be added. Note that for now if you have more than one channels to 
- * encode, you need one state per channel.
- *
- * @param mode The mode to use (either speex_nb_mode or speex_wb.mode) 
- * @return A newly created encoder state or NULL if state allocation fails
- */
-void *speex_encoder_init(const SpeexMode *mode);
-
-/** Frees all resources associated to an existing Speex encoder state. 
- * @param state Encoder state to be destroyed */
-void speex_encoder_destroy(void *state);
-
-/** Uses an existing encoder state to encode one frame of speech pointed to by
-    "in". The encoded bit-stream is saved in "bits".
- @param state Encoder state
- @param in Frame that will be encoded with a +-2^15 range. This data MAY be 
-        overwritten by the encoder and should be considered uninitialised 
-        after the call.
- @param bits Bit-stream where the data will be written
- @return 0 if frame needs not be transmitted (DTX only), 1 otherwise
- */
-int speex_encode(void *state, float *in, SpeexBits *bits);
-
-/** Uses an existing encoder state to encode one frame of speech pointed to by
-    "in". The encoded bit-stream is saved in "bits".
- @param state Encoder state
- @param in Frame that will be encoded with a +-2^15 range
- @param bits Bit-stream where the data will be written
- @return 0 if frame needs not be transmitted (DTX only), 1 otherwise
- */
-int speex_encode_int(void *state, spx_int16_t *in, SpeexBits *bits);
-
-/** Used like the ioctl function to control the encoder parameters
- *
- * @param state Encoder state
- * @param request ioctl-type request (one of the SPEEX_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 if no error, -1 if request in unknown, -2 for invalid parameter
- */
-int speex_encoder_ctl(void *state, int request, void *ptr);
-
-
-/** Returns a handle to a newly created decoder state structure. For now, 
- * the mode argument can be &nb_mode or &wb_mode . In the future, more modes
- * may be added.  Note that for now if you have more than one channels to
- * decode, you need one state per channel.
- *
- * @param mode Speex mode (one of speex_nb_mode or speex_wb_mode)
- * @return A newly created decoder state or NULL if state allocation fails
- */ 
-void *speex_decoder_init(const SpeexMode *mode);
-
-/** Frees all resources associated to an existing decoder state.
- *
- * @param state State to be destroyed
- */
-void speex_decoder_destroy(void *state);
-
-/** Uses an existing decoder state to decode one frame of speech from
- * bit-stream bits. The output speech is saved written to out.
- *
- * @param state Decoder state
- * @param bits Bit-stream from which to decode the frame (NULL if the packet was lost)
- * @param out Where to write the decoded frame
- * @return return status (0 for no error, -1 for end of stream, -2 corrupt stream)
- */
-int speex_decode(void *state, SpeexBits *bits, float *out);
-
-/** Uses an existing decoder state to decode one frame of speech from
- * bit-stream bits. The output speech is saved written to out.
- *
- * @param state Decoder state
- * @param bits Bit-stream from which to decode the frame (NULL if the packet was lost)
- * @param out Where to write the decoded frame
- * @return return status (0 for no error, -1 for end of stream, -2 corrupt stream)
- */
-int speex_decode_int(void *state, SpeexBits *bits, spx_int16_t *out);
-
-/** Used like the ioctl function to control the encoder parameters
- *
- * @param state Decoder state
- * @param request ioctl-type request (one of the SPEEX_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 if no error, -1 if request in unknown, -2 for invalid parameter
- */
-int speex_decoder_ctl(void *state, int request, void *ptr);
-
-
-/** Query function for mode information
- *
- * @param mode Speex mode
- * @param request ioctl-type request (one of the SPEEX_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 if no error, -1 if request in unknown, -2 for invalid parameter
- */
-int speex_mode_query(const SpeexMode *mode, int request, void *ptr);
-
-/** Functions for controlling the behavior of libspeex
- * @param request ioctl-type request (one of the SPEEX_LIB_* macros)
- * @param ptr Data exchanged to-from function
- * @return 0 if no error, -1 if request in unknown, -2 for invalid parameter
- */
-int speex_lib_ctl(int request, void *ptr);
-
-/** Default narrowband mode */
-extern const SpeexMode speex_nb_mode;
-
-/** Default wideband mode */
-extern const SpeexMode speex_wb_mode;
-
-/** Default "ultra-wideband" mode */
-extern const SpeexMode speex_uwb_mode;
-
-/** List of all modes available */
-extern const SpeexMode * const speex_mode_list[SPEEX_NB_MODES];
-
-/** Obtain one of the modes available */
-const SpeexMode * speex_lib_get_mode (int mode);
-
-#ifndef WIN32
-/* We actually override the function in the narrowband case so that we can avoid linking in the wideband stuff */
-#define speex_lib_get_mode(mode) ((mode)==SPEEX_MODEID_NB ? &speex_nb_mode : speex_lib_get_mode (mode))
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @}*/
-#endif
diff --git a/include/speex/speex_bits.h b/include/speex/speex_bits.h
deleted file mode 100644
index 234ec53..0000000
--- a/include/speex/speex_bits.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
-/**
-   @file speex_bits.h
-   @brief Handles bit packing/unpacking
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef BITS_H
-#define BITS_H
-/** @defgroup SpeexBits SpeexBits: Bit-stream manipulations
- *  This is the structure that holds the bit-stream when encoding or decoding
- * with Speex. It allows some manipulations as well.
- *  @{
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Bit-packing data structure representing (part of) a bit-stream. */
-typedef struct SpeexBits {
-   char *chars;   /**< "raw" data */
-   int   nbBits;  /**< Total number of bits stored in the stream*/
-   int   charPtr; /**< Position of the byte "cursor" */
-   int   bitPtr;  /**< Position of the bit "cursor" within the current char */
-   int   owner;   /**< Does the struct "own" the "raw" buffer (member "chars") */
-   int   overflow;/**< Set to one if we try to read past the valid data */
-   int   buf_size;/**< Allocated size for buffer */
-   int   reserved1; /**< Reserved for future use */
-   void *reserved2; /**< Reserved for future use */
-} SpeexBits;
-
-/** Initializes and allocates resources for a SpeexBits struct */
-void speex_bits_init(SpeexBits *bits);
-
-/** Initializes SpeexBits struct using a pre-allocated buffer*/
-void speex_bits_init_buffer(SpeexBits *bits, void *buff, int buf_size);
-
-/** Sets the bits in a SpeexBits struct to use data from an existing buffer (for decoding without copying data) */
-void speex_bits_set_bit_buffer(SpeexBits *bits, void *buff, int buf_size);
-
-/** Frees all resources associated to a SpeexBits struct. Right now this does nothing since no resources are allocated, but this could change in the future.*/
-void speex_bits_destroy(SpeexBits *bits);
-
-/** Resets bits to initial value (just after initialization, erasing content)*/
-void speex_bits_reset(SpeexBits *bits);
-
-/** Rewind the bit-stream to the beginning (ready for read) without erasing the content */
-void speex_bits_rewind(SpeexBits *bits);
-
-/** Initializes the bit-stream from the data in an area of memory */
-void speex_bits_read_from(SpeexBits *bits, const char *bytes, int len);
-
-/** Append bytes to the bit-stream
- * 
- * @param bits Bit-stream to operate on
- * @param bytes pointer to the bytes what will be appended
- * @param len Number of bytes of append
- */
-void speex_bits_read_whole_bytes(SpeexBits *bits, const char *bytes, int len);
-
-/** Write the content of a bit-stream to an area of memory
- * 
- * @param bits Bit-stream to operate on
- * @param bytes Memory location where to write the bits
- * @param max_len Maximum number of bytes to write (i.e. size of the "bytes" buffer)
- * @return Number of bytes written to the "bytes" buffer
-*/
-int speex_bits_write(SpeexBits *bits, char *bytes, int max_len);
-
-/** Like speex_bits_write, but writes only the complete bytes in the stream. Also removes the written bytes from the stream */
-int speex_bits_write_whole_bytes(SpeexBits *bits, char *bytes, int max_len);
-
-/** Append bits to the bit-stream
- * @param bits Bit-stream to operate on
- * @param data Value to append as integer
- * @param nbBits number of bits to consider in "data"
- */
-void speex_bits_pack(SpeexBits *bits, int data, int nbBits);
-
-/** Interpret the next bits in the bit-stream as a signed integer
- *
- * @param bits Bit-stream to operate on
- * @param nbBits Number of bits to interpret
- * @return A signed integer represented by the bits read
- */
-int speex_bits_unpack_signed(SpeexBits *bits, int nbBits);
-
-/** Interpret the next bits in the bit-stream as an unsigned integer
- *
- * @param bits Bit-stream to operate on
- * @param nbBits Number of bits to interpret
- * @return An unsigned integer represented by the bits read
- */
-unsigned int speex_bits_unpack_unsigned(SpeexBits *bits, int nbBits);
-
-/** Returns the number of bytes in the bit-stream, including the last one even if it is not "full"
- *
- * @param bits Bit-stream to operate on
- * @return Number of bytes in the stream
- */
-int speex_bits_nbytes(SpeexBits *bits);
-
-/** Same as speex_bits_unpack_unsigned, but without modifying the cursor position 
- * 
- * @param bits Bit-stream to operate on
- * @param nbBits Number of bits to look for
- * @return Value of the bits peeked, interpreted as unsigned
- */
-unsigned int speex_bits_peek_unsigned(SpeexBits *bits, int nbBits);
-
-/** Get the value of the next bit in the stream, without modifying the
- * "cursor" position 
- * 
- * @param bits Bit-stream to operate on
- * @return Value of the bit peeked (one bit only)
- */
-int speex_bits_peek(SpeexBits *bits);
-
-/** Advances the position of the "bit cursor" in the stream 
- *
- * @param bits Bit-stream to operate on
- * @param n Number of bits to advance
- */
-void speex_bits_advance(SpeexBits *bits, int n);
-
-/** Returns the number of bits remaining to be read in a stream
- *
- * @param bits Bit-stream to operate on
- * @return Number of bits that can still be read from the stream
- */
-int speex_bits_remaining(SpeexBits *bits);
-
-/** Insert a terminator so that the data can be sent as a packet while auto-detecting 
- * the number of frames in each packet 
- *
- * @param bits Bit-stream to operate on
- */
-void speex_bits_insert_terminator(SpeexBits *bits);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* @} */
-#endif
diff --git a/include/speex/speex_buffer.h b/include/speex/speex_buffer.h
index 59632b3..c10b1f9 100644
--- a/include/speex/speex_buffer.h
+++ b/include/speex/speex_buffer.h
@@ -35,9 +35,9 @@
 #define SPEEX_BUFFER_H
 
 #ifdef _BUILD_SPEEX
-# include "speex_types.h"
+# include "speexdsp_types.h"
 #else
-# include <speex/speex_types.h>
+# include <speex/speexdsp_types.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/include/speex/speex_callbacks.h b/include/speex/speex_callbacks.h
deleted file mode 100644
index 42bc9c3..0000000
--- a/include/speex/speex_callbacks.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin*/
-/**
-  @file speex_callbacks.h
-  @brief Describes callback handling and in-band signalling
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef SPEEX_CALLBACKS_H
-#define SPEEX_CALLBACKS_H
-/** @defgroup SpeexCallbacks Various definitions for Speex callbacks supported by the decoder.
- *  @{
- */
-
-#ifdef _BUILD_SPEEX
-# include "speex.h"
-#else
-# include <speex/speex.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Total number of callbacks */
-#define SPEEX_MAX_CALLBACKS 16
-
-/* Describes all the in-band requests */
-
-/*These are 1-bit requests*/
-/** Request for perceptual enhancement (1 for on, 0 for off) */
-#define SPEEX_INBAND_ENH_REQUEST         0
-/** Reserved */
-#define SPEEX_INBAND_RESERVED1           1
-
-/*These are 4-bit requests*/
-/** Request for a mode change */
-#define SPEEX_INBAND_MODE_REQUEST        2
-/** Request for a low mode change */
-#define SPEEX_INBAND_LOW_MODE_REQUEST    3
-/** Request for a high mode change */
-#define SPEEX_INBAND_HIGH_MODE_REQUEST   4
-/** Request for VBR (1 on, 0 off) */
-#define SPEEX_INBAND_VBR_QUALITY_REQUEST 5
-/** Request to be sent acknowledge */
-#define SPEEX_INBAND_ACKNOWLEDGE_REQUEST 6
-/** Request for VBR (1 for on, 0 for off) */
-#define SPEEX_INBAND_VBR_REQUEST         7
-
-/*These are 8-bit requests*/
-/** Send a character in-band */
-#define SPEEX_INBAND_CHAR                8
-/** Intensity stereo information */
-#define SPEEX_INBAND_STEREO              9
-
-/*These are 16-bit requests*/
-/** Transmit max bit-rate allowed */
-#define SPEEX_INBAND_MAX_BITRATE         10
-
-/*These are 32-bit requests*/
-/** Acknowledge packet reception */
-#define SPEEX_INBAND_ACKNOWLEDGE         12
-
-/** Callback function type */
-typedef int (*speex_callback_func)(SpeexBits *bits, void *state, void *data);
-
-/** Callback information */
-typedef struct SpeexCallback {
-   int callback_id;             /**< ID associated to the callback */
-   speex_callback_func func;    /**< Callback handler function */
-   void *data;                  /**< Data that will be sent to the handler */
-   void *reserved1;             /**< Reserved for future use */
-   int   reserved2;             /**< Reserved for future use */
-} SpeexCallback;
-
-/** Handle in-band request */
-int speex_inband_handler(SpeexBits *bits, SpeexCallback *callback_list, void *state);
-
-/** Standard handler for mode request (change mode, no questions asked) */
-int speex_std_mode_request_handler(SpeexBits *bits, void *state, void *data);
-
-/** Standard handler for high mode request (change high mode, no questions asked) */
-int speex_std_high_mode_request_handler(SpeexBits *bits, void *state, void *data);
-
-/** Standard handler for in-band characters (write to stderr) */
-int speex_std_char_handler(SpeexBits *bits, void *state, void *data);
-
-/** Default handler for user-defined requests: in this case, just ignore */
-int speex_default_user_handler(SpeexBits *bits, void *state, void *data);
-
-
-
-/** Standard handler for low mode request (change low mode, no questions asked) */
-int speex_std_low_mode_request_handler(SpeexBits *bits, void *state, void *data);
-
-/** Standard handler for VBR request (Set VBR, no questions asked) */
-int speex_std_vbr_request_handler(SpeexBits *bits, void *state, void *data);
-
-/** Standard handler for enhancer request (Turn enhancer on/off, no questions asked) */
-int speex_std_enh_request_handler(SpeexBits *bits, void *state, void *data);
-
-/** Standard handler for VBR quality request (Set VBR quality, no questions asked) */
-int speex_std_vbr_quality_request_handler(SpeexBits *bits, void *state, void *data);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
-#endif
diff --git a/include/speex/speex_echo.h b/include/speex/speex_echo.h
index c01688b..d20cf48 100644
--- a/include/speex/speex_echo.h
+++ b/include/speex/speex_echo.h
@@ -38,9 +38,9 @@
  *  @{
  */
 #ifdef _BUILD_SPEEX
-# include "speex_types.h"
+# include "speexdsp_types.h"
 #else
-# include <speex/speex_types.h>
+# include <speex/speexdsp_types.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/include/speex/speex_header.h b/include/speex/speex_header.h
deleted file mode 100644
index dfd1ce6..0000000
--- a/include/speex/speex_header.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
-/**
-   @file speex_header.h
-   @brief Describes the Speex header
-*/
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-
-#ifndef SPEEX_HEADER_H
-#define SPEEX_HEADER_H
-/** @defgroup SpeexHeader SpeexHeader: Makes it easy to write/parse an Ogg/Speex header
- *  This is the Speex header for the Ogg encapsulation. You don't need that if you just use RTP.
- *  @{
- */
-
-#ifdef _BUILD_SPEEX
-# include "speex_types.h"
-#else
-# include <speex/speex_types.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct SpeexMode;
-
-/** Length of the Speex header identifier */
-#define SPEEX_HEADER_STRING_LENGTH 8
-
-/** Maximum number of characters for encoding the Speex version number in the header */
-#define SPEEX_HEADER_VERSION_LENGTH 20
-
-/** Speex header info for file-based formats */
-typedef struct SpeexHeader {
-   char speex_string[SPEEX_HEADER_STRING_LENGTH];   /**< Identifies a Speex bit-stream, always set to "Speex   " */
-   char speex_version[SPEEX_HEADER_VERSION_LENGTH]; /**< Speex version */ 
-   spx_int32_t speex_version_id;       /**< Version for Speex (for checking compatibility) */
-   spx_int32_t header_size;            /**< Total size of the header ( sizeof(SpeexHeader) ) */
-   spx_int32_t rate;                   /**< Sampling rate used */
-   spx_int32_t mode;                   /**< Mode used (0 for narrowband, 1 for wideband) */
-   spx_int32_t mode_bitstream_version; /**< Version ID of the bit-stream */
-   spx_int32_t nb_channels;            /**< Number of channels encoded */
-   spx_int32_t bitrate;                /**< Bit-rate used */
-   spx_int32_t frame_size;             /**< Size of frames */
-   spx_int32_t vbr;                    /**< 1 for a VBR encoding, 0 otherwise */
-   spx_int32_t frames_per_packet;      /**< Number of frames stored per Ogg packet */
-   spx_int32_t extra_headers;          /**< Number of additional headers after the comments */
-   spx_int32_t reserved1;              /**< Reserved for future use, must be zero */
-   spx_int32_t reserved2;              /**< Reserved for future use, must be zero */
-} SpeexHeader;
-
-/** Initializes a SpeexHeader using basic information */
-void speex_init_header(SpeexHeader *header, int rate, int nb_channels, const struct SpeexMode *m);
-
-/** Creates the header packet from the header itself (mostly involves endianness conversion) */
-char *speex_header_to_packet(SpeexHeader *header, int *size);
-
-/** Creates a SpeexHeader from a packet */
-SpeexHeader *speex_packet_to_header(char *packet, int size);
-
-/** Frees the memory allocated by either speex_header_to_packet() or speex_packet_to_header() */
-void speex_header_free(void *ptr);
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
-#endif
diff --git a/include/speex/speex_jitter.h b/include/speex/speex_jitter.h
index 977916b..474b9f3 100644
--- a/include/speex/speex_jitter.h
+++ b/include/speex/speex_jitter.h
@@ -42,9 +42,9 @@
  */
 
 #ifdef _BUILD_SPEEX
-# include "speex_types.h"
+# include "speexdsp_types.h"
 #else
-# include <speex/speex_types.h>
+# include <speex/speexdsp_types.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/include/speex/speex_preprocess.h b/include/speex/speex_preprocess.h
index 2730595..3a3e7ec 100644
--- a/include/speex/speex_preprocess.h
+++ b/include/speex/speex_preprocess.h
@@ -44,9 +44,9 @@
  */
 
 #ifdef _BUILD_SPEEX
-# include "speex_types.h"
+# include "speexdsp_types.h"
 #else
-# include <speex/speex_types.h>
+# include <speex/speexdsp_types.h>
 #endif
 
 #ifdef __cplusplus
diff --git a/include/speex/speex_resampler.h b/include/speex/speex_resampler.h
index 4d5913f..96dfe1e 100644
--- a/include/speex/speex_resampler.h
+++ b/include/speex/speex_resampler.h
@@ -85,9 +85,9 @@
 #else /* OUTSIDE_SPEEX */
 
 #ifdef _BUILD_SPEEX
-# include "speex_types.h"
+# include "speexdsp_types.h"
 #else
-# include <speex/speex_types.h>
+# include <speex/speexdsp_types.h>
 #endif
 
 #endif /* OUTSIDE_SPEEX */
diff --git a/include/speex/speex_stereo.h b/include/speex/speex_stereo.h
index 6eb6c12..03f8b62 100644
--- a/include/speex/speex_stereo.h
+++ b/include/speex/speex_stereo.h
@@ -40,10 +40,10 @@
  */
 
 #ifdef _BUILD_SPEEX
-# include "speex_types.h"
+# include "speexdsp_types.h"
 # include "speex_bits.h"
 #else
-# include <speex/speex_types.h>
+# include <speex/speexdsp_types.h>
 # include <speex/speex_bits.h>
 #endif
 
diff --git a/include/speex/speex_config_types.h.in b/include/speex/speexdsp_config_types.h.in
index 3fab2ae..3fab2ae 100644
--- a/include/speex/speex_config_types.h.in
+++ b/include/speex/speexdsp_config_types.h.in
diff --git a/include/speex/speex_types.h b/include/speex/speexdsp_types.h
index 59bb5b4..8ab2140 100644
--- a/include/speex/speex_types.h
+++ b/include/speex/speexdsp_types.h
@@ -1,4 +1,4 @@
-/* speex_types.h taken from libogg */
+/* speexdsp_types.h taken from libogg */
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
@@ -16,7 +16,7 @@
 
  ********************************************************************/
 /**
-   @file speex_types.h
+   @file speexdsp_types.h
    @brief Speex types
 */
 #ifndef _SPEEX_TYPES_H
@@ -120,9 +120,9 @@
 #else
 
 # ifdef _BUILD_SPEEX
-#  include "include/speex/speex_config_types.h"
+#  include "include/speex/speexdsp_config_types.h"
 #else
-#  include <speex/speex_config_types.h>
+#  include <speex/speexdsp_config_types.h>
 #endif
 
 #endif
diff --git a/libspeex/.cvsignore b/libspeexdsp/.cvsignore
index 09a90ac..09a90ac 100644
--- a/libspeex/.cvsignore
+++ b/libspeexdsp/.cvsignore
diff --git a/libspeex/Makefile.am b/libspeexdsp/Makefile.am
index 6eef924..ded818e 100644
--- a/libspeex/Makefile.am
+++ b/libspeexdsp/Makefile.am
@@ -1,28 +1,13 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake
 #AUTOMAKE_OPTIONS = no-dependencies
 
-if BUILD_VORBIS_PSY
-  VPSY_LIB=libspeexdsp.la
-  VPSY_SOURCE=vorbis_psy.c
-else
-  VPSY_LIB=
-  VPSY_SOURCE=
-endif
-
 EXTRA_DIST=echo_diagnostic.m
 
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @FFT_CFLAGS@
 
-lib_LTLIBRARIES = libspeex.la libspeexdsp.la
+lib_LTLIBRARIES = libspeexdsp.la
 
 # Sources for compilation in the library
-libspeex_la_SOURCES = 	$(VPSY_SOURCE) cb_search.c 	exc_10_32_table.c 	exc_8_128_table.c \
-		filters.c 	gain_table.c 	hexc_table.c 	high_lsp_tables.c 	lsp.c \
-		ltp.c 	speex.c 	stereo.c 	vbr.c 	vq.c bits.c exc_10_16_table.c \
-	exc_20_32_table.c exc_5_256_table.c exc_5_64_table.c gain_table_lbr.c hexc_10_32_table.c \
-	lpc.c lsp_tables_nb.c modes.c modes_wb.c nb_celp.c quant_lsp.c sb_celp.c \
-	speex_callbacks.c speex_header.c window.c
-
 if BUILD_KISS_FFT
   FFTSRC=kiss_fft.c _kiss_fft_guts.h kiss_fft.h kiss_fftr.c kiss_fftr.h 
 else
@@ -43,17 +28,9 @@ noinst_HEADERS = 	arch.h 	bfin.h cb_search_arm4.h 	cb_search_bfin.h 	cb_search_s
 	filterbank.h fixed_generic.h lsp.h lsp_bfin.h ltp_bfin.h modes.h os_support.h \
 	pseudofloat.h quant_lsp_bfin.h smallft.h vorbis_psy.h resample_sse.h
 
-
-libspeex_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
 libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
 
-noinst_PROGRAMS = testenc testenc_wb testenc_uwb testdenoise testecho testjitter
-testenc_SOURCES = testenc.c
-testenc_LDADD = libspeex.la $(VPSY_LIB)
-testenc_wb_SOURCES = testenc_wb.c
-testenc_wb_LDADD = libspeex.la  $(VPSY_LIB)
-testenc_uwb_SOURCES = testenc_uwb.c
-testenc_uwb_LDADD = libspeex.la $(VPSY_LIB)
+noinst_PROGRAMS = testdenoise testecho testjitter
 testdenoise_SOURCES = testdenoise.c
 testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@
 testecho_SOURCES = testecho.c
diff --git a/libspeex/_kiss_fft_guts.h b/libspeexdsp/_kiss_fft_guts.h
index 6571e79..6571e79 100644
--- a/libspeex/_kiss_fft_guts.h
+++ b/libspeexdsp/_kiss_fft_guts.h
diff --git a/libspeex/arch.h b/libspeexdsp/arch.h
index 3b47ed9..3b47ed9 100644
--- a/libspeex/arch.h
+++ b/libspeexdsp/arch.h
diff --git a/libspeex/bfin.h b/libspeexdsp/bfin.h
index b934cf2..b934cf2 100644
--- a/libspeex/bfin.h
+++ b/libspeexdsp/bfin.h
diff --git a/libspeex/bits.c b/libspeexdsp/bits.c
index 95adbfd..95adbfd 100644
--- a/libspeex/bits.c
+++ b/libspeexdsp/bits.c
diff --git a/libspeex/buffer.c b/libspeexdsp/buffer.c
index e094804..e094804 100644
--- a/libspeex/buffer.c
+++ b/libspeexdsp/buffer.c
diff --git a/libspeex/cb_search.c b/libspeexdsp/cb_search.c
index 26c2329..26c2329 100644
--- a/libspeex/cb_search.c
+++ b/libspeexdsp/cb_search.c
diff --git a/libspeex/cb_search.h b/libspeexdsp/cb_search.h
index e4fa60b..e4fa60b 100644
--- a/libspeex/cb_search.h
+++ b/libspeexdsp/cb_search.h
diff --git a/libspeex/cb_search_arm4.h b/libspeexdsp/cb_search_arm4.h
index 19b752a..19b752a 100644
--- a/libspeex/cb_search_arm4.h
+++ b/libspeexdsp/cb_search_arm4.h
diff --git a/libspeex/cb_search_bfin.h b/libspeexdsp/cb_search_bfin.h
index edb1eca..edb1eca 100644
--- a/libspeex/cb_search_bfin.h
+++ b/libspeexdsp/cb_search_bfin.h
diff --git a/libspeex/cb_search_sse.h b/libspeexdsp/cb_search_sse.h
index 8b03968..8b03968 100644
--- a/libspeex/cb_search_sse.h
+++ b/libspeexdsp/cb_search_sse.h
diff --git a/libspeex/echo_diagnostic.m b/libspeexdsp/echo_diagnostic.m
index aebf390..aebf390 100644
--- a/libspeex/echo_diagnostic.m
+++ b/libspeexdsp/echo_diagnostic.m
diff --git a/libspeex/exc_10_16_table.c b/libspeexdsp/exc_10_16_table.c
index 98ae357..98ae357 100644
--- a/libspeex/exc_10_16_table.c
+++ b/libspeexdsp/exc_10_16_table.c
diff --git a/libspeex/exc_10_32_table.c b/libspeexdsp/exc_10_32_table.c
index 1ee56a2..1ee56a2 100644
--- a/libspeex/exc_10_32_table.c
+++ b/libspeexdsp/exc_10_32_table.c
diff --git a/libspeex/exc_20_32_table.c b/libspeexdsp/exc_20_32_table.c
index e4098b8..e4098b8 100644
--- a/libspeex/exc_20_32_table.c
+++ b/libspeexdsp/exc_20_32_table.c
diff --git a/libspeex/exc_5_256_table.c b/libspeexdsp/exc_5_256_table.c
index 4137996..4137996 100644
--- a/libspeex/exc_5_256_table.c
+++ b/libspeexdsp/exc_5_256_table.c
diff --git a/libspeex/exc_5_64_table.c b/libspeexdsp/exc_5_64_table.c
index 2c66d51..2c66d51 100644
--- a/libspeex/exc_5_64_table.c
+++ b/libspeexdsp/exc_5_64_table.c
diff --git a/libspeex/exc_8_128_table.c b/libspeexdsp/exc_8_128_table.c
index 17ee64b..17ee64b 100644
--- a/libspeex/exc_8_128_table.c
+++ b/libspeexdsp/exc_8_128_table.c
diff --git a/libspeex/fftwrap.c b/libspeexdsp/fftwrap.c
index a14b1e4..a14b1e4 100644
--- a/libspeex/fftwrap.c
+++ b/libspeexdsp/fftwrap.c
diff --git a/libspeex/fftwrap.h b/libspeexdsp/fftwrap.h
index dfaf489..dfaf489 100644
--- a/libspeex/fftwrap.h
+++ b/libspeexdsp/fftwrap.h
diff --git a/libspeex/filterbank.c b/libspeexdsp/filterbank.c
index e2fb71d..e2fb71d 100644
--- a/libspeex/filterbank.c
+++ b/libspeexdsp/filterbank.c
diff --git a/libspeex/filterbank.h b/libspeexdsp/filterbank.h
index 3e889a2..3e889a2 100644
--- a/libspeex/filterbank.h
+++ b/libspeexdsp/filterbank.h
diff --git a/libspeex/filters.c b/libspeexdsp/filters.c
index 79f6546..79f6546 100644
--- a/libspeex/filters.c
+++ b/libspeexdsp/filters.c
diff --git a/libspeex/filters.h b/libspeexdsp/filters.h
index df14851..df14851 100644
--- a/libspeex/filters.h
+++ b/libspeexdsp/filters.h
diff --git a/libspeex/filters_arm4.h b/libspeexdsp/filters_arm4.h
index 7a74042..7a74042 100644
--- a/libspeex/filters_arm4.h
+++ b/libspeexdsp/filters_arm4.h
diff --git a/libspeex/filters_bfin.h b/libspeexdsp/filters_bfin.h
index ccd57b9..ccd57b9 100644
--- a/libspeex/filters_bfin.h
+++ b/libspeexdsp/filters_bfin.h
diff --git a/libspeex/filters_sse.h b/libspeexdsp/filters_sse.h
index 4bb333d..4bb333d 100644
--- a/libspeex/filters_sse.h
+++ b/libspeexdsp/filters_sse.h
diff --git a/libspeex/fixed_arm4.h b/libspeexdsp/fixed_arm4.h
index b6981ca..b6981ca 100644
--- a/libspeex/fixed_arm4.h
+++ b/libspeexdsp/fixed_arm4.h
diff --git a/libspeex/fixed_arm5e.h b/libspeexdsp/fixed_arm5e.h
index 9b4861c..9b4861c 100644
--- a/libspeex/fixed_arm5e.h
+++ b/libspeexdsp/fixed_arm5e.h
diff --git a/libspeex/fixed_bfin.h b/libspeexdsp/fixed_bfin.h
index 9eb21e3..9eb21e3 100644
--- a/libspeex/fixed_bfin.h
+++ b/libspeexdsp/fixed_bfin.h
diff --git a/libspeex/fixed_debug.h b/libspeexdsp/fixed_debug.h
index 54f3866..54f3866 100644
--- a/libspeex/fixed_debug.h
+++ b/libspeexdsp/fixed_debug.h
diff --git a/libspeex/fixed_generic.h b/libspeexdsp/fixed_generic.h
index 3fb096e..3fb096e 100644
--- a/libspeex/fixed_generic.h
+++ b/libspeexdsp/fixed_generic.h
diff --git a/libspeex/gain_table.c b/libspeexdsp/gain_table.c
index 00b8244..00b8244 100644
--- a/libspeex/gain_table.c
+++ b/libspeexdsp/gain_table.c
diff --git a/libspeex/gain_table_lbr.c b/libspeexdsp/gain_table_lbr.c
index 3c1c3db..3c1c3db 100644
--- a/libspeex/gain_table_lbr.c
+++ b/libspeexdsp/gain_table_lbr.c
diff --git a/libspeex/hexc_10_32_table.c b/libspeexdsp/hexc_10_32_table.c
index 8dd408f..8dd408f 100644
--- a/libspeex/hexc_10_32_table.c
+++ b/libspeexdsp/hexc_10_32_table.c
diff --git a/libspeex/hexc_table.c b/libspeexdsp/hexc_table.c
index 268408a..268408a 100644
--- a/libspeex/hexc_table.c
+++ b/libspeexdsp/hexc_table.c
diff --git a/libspeex/high_lsp_tables.c b/libspeexdsp/high_lsp_tables.c
index e82e875..e82e875 100644
--- a/libspeex/high_lsp_tables.c
+++ b/libspeexdsp/high_lsp_tables.c
diff --git a/libspeex/jitter.c b/libspeexdsp/jitter.c
index 68240f1..68240f1 100644
--- a/libspeex/jitter.c
+++ b/libspeexdsp/jitter.c
diff --git a/libspeex/kiss_fft.c b/libspeexdsp/kiss_fft.c
index 6778281..6778281 100644
--- a/libspeex/kiss_fft.c
+++ b/libspeexdsp/kiss_fft.c
diff --git a/libspeex/kiss_fft.h b/libspeexdsp/kiss_fft.h
index fa3f2c6..fa3f2c6 100644
--- a/libspeex/kiss_fft.h
+++ b/libspeexdsp/kiss_fft.h
diff --git a/libspeex/kiss_fftr.c b/libspeexdsp/kiss_fftr.c
index f6275b8..f6275b8 100644
--- a/libspeex/kiss_fftr.c
+++ b/libspeexdsp/kiss_fftr.c
diff --git a/libspeex/kiss_fftr.h b/libspeexdsp/kiss_fftr.h
index 7bfb423..7bfb423 100644
--- a/libspeex/kiss_fftr.h
+++ b/libspeexdsp/kiss_fftr.h
diff --git a/libspeex/lpc.c b/libspeexdsp/lpc.c
index 141fd9d..141fd9d 100644
--- a/libspeex/lpc.c
+++ b/libspeexdsp/lpc.c
diff --git a/libspeex/lpc.h b/libspeexdsp/lpc.h
index 952ecdd..952ecdd 100644
--- a/libspeex/lpc.h
+++ b/libspeexdsp/lpc.h
diff --git a/libspeex/lpc_bfin.h b/libspeexdsp/lpc_bfin.h
index d7d11c0..d7d11c0 100644
--- a/libspeex/lpc_bfin.h
+++ b/libspeexdsp/lpc_bfin.h
diff --git a/libspeex/lsp.c b/libspeexdsp/lsp.c
index 79ae369..79ae369 100644
--- a/libspeex/lsp.c
+++ b/libspeexdsp/lsp.c
diff --git a/libspeex/lsp.h b/libspeexdsp/lsp.h
index 6560f85..6560f85 100644
--- a/libspeex/lsp.h
+++ b/libspeexdsp/lsp.h
diff --git a/libspeex/lsp_bfin.h b/libspeexdsp/lsp_bfin.h
index 530367c..530367c 100644
--- a/libspeex/lsp_bfin.h
+++ b/libspeexdsp/lsp_bfin.h
diff --git a/libspeex/lsp_tables_nb.c b/libspeexdsp/lsp_tables_nb.c
index 16f2e1b..16f2e1b 100644
--- a/libspeex/lsp_tables_nb.c
+++ b/libspeexdsp/lsp_tables_nb.c
diff --git a/libspeex/ltp.c b/libspeexdsp/ltp.c
index f20bca5..f20bca5 100644
--- a/libspeex/ltp.c
+++ b/libspeexdsp/ltp.c
diff --git a/libspeex/ltp.h b/libspeexdsp/ltp.h
index 7218ffe..7218ffe 100644
--- a/libspeex/ltp.h
+++ b/libspeexdsp/ltp.h
diff --git a/libspeex/ltp_arm4.h b/libspeexdsp/ltp_arm4.h
index cdb94e6..cdb94e6 100644
--- a/libspeex/ltp_arm4.h
+++ b/libspeexdsp/ltp_arm4.h
diff --git a/libspeex/ltp_bfin.h b/libspeexdsp/ltp_bfin.h
index b7edd37..b7edd37 100644
--- a/libspeex/ltp_bfin.h
+++ b/libspeexdsp/ltp_bfin.h
diff --git a/libspeex/ltp_sse.h b/libspeexdsp/ltp_sse.h
index bed6eaa..bed6eaa 100644
--- a/libspeex/ltp_sse.h
+++ b/libspeexdsp/ltp_sse.h
diff --git a/libspeex/math_approx.h b/libspeexdsp/math_approx.h
index 9ca8307..9ca8307 100644
--- a/libspeex/math_approx.h
+++ b/libspeexdsp/math_approx.h
diff --git a/libspeex/mdf.c b/libspeexdsp/mdf.c
index 8a5c031..8a5c031 100644
--- a/libspeex/mdf.c
+++ b/libspeexdsp/mdf.c
diff --git a/libspeex/misc_bfin.h b/libspeexdsp/misc_bfin.h
index 3c8c09d..3c8c09d 100644
--- a/libspeex/misc_bfin.h
+++ b/libspeexdsp/misc_bfin.h
diff --git a/libspeex/modes.c b/libspeexdsp/modes.c
index 5883a4a..5883a4a 100644
--- a/libspeex/modes.c
+++ b/libspeexdsp/modes.c
diff --git a/libspeex/modes.h b/libspeexdsp/modes.h
index cc4d064..cc4d064 100644
--- a/libspeex/modes.h
+++ b/libspeexdsp/modes.h
diff --git a/libspeex/modes_wb.c b/libspeexdsp/modes_wb.c
index cfbcdf6..cfbcdf6 100644
--- a/libspeex/modes_wb.c
+++ b/libspeexdsp/modes_wb.c
diff --git a/libspeex/nb_celp.c b/libspeexdsp/nb_celp.c
index ab2511d..ab2511d 100644
--- a/libspeex/nb_celp.c
+++ b/libspeexdsp/nb_celp.c
diff --git a/libspeex/nb_celp.h b/libspeexdsp/nb_celp.h
index 39be0b1..39be0b1 100644
--- a/libspeex/nb_celp.h
+++ b/libspeexdsp/nb_celp.h
diff --git a/libspeex/os_support.h b/libspeexdsp/os_support.h
index 6b74b0c..6b74b0c 100644
--- a/libspeex/os_support.h
+++ b/libspeexdsp/os_support.h
diff --git a/libspeex/preprocess.c b/libspeexdsp/preprocess.c
index 3920a76..3920a76 100644
--- a/libspeex/preprocess.c
+++ b/libspeexdsp/preprocess.c
diff --git a/libspeex/pseudofloat.h b/libspeexdsp/pseudofloat.h
index fa841a0..fa841a0 100644
--- a/libspeex/pseudofloat.h
+++ b/libspeexdsp/pseudofloat.h
diff --git a/libspeex/quant_lsp.c b/libspeexdsp/quant_lsp.c
index 699716b..699716b 100644
--- a/libspeex/quant_lsp.c
+++ b/libspeexdsp/quant_lsp.c
diff --git a/libspeex/quant_lsp.h b/libspeexdsp/quant_lsp.h
index 2f89430..2f89430 100644
--- a/libspeex/quant_lsp.h
+++ b/libspeexdsp/quant_lsp.h
diff --git a/libspeex/quant_lsp_bfin.h b/libspeexdsp/quant_lsp_bfin.h
index efd23f5..efd23f5 100644
--- a/libspeex/quant_lsp_bfin.h
+++ b/libspeexdsp/quant_lsp_bfin.h
diff --git a/libspeex/resample.c b/libspeexdsp/resample.c
index 7b5a308..7b5a308 100644
--- a/libspeex/resample.c
+++ b/libspeexdsp/resample.c
diff --git a/libspeex/resample_sse.h b/libspeexdsp/resample_sse.h
index 64be8a1..64be8a1 100644
--- a/libspeex/resample_sse.h
+++ b/libspeexdsp/resample_sse.h
diff --git a/libspeex/sb_celp.c b/libspeexdsp/sb_celp.c
index 389309b..389309b 100644
--- a/libspeex/sb_celp.c
+++ b/libspeexdsp/sb_celp.c
diff --git a/libspeex/sb_celp.h b/libspeexdsp/sb_celp.h
index f60e86e..f60e86e 100644
--- a/libspeex/sb_celp.h
+++ b/libspeexdsp/sb_celp.h
diff --git a/libspeex/scal.c b/libspeexdsp/scal.c
index 358f817..358f817 100755
--- a/libspeex/scal.c
+++ b/libspeexdsp/scal.c
diff --git a/libspeex/smallft.c b/libspeexdsp/smallft.c
index 5c26d01..5c26d01 100644
--- a/libspeex/smallft.c
+++ b/libspeexdsp/smallft.c
diff --git a/libspeex/smallft.h b/libspeexdsp/smallft.h
index 446e2f6..446e2f6 100644
--- a/libspeex/smallft.h
+++ b/libspeexdsp/smallft.h
diff --git a/libspeex/speex.c b/libspeexdsp/speex.c
index dd384c8..dd384c8 100644
--- a/libspeex/speex.c
+++ b/libspeexdsp/speex.c
diff --git a/libspeex/speex_callbacks.c b/libspeexdsp/speex_callbacks.c
index 27fd19a..27fd19a 100644
--- a/libspeex/speex_callbacks.c
+++ b/libspeexdsp/speex_callbacks.c
diff --git a/libspeex/speex_header.c b/libspeexdsp/speex_header.c
index 979fc9f..979fc9f 100644
--- a/libspeex/speex_header.c
+++ b/libspeexdsp/speex_header.c
diff --git a/libspeex/stack_alloc.h b/libspeexdsp/stack_alloc.h
index 5264e66..5264e66 100644
--- a/libspeex/stack_alloc.h
+++ b/libspeexdsp/stack_alloc.h
diff --git a/libspeex/stereo.c b/libspeexdsp/stereo.c
index 02337ef..02337ef 100644
--- a/libspeex/stereo.c
+++ b/libspeexdsp/stereo.c
diff --git a/libspeex/testdenoise.c b/libspeexdsp/testdenoise.c
index 9c5398b..9c5398b 100644
--- a/libspeex/testdenoise.c
+++ b/libspeexdsp/testdenoise.c
diff --git a/libspeex/testecho.c b/libspeexdsp/testecho.c
index 2eedfac..2eedfac 100644
--- a/libspeex/testecho.c
+++ b/libspeexdsp/testecho.c
diff --git a/libspeex/testenc.c b/libspeexdsp/testenc.c
index f4709b4..f4709b4 100644
--- a/libspeex/testenc.c
+++ b/libspeexdsp/testenc.c
diff --git a/libspeex/testenc_uwb.c b/libspeexdsp/testenc_uwb.c
index 18b51d6..18b51d6 100644
--- a/libspeex/testenc_uwb.c
+++ b/libspeexdsp/testenc_uwb.c
diff --git a/libspeex/testenc_wb.c b/libspeexdsp/testenc_wb.c
index 843bc24..843bc24 100644
--- a/libspeex/testenc_wb.c
+++ b/libspeexdsp/testenc_wb.c
diff --git a/libspeex/testjitter.c b/libspeexdsp/testjitter.c
index c4894fb..c4894fb 100644
--- a/libspeex/testjitter.c
+++ b/libspeexdsp/testjitter.c
diff --git a/libspeex/testresample.c b/libspeexdsp/testresample.c
index 8e16dc7..8e16dc7 100644
--- a/libspeex/testresample.c
+++ b/libspeexdsp/testresample.c
diff --git a/libspeex/vbr.c b/libspeexdsp/vbr.c
index 8b014d1..8b014d1 100644
--- a/libspeex/vbr.c
+++ b/libspeexdsp/vbr.c
diff --git a/libspeex/vbr.h b/libspeexdsp/vbr.h
index 8163440..8163440 100644
--- a/libspeex/vbr.h
+++ b/libspeexdsp/vbr.h
diff --git a/libspeex/vorbis_psy.c b/libspeexdsp/vorbis_psy.c
index 68a6fe9..68a6fe9 100644
--- a/libspeex/vorbis_psy.c
+++ b/libspeexdsp/vorbis_psy.c
diff --git a/libspeex/vorbis_psy.h b/libspeexdsp/vorbis_psy.h
index 6871057..6871057 100644
--- a/libspeex/vorbis_psy.h
+++ b/libspeexdsp/vorbis_psy.h
diff --git a/libspeex/vq.c b/libspeexdsp/vq.c
index e95e1f2..e95e1f2 100644
--- a/libspeex/vq.c
+++ b/libspeexdsp/vq.c
diff --git a/libspeex/vq.h b/libspeexdsp/vq.h
index 5a4ced2..5a4ced2 100644
--- a/libspeex/vq.h
+++ b/libspeexdsp/vq.h
diff --git a/libspeex/vq_arm4.h b/libspeexdsp/vq_arm4.h
index 585b861..585b861 100644
--- a/libspeex/vq_arm4.h
+++ b/libspeexdsp/vq_arm4.h
diff --git a/libspeex/vq_bfin.h b/libspeexdsp/vq_bfin.h
index a4d2d2f..a4d2d2f 100644
--- a/libspeex/vq_bfin.h
+++ b/libspeexdsp/vq_bfin.h
diff --git a/libspeex/vq_sse.h b/libspeexdsp/vq_sse.h
index 00a42ce..00a42ce 100644
--- a/libspeex/vq_sse.h
+++ b/libspeexdsp/vq_sse.h
diff --git a/libspeex/window.c b/libspeexdsp/window.c
index fe5ee70..fe5ee70 100644
--- a/libspeex/window.c
+++ b/libspeexdsp/window.c
diff --git a/speex.m4 b/speex.m4
deleted file mode 100644
index be144e1..0000000
--- a/speex.m4
+++ /dev/null
@@ -1,104 +0,0 @@
-# Configure paths for libspeex
-# Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
-# Shamelessly stolen from:
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl XIPH_PATH_SPEEX([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libspeex, and define SPEEX_CFLAGS and SPEEX_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_SPEEX],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(speex,[  --with-speex=PFX   Prefix where libspeex is installed (optional)], speex_prefix="$withval", speex_prefix="")
-AC_ARG_WITH(speex-libraries,[  --with-speex-libraries=DIR   Directory where libspeex library is installed (optional)], speex_libraries="$withval", speex_libraries="")
-AC_ARG_WITH(speex-includes,[  --with-speex-includes=DIR   Directory where libspeex header files are installed (optional)], speex_includes="$withval", speex_includes="")
-AC_ARG_ENABLE(speextest, [  --disable-speextest       Do not try to compile and run a test Speex program],, enable_speextest=yes)
-
-  if test "x$speex_libraries" != "x" ; then
-    SPEEX_LIBS="-L$speex_libraries"
-  elif test "x$speex_prefix" != "x" ; then
-    SPEEX_LIBS="-L$speex_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    SPEEX_LIBS="-L$prefix/lib"
-  fi
-
-  SPEEX_LIBS="$SPEEX_LIBS -lspeex"
-
-  if test "x$speex_includes" != "x" ; then
-    SPEEX_CFLAGS="-I$speex_includes"
-  elif test "x$speex_prefix" != "x" ; then
-    SPEEX_CFLAGS="-I$speex_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    SPEEX_CFLAGS="-I$prefix/include"
-  fi
-
-  AC_MSG_CHECKING(for Speex)
-  no_speex=""
-
-
-  if test "x$enable_speextest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $SPEEX_CFLAGS"
-    LIBS="$LIBS $SPEEX_LIBS"
-dnl
-dnl Now check if the installed Speex is sufficiently new.
-dnl
-      rm -f conf.speextest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <speex/speex.h>
-
-int main ()
-{
-  system("touch conf.speextest");
-  return 0;
-}
-
-],, no_speex=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_speex" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.speextest ; then
-       :
-     else
-       echo "*** Could not run Speex test program, checking why..."
-       CFLAGS="$CFLAGS $SPEEX_CFLAGS"
-       LIBS="$LIBS $SPEEX_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <speex/speex.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Speex or finding the wrong"
-       echo "*** version of Speex. If it is not finding Speex, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means Speex was incorrectly installed"
-       echo "*** or that you have moved Speex since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     SPEEX_CFLAGS=""
-     SPEEX_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(SPEEX_CFLAGS)
-  AC_SUBST(SPEEX_LIBS)
-  rm -f conf.speextest
-])
diff --git a/speex.pc.in b/speex.pc.in
deleted file mode 100644
index 3e72a36..0000000
--- a/speex.pc.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# libspeex pkg-config source file
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: speex
-Description: Speex is an audio codec tuned for speech
-Version: @SPEEX_VERSION@
-Requires:
-Conflicts:
-Libs: -L${libdir} -lspeex
-Libs.private: -lm
-Cflags: -I${includedir}
diff --git a/speexclient/README b/speexclient/README
deleted file mode 100644
index 69140d3..0000000
--- a/speexclient/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This is a VERY SIMPLE Speex VoIP client. It is not a complete VoIP application,
-isn't compatible with anything else (including probably future versions of 
-itself) and does not support any form of standard protocols. It is intended
-only as a way to show how to use Speex in a VoIP application.
-
-To use it:
-
-On Alices machine:
-% speexclient plughw:0,0 bob.somewhere.net alice_port bob_port
-
-On Bob's machine:
-% speexclient plughw:0,0 alice.somewhere.net bob_port alice_port
-
-where bob_port is the UDP port on which bob receives and alice_port is the
-UDP port on which alice receives. In most cases, the two ports can be the same.
-
-Note that the clients do not even know whether they are connected or not. All
-they do is send/receive the audio to/from a specific port. 
diff --git a/speexclient/alsa_device.c b/speexclient/alsa_device.c
deleted file mode 100644
index a3a4abb..0000000
--- a/speexclient/alsa_device.c
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
-   Copyright (C) 2004-2006 Jean-Marc Valin
-   Copyright (C) 2006 Commonwealth Scientific and Industrial Research
-                      Organisation (CSIRO) Australia
-   
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include "alsa_device.h"
-#include <stdlib.h>
-#include <alsa/asoundlib.h>
-
-struct AlsaDevice_ {
-   char *device_name;
-   int channels;
-   int period;
-   snd_pcm_t *capture_handle;
-   snd_pcm_t *playback_handle;
-   int readN, writeN;
-   struct pollfd *read_fd, *write_fd;
-};
-
-AlsaDevice *alsa_device_open(char *device_name, unsigned int rate, int channels, int period)
-{
-   int dir;
-   int err;
-   snd_pcm_hw_params_t *hw_params;
-   snd_pcm_sw_params_t *sw_params;
-   snd_pcm_uframes_t period_size = period;
-   snd_pcm_uframes_t buffer_size = 2*period;
-   static snd_output_t *jcd_out;
-   AlsaDevice *dev = malloc(sizeof(*dev));
-   if (!dev)
-      return NULL;
-   dev->device_name = malloc(1+strlen(device_name));
-   if (!dev->device_name)
-   {
-      free(dev);
-      return NULL;
-   }
-   strcpy(dev->device_name, device_name);
-   dev->channels = channels;
-   dev->period = period;
-   err = snd_output_stdio_attach(&jcd_out, stdout, 0);
-   
-   if ((err = snd_pcm_open (&dev->capture_handle, dev->device_name, SND_PCM_STREAM_CAPTURE, 0)) < 0) {
-      fprintf (stderr, "cannot open audio device %s (%s)\n",
-               dev->device_name,
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_malloc (&hw_params)) < 0) {
-      fprintf (stderr, "cannot allocate hardware parameter structure (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_any (dev->capture_handle, hw_params)) < 0) {
-      fprintf (stderr, "cannot initialize hardware parameter structure (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_set_access (dev->capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
-      fprintf (stderr, "cannot set access type (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_set_format (dev->capture_handle, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) {
-      fprintf (stderr, "cannot set sample format (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_set_rate_near (dev->capture_handle, hw_params, &rate, 0)) < 0) {
-      fprintf (stderr, "cannot set sample rate (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   /*fprintf (stderr, "rate = %d\n", rate);*/
-
-   if ((err = snd_pcm_hw_params_set_channels (dev->capture_handle, hw_params, channels)) < 0) {
-      fprintf (stderr, "cannot set channel count (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   
-   period_size = period;
-   dir = 0;
-   if ((err = snd_pcm_hw_params_set_period_size_near (dev->capture_handle, hw_params, &period_size, &dir)) < 0) {
-      fprintf (stderr, "cannot set period size (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   
-   if ((err = snd_pcm_hw_params_set_periods (dev->capture_handle, hw_params, 2, 0)) < 0) {
-      fprintf (stderr, "cannot set number of periods (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   
-   buffer_size = period_size * 2;
-   dir=0;
-   if ((err = snd_pcm_hw_params_set_buffer_size_near (dev->capture_handle, hw_params, &buffer_size)) < 0) {
-      fprintf (stderr, "cannot set buffer time (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   
-   if ((err = snd_pcm_hw_params (dev->capture_handle, hw_params)) < 0) {
-      fprintf (stderr, "cannot set capture parameters (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   /*snd_pcm_dump_setup(dev->capture_handle, jcd_out);*/
-   snd_pcm_hw_params_free (hw_params);
-
-   if ((err = snd_pcm_sw_params_malloc (&sw_params)) < 0) {
-      fprintf (stderr, "cannot allocate software parameters structure (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_sw_params_current (dev->capture_handle, sw_params)) < 0) {
-      fprintf (stderr, "cannot initialize software parameters structure (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_sw_params_set_avail_min (dev->capture_handle, sw_params, period)) < 0) {
-      fprintf (stderr, "cannot set minimum available count (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_sw_params (dev->capture_handle, sw_params)) < 0) {
-      fprintf (stderr, "cannot set software parameters (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }   
-   
-   
-   if ((err = snd_pcm_open (&dev->playback_handle, dev->device_name, SND_PCM_STREAM_PLAYBACK, 0)) < 0) {
-      fprintf (stderr, "cannot open audio device %s (%s)\n",
-               dev->device_name,
-               snd_strerror (err));
-      assert(0);
-   }
-   
-   if ((err = snd_pcm_hw_params_malloc (&hw_params)) < 0) {
-      fprintf (stderr, "cannot allocate hardware parameter structure (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_any (dev->playback_handle, hw_params)) < 0) {
-      fprintf (stderr, "cannot initialize hardware parameter structure (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_set_access (dev->playback_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
-      fprintf (stderr, "cannot set access type (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_set_format (dev->playback_handle, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) {
-      fprintf (stderr, "cannot set sample format (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   if ((err = snd_pcm_hw_params_set_rate_near (dev->playback_handle, hw_params, &rate, 0)) < 0) {
-      fprintf (stderr, "cannot set sample rate (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   /*fprintf (stderr, "rate = %d\n", rate);*/
-
-   if ((err = snd_pcm_hw_params_set_channels (dev->playback_handle, hw_params, channels)) < 0) {
-      fprintf (stderr, "cannot set channel count (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   
-   period_size = period;
-   dir = 0;
-   if ((err = snd_pcm_hw_params_set_period_size_near (dev->playback_handle, hw_params, &period_size, &dir)) < 0) {
-      fprintf (stderr, "cannot set period size (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_hw_params_set_periods (dev->playback_handle, hw_params, 2, 0)) < 0) {
-      fprintf (stderr, "cannot set number of periods (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   buffer_size = period_size * 2;
-   dir=0;
-   if ((err = snd_pcm_hw_params_set_buffer_size_near (dev->playback_handle, hw_params, &buffer_size)) < 0) {
-      fprintf (stderr, "cannot set buffer time (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-
-   if ((err = snd_pcm_hw_params (dev->playback_handle, hw_params)) < 0) {
-      fprintf (stderr, "cannot set playback parameters (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-
-   /*snd_pcm_dump_setup(dev->playback_handle, jcd_out);*/
-   snd_pcm_hw_params_free (hw_params);
-
-   
-   if ((err = snd_pcm_sw_params_malloc (&sw_params)) < 0) {
-      fprintf (stderr, "cannot allocate software parameters structure (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_sw_params_current (dev->playback_handle, sw_params)) < 0) {
-      fprintf (stderr, "cannot initialize software parameters structure (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_sw_params_set_avail_min (dev->playback_handle, sw_params, period)) < 0) {
-      fprintf (stderr, "cannot set minimum available count (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_sw_params_set_start_threshold (dev->playback_handle, sw_params, period)) < 0) {
-      fprintf (stderr, "cannot set start mode (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_sw_params (dev->playback_handle, sw_params)) < 0) {
-      fprintf (stderr, "cannot set software parameters (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-  
-   
-   snd_pcm_link(dev->capture_handle, dev->playback_handle);
-   if ((err = snd_pcm_prepare (dev->capture_handle)) < 0) {
-      fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   if ((err = snd_pcm_prepare (dev->playback_handle)) < 0) {
-      fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   
-   dev->readN = snd_pcm_poll_descriptors_count(dev->capture_handle);
-   dev->writeN = snd_pcm_poll_descriptors_count(dev->playback_handle);
-
-   dev->read_fd = malloc(dev->readN*sizeof(*dev->read_fd));
-   /*printf ("descriptors: %d %d\n", dev->readN, dev->writeN);*/
-   if (snd_pcm_poll_descriptors(dev->capture_handle, dev->read_fd, dev->readN) != dev->readN)
-   {
-      fprintf (stderr, "cannot obtain capture file descriptors (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   
-   dev->write_fd = malloc(dev->writeN*sizeof(*dev->read_fd));
-   if (snd_pcm_poll_descriptors(dev->playback_handle, dev->write_fd, dev->writeN) != dev->writeN)
-   {
-      fprintf (stderr, "cannot obtain playback file descriptors (%s)\n",
-               snd_strerror (err));
-      assert(0);
-   }
-   return dev;
-}
-
-void alsa_device_close(AlsaDevice *dev)
-{
-   snd_pcm_close(dev->capture_handle);
-   snd_pcm_close(dev->playback_handle);
-   free(dev->device_name);
-   free(dev);
-}
-
-int alsa_device_read(AlsaDevice *dev, short *pcm, int len)
-{
-   int err;
-   /*fprintf (stderr, "-");*/
-   if ((err = snd_pcm_readi (dev->capture_handle, pcm, len)) != len)
-   {
-      if (err<0)
-      {
-         //fprintf(stderr, "error %d, EPIPE = %d\n", err, EPIPE);
-         if (err == -EPIPE)
-         {
-            fprintf (stderr, "An overrun has occured, reseting capture\n");
-         } else
-         {
-            fprintf (stderr, "read from audio interface failed (%s)\n",
-                     snd_strerror (err));
-         }
-         if ((err = snd_pcm_prepare (dev->capture_handle)) < 0)
-         {
-            fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
-                     snd_strerror (err));
-         }
-         if ((err = snd_pcm_start (dev->capture_handle)) < 0)
-         {
-            fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
-                     snd_strerror (err));
-         }
-         /*alsa_device_read(dev,pcm,len);*/
-      } else {
-         fprintf (stderr, "Couldn't read as many samples as I wanted (%d instead of %d)\n", err, len);
-      }
-      return 1;
-   }
-   return 0;
-}
-
-int alsa_device_write(AlsaDevice *dev, const short *pcm, int len)
-{
-   int err;
-   /*fprintf (stderr, "+");*/
-   if ((err = snd_pcm_writei (dev->playback_handle, pcm, len)) != len)
-   {
-      if (err<0)
-      {
-         if (err == -EPIPE)
-         {
-            fprintf (stderr, "An underrun has occured, reseting playback, len=%d\n", len);
-         } else
-         {
-            fprintf (stderr, "write to audio interface failed (%s)\n",
-                     snd_strerror (err));
-         }
-         if ((err = snd_pcm_prepare (dev->playback_handle)) < 0)
-         {
-            fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
-                     snd_strerror (err));
-         }
-      } else {
-         fprintf (stderr, "Couldn't write as many samples as I wanted (%d instead of %d)\n", err, len);
-      }
-      /*alsa_device_write(dev,pcm,len);*/
-      return 1;
-   }
-   return 0;
-}
-
-int alsa_device_capture_ready(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds)
-{
-   unsigned short revents=0;
-   int err;
-   if ((err = snd_pcm_poll_descriptors_revents(dev->capture_handle, pfds, dev->readN, &revents)) < 0)
-   {
-      //cerr << "error in snd_pcm_poll_descriptors_revents for capture: " << snd_strerror (err) << endl;
-      //FIXME: This is a kludge
-      fprintf (stderr, "error in alsa_device_capture_ready: %s\n", snd_strerror (err));
-      return pfds[0].revents & POLLIN;
-   }
-   //cerr << (revents & POLLERR) << endl;
-   return revents & POLLIN;
-}
-
-int alsa_device_playback_ready(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds)
-{
-   unsigned short revents=0;
-   int err;
-   if ((err = snd_pcm_poll_descriptors_revents(dev->playback_handle, pfds+dev->readN, dev->writeN, &revents)) < 0)
-   {
-      //cerr << "error in snd_pcm_poll_descriptors_revents for playback: " << snd_strerror (err) << endl;
-      //FIXME: This is a kludge
-      fprintf (stderr, "error in alsa_device_playback_ready: %s\n", snd_strerror (err));
-      return pfds[1].revents & POLLOUT;
-   }
-   //cerr << (revents & POLLERR) << endl;
-   return revents & POLLOUT;
-}
-
-void alsa_device_start(AlsaDevice *dev)
-{
-   int i;
-   short pcm[dev->period*dev->channels];
-   for (i=0;i<dev->period*dev->channels;i++)
-      pcm[i] = 0;
-   alsa_device_write(dev, pcm, dev->period);
-   alsa_device_write(dev, pcm, dev->period);
-   snd_pcm_start(dev->capture_handle);
-   snd_pcm_start(dev->playback_handle);
-}
-
-int alsa_device_nfds(AlsaDevice *dev)
-{
-   return dev->writeN+dev->readN;
-}
-
-void alsa_device_getfds(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds)
-{
-   int i;
-   assert (nfds >= dev->writeN+dev->readN);
-   for (i=0;i<dev->readN;i++)
-      pfds[i] = dev->read_fd[i];
-   for (i=0;i<dev->writeN;i++)
-      pfds[i+dev->readN] = dev->write_fd[i];
-}
diff --git a/speexclient/alsa_device.h b/speexclient/alsa_device.h
deleted file mode 100644
index a5b3787..0000000
--- a/speexclient/alsa_device.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-   Copyright (C) 2004-2006 Jean-Marc Valin
-   Copyright (C) 2006 Commonwealth Scientific and Industrial Research
-                      Organisation (CSIRO) Australia
-   
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-   1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-   3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.
- 
-*/
-
-#ifndef ALSA_DEVICE_H
-#define ALSA_DEVICE_H
-
-#include <sys/poll.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct AlsaDevice_;
-
-typedef struct AlsaDevice_ AlsaDevice;
-
-AlsaDevice *alsa_device_open(char *device_name, unsigned int rate, int channels, int period);
-
-void alsa_device_close(AlsaDevice *dev);
-
-int alsa_device_read(AlsaDevice *dev, short *pcm, int len);
-
-int alsa_device_write(AlsaDevice *dev, const short *pcm, int len);
-
-int alsa_device_capture_ready(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds);
-
-int alsa_device_playback_ready(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds);
-
-void alsa_device_start(AlsaDevice *dev);
-
-int alsa_device_nfds(AlsaDevice *dev);
-
-void alsa_device_getfds(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/speexclient/compile.sh b/speexclient/compile.sh
deleted file mode 100755
index fe93af5..0000000
--- a/speexclient/compile.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-gcc -Wall -I../include speex_jitter_buffer.c speexclient.c alsa_device.c -o speexclient -lspeex -lspeexdsp -lasound -lm
diff --git a/speexclient/speex_jitter_buffer.c b/speexclient/speex_jitter_buffer.c
deleted file mode 100644
index 9df6659..0000000
--- a/speexclient/speex_jitter_buffer.c
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <speex/speex_jitter.h>
-#include "speex_jitter_buffer.h"
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-
-void speex_jitter_init(SpeexJitter *jitter, void *decoder, int sampling_rate)
-{
-   jitter->dec = decoder;
-   speex_decoder_ctl(decoder, SPEEX_GET_FRAME_SIZE, &jitter->frame_size);
-
-   jitter->packets = jitter_buffer_init(jitter->frame_size);
-
-   speex_bits_init(&jitter->current_packet);
-   jitter->valid_bits = 0;
-
-}
-
-void speex_jitter_destroy(SpeexJitter *jitter)
-{
-   jitter_buffer_destroy(jitter->packets);
-   speex_bits_destroy(&jitter->current_packet);
-}
-
-void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int timestamp)
-{
-   JitterBufferPacket p;
-   p.data = packet;
-   p.len = len;
-   p.timestamp = timestamp;
-   p.span = jitter->frame_size;
-   jitter_buffer_put(jitter->packets, &p);
-}
-
-void speex_jitter_get(SpeexJitter *jitter, spx_int16_t *out, int *current_timestamp)
-{
-   int i;
-   int ret;
-   spx_int32_t activity;
-   char data[2048];
-   JitterBufferPacket packet;
-   packet.data = data;
-   packet.len = 2048;
-   
-   if (jitter->valid_bits)
-   {
-      /* Try decoding last received packet */
-      ret = speex_decode_int(jitter->dec, &jitter->current_packet, out);
-      if (ret == 0)
-      {
-         jitter_buffer_tick(jitter->packets);
-         return;
-      } else {
-         jitter->valid_bits = 0;
-      }
-   }
-
-   ret = jitter_buffer_get(jitter->packets, &packet, jitter->frame_size, NULL);
-   
-   if (ret != JITTER_BUFFER_OK)
-   {
-      /* No packet found */
-
-      /*fprintf (stderr, "lost/late frame\n");*/
-      /*Packet is late or lost*/
-      speex_decode_int(jitter->dec, NULL, out);
-   } else {
-      speex_bits_read_from(&jitter->current_packet, packet.data, packet.len);
-      /* Decode packet */
-      ret = speex_decode_int(jitter->dec, &jitter->current_packet, out);
-      if (ret == 0)
-      {
-         jitter->valid_bits = 1;
-      } else {
-         /* Error while decoding */
-         for (i=0;i<jitter->frame_size;i++)
-            out[i]=0;
-      }
-   }
-   speex_decoder_ctl(jitter->dec, SPEEX_GET_ACTIVITY, &activity);
-   if (activity < 30)
-      jitter_buffer_update_delay(jitter->packets, &packet, NULL);
-   jitter_buffer_tick(jitter->packets);
-}
-
-int speex_jitter_get_pointer_timestamp(SpeexJitter *jitter)
-{
-   return jitter_buffer_get_pointer_timestamp(jitter->packets);
-}
diff --git a/speexclient/speex_jitter_buffer.h b/speexclient/speex_jitter_buffer.h
deleted file mode 100644
index 0d81ebb..0000000
--- a/speexclient/speex_jitter_buffer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
-/**
-   @file speex_jitter_buffer.h
-   @brief Adaptive jitter buffer for Speex packets only
-*/
-
-#include <speex/speex_jitter.h>
-#include <speex/speex.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @defgroup SpeexJitter SpeexJitter: Adaptive jitter buffer specifically for Speex
- *  This is the jitter buffer that reorders UDP/RTP packets and adjusts the buffer size
- * to maintain good quality and low latency. This is a simplified version that works only
- * with Speex, but is much easier to use.
- *  @{
-*/
-
-/** Speex jitter-buffer state. Never use it directly! */
-typedef struct SpeexJitter {
-   SpeexBits current_packet;         /**< Current Speex packet */
-   int valid_bits;                   /**< True if Speex bits are valid */
-   JitterBuffer *packets;            /**< Generic jitter buffer state */
-   void *dec;                        /**< Pointer to Speex decoder */
-   spx_int32_t frame_size;           /**< Frame size of Speex decoder */
-} SpeexJitter;
-
-/** Initialise jitter buffer 
- * 
- * @param jitter State of the Speex jitter buffer
- * @param decoder Speex decoder to call
- * @param sampling_rate Sampling rate used by the decoder
-*/
-void speex_jitter_init(SpeexJitter *jitter, void *decoder, int sampling_rate);
-
-/** Destroy jitter buffer */
-void speex_jitter_destroy(SpeexJitter *jitter);
-
-/** Put one packet into the jitter buffer */
-void speex_jitter_put(SpeexJitter *jitter, char *packet, int len, int timestamp);
-
-/** Get one packet from the jitter buffer */
-void speex_jitter_get(SpeexJitter *jitter, spx_int16_t *out, int *start_offset);
-
-/** Get pointer timestamp of jitter buffer */
-int speex_jitter_get_pointer_timestamp(SpeexJitter *jitter);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* @} */
diff --git a/speexclient/speexclient.c b/speexclient/speexclient.c
deleted file mode 100644
index cb375c9..0000000
--- a/speexclient/speexclient.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/***************************************************************************
-   Copyright (C) 2004-2006 by Jean-Marc Valin
-   Copyright (C) 2006 Commonwealth Scientific and Industrial Research
-                      Organisation (CSIRO) Australia
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   
-****************************************************************************/
- 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <unistd.h> /* close() */
-#include <string.h> /* memset() */
-
-#include "alsa_device.h"
-#include <speex/speex.h>
-#include <speex/speex_jitter.h>
-#include <speex/speex_preprocess.h>
-#include <speex/speex_echo.h>
-#include "speex_jitter_buffer.h"
-
-#include <sched.h>
-
-#define MAX_MSG 1500
-
-#define SAMPLING_RATE 16000
-#define FRAME_SIZE 320
-
-int main(int argc, char *argv[])
-{
-   
-   int sd, rc, n;
-   int i;
-   struct sockaddr_in cliAddr, remoteAddr;
-   char msg[MAX_MSG];
-   struct hostent *h;
-   int local_port, remote_port;
-   int nfds;
-   struct pollfd *pfds;
-   SpeexPreprocessState *preprocess;
-   AlsaDevice *audio_dev;
-   int tmp;
-
-   if (argc != 5)
-   {
-      fprintf(stderr, "wrong options\n");
-      exit(1);
-   }
-  
-   h = gethostbyname(argv[2]);
-   if(h==NULL) {
-      fprintf(stderr, "%s: unknown host '%s' \n", argv[0], argv[1]);
-      exit(1);
-   }
-
-   local_port = atoi(argv[3]);
-   remote_port = atoi(argv[4]);
-   
-   printf("%s: sending data to '%s' (IP : %s) \n", argv[0], h->h_name,
-          inet_ntoa(*(struct in_addr *)h->h_addr_list[0]));
-
-   {
-      remoteAddr.sin_family = h->h_addrtype;
-      memcpy((char *) &remoteAddr.sin_addr.s_addr,
-            h->h_addr_list[0], h->h_length);
-      remoteAddr.sin_port = htons(remote_port);
-   }
-   /* socket creation */
-   sd=socket(AF_INET, SOCK_DGRAM, 0);
-   if(sd<0) {
-      printf("%s: cannot open socket \n",argv[0]);
-      exit(1);
-   }
-
-   /* bind any port */
-   cliAddr.sin_family = AF_INET;
-   cliAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-   cliAddr.sin_port = htons(local_port);
-
-   rc = bind(sd, (struct sockaddr *) &cliAddr, sizeof(cliAddr));
-   if(rc<0) {
-      printf("%s: cannot bind port\n", argv[0]);
-      exit(1);
-   }
-
-   /* Setup audio device */
-   audio_dev = alsa_device_open(argv[1], SAMPLING_RATE, 1, FRAME_SIZE);
-   
-   /* Setup the encoder and decoder in wideband */
-   void *enc_state, *dec_state;
-   enc_state = speex_encoder_init(&speex_wb_mode);
-   tmp = 8;
-   speex_encoder_ctl(enc_state, SPEEX_SET_QUALITY, &tmp);
-   tmp = 2;
-   speex_encoder_ctl(enc_state, SPEEX_SET_COMPLEXITY, &tmp);
-   dec_state = speex_decoder_init(&speex_wb_mode);
-   tmp = 1;
-   speex_decoder_ctl(dec_state, SPEEX_SET_ENH, &tmp);
-   SpeexBits enc_bits, dec_bits;
-   speex_bits_init(&enc_bits);
-   speex_bits_init(&dec_bits);
-   
-   
-   struct sched_param param;
-   /*param.sched_priority = 40; */
-   param.sched_priority = sched_get_priority_min(SCHED_FIFO);
-   if (sched_setscheduler(0,SCHED_FIFO,&param))
-      perror("sched_setscheduler");
-
-   int send_timestamp = 0;
-   int recv_started=0;
-   
-   /* Setup all file descriptors for poll()ing */
-   nfds = alsa_device_nfds(audio_dev);
-   pfds = malloc(sizeof(*pfds)*(nfds+1));
-   alsa_device_getfds(audio_dev, pfds, nfds);
-   pfds[nfds].fd = sd;
-   pfds[nfds].events = POLLIN;
-
-   /* Setup jitter buffer using decoder */
-   SpeexJitter jitter;
-   speex_jitter_init(&jitter, dec_state, SAMPLING_RATE);
-   
-   /* Echo canceller with 200 ms tail length */
-   SpeexEchoState *echo_state = speex_echo_state_init(FRAME_SIZE, 10*FRAME_SIZE);
-   tmp = SAMPLING_RATE;
-   speex_echo_ctl(echo_state, SPEEX_ECHO_SET_SAMPLING_RATE, &tmp);
-
-   /* Setup preprocessor and associate with echo canceller for residual echo suppression */
-   preprocess = speex_preprocess_state_init(FRAME_SIZE, SAMPLING_RATE);
-   speex_preprocess_ctl(preprocess, SPEEX_PREPROCESS_SET_ECHO_STATE, echo_state);
-   
-   alsa_device_start(audio_dev);
-   
-   /* Infinite loop on capture, playback and receiving packets */
-   while (1)
-   {
-      /* Wait for either 1) capture 2) playback 3) socket data */
-      poll(pfds, nfds+1, -1);
-      /* Received packets */
-      if (pfds[nfds].revents & POLLIN)
-      {
-         /*fprintf (stderr, "x");*/
-         n = recv(sd, msg, MAX_MSG, 0);
-         int recv_timestamp = ((int*)msg)[1];
-         int payload = ((int*)msg)[0];
-   
-         if ((payload & 0x80000000) == 0) 
-         {
-            /* Put content of the packet into the jitter buffer, except for the pseudo-header */
-            speex_jitter_put(&jitter, msg+8, n-8, recv_timestamp);
-            recv_started = 1;
-         }
-
-      }
-      /* Ready to play a frame (playback) */
-      if (alsa_device_playback_ready(audio_dev, pfds, nfds))
-      {
-         short pcm[FRAME_SIZE];
-         if (recv_started)
-         {
-            /* Get audio from the jitter buffer */
-            speex_jitter_get(&jitter, pcm, NULL);
-         } else {
-            for (i=0;i<FRAME_SIZE;i++)
-               pcm[i] = 0;
-         }
-         /* Playback the audio and reset the echo canceller if we got an underrun */
-         if (alsa_device_write(audio_dev, pcm, FRAME_SIZE))
-            speex_echo_state_reset(echo_state);
-         /* Put frame into playback buffer */
-         speex_echo_playback(echo_state, pcm);
-      }
-      /* Audio available from the soundcard (capture) */
-      if (alsa_device_capture_ready(audio_dev, pfds, nfds))
-      {
-         short pcm[FRAME_SIZE], pcm2[FRAME_SIZE];
-         char outpacket[MAX_MSG];
-         /* Get audio from the soundcard */
-         alsa_device_read(audio_dev, pcm, FRAME_SIZE);
-         
-         /* Perform echo cancellation */
-         speex_echo_capture(echo_state, pcm, pcm2);
-         for (i=0;i<FRAME_SIZE;i++)
-            pcm[i] = pcm2[i];
-         
-         speex_bits_reset(&enc_bits);
-         
-         /* Apply noise/echo suppression */
-         speex_preprocess_run(preprocess, pcm);
-         
-         /* Encode */
-         speex_encode_int(enc_state, pcm, &enc_bits);
-         int packetSize = speex_bits_write(&enc_bits, outpacket+8, MAX_MSG);
-         
-         /* Pseudo header: four null bytes and a 32-bit timestamp */
-         ((int*)outpacket)[0] = htonl(0);
-         ((int*)outpacket)[1] = send_timestamp;
-         send_timestamp += FRAME_SIZE;
-         rc = sendto(sd, outpacket, packetSize+8, 0,
-                (struct sockaddr *) &remoteAddr,
-                sizeof(remoteAddr));
-         
-         if(rc<0) {
-            printf("cannot send audio data\n");
-            close(sd);
-            exit(1);
-         }
-      }
-      
-
-   }
-
-
-   return 0;
-}
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index e995588..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 1b5dfb4..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-
-
-# $Id: Makefile.am,v 1.11 2004/02/18 06:59:40 jm Exp $
-
-# Disable automatic dependency tracking if using other tools than gcc and gmake
-#AUTOMAKE_OPTIONS = no-dependencies
-
-if BUILD_VORBIS_PSY
-  VPSY_LIB=$(top_builddir)/libspeex/libspeexdsp.la
-else
-  VPSY_LIB=
-endif
-
-INCLUDES = -I$(top_builddir) @OGG_CFLAGS@
-
-man_MANS = speexenc.1 speexdec.1
-
-EXTRA_DIST = $(man_MANS) getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h skeleton.h
-
-include_HEADERS = 
-noinst_HEADERS = wav_io.h
-
-bin_PROGRAMS = speexenc speexdec
-
-speexenc_SOURCES = speexenc.c wav_io.c skeleton.c
-speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(top_builddir)/libspeex/libspeexdsp.la \
-	$(OGG_LIBS)  @FFT_LIBS@	
-
-speexdec_SOURCES = speexdec.c wav_io.c
-speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(VPSY_LIB) \
-	$(OGG_LIBS)  @FFT_LIBS@
diff --git a/src/getopt.c b/src/getopt.c
deleted file mode 100644
index 33d299b..0000000
--- a/src/getopt.c
+++ /dev/null
@@ -1,1047 +0,0 @@
-/* Getopt for GNU.

-   NOTE: getopt is now part of the C library, so if you don't know what

-   "Keep this file name-space clean" means, talk to drepper@gnu.org

-   before changing it!

-

-   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99

-   	Free Software Foundation, Inc.

-

-   The GNU C Library is free software; you can redistribute it and/or

-   modify it under the terms of the GNU Library General Public License as

-   published by the Free Software Foundation; either version 2 of the

-   License, or (at your option) any later version.

-

-   The GNU C Library is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-   Library General Public License for more details.

-

-   You should have received a copy of the GNU Library General Public

-   License along with the GNU C Library; see the file COPYING.LIB.  If not,

-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-   Boston, MA 02111-1307, USA.  */

-

-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.

-   Ditto for AIX 3.2 and <stdlib.h>.  */

-#ifndef _NO_PROTO

-# define _NO_PROTO

-#endif

-

-#ifdef HAVE_CONFIG_H

-# include "config.h"

-#endif

-

-#if !defined __STDC__ || !__STDC__

-/* This is a separate conditional since some stdc systems

-   reject `defined (const)'.  */

-# ifndef const

-#  define const

-# endif

-#endif

-

-#include <stdio.h>

-

-/* Comment out all this code if we are using the GNU C Library, and are not

-   actually compiling the library itself.  This code is part of the GNU C

-   Library, but also included in many other GNU distributions.  Compiling

-   and linking in this code is a waste when using the GNU C library

-   (especially if it is a shared library).  Rather than having every GNU

-   program understand `configure --with-gnu-libc' and omit the object files,

-   it is simpler to just do this in the source for each such file.  */

-

-#define GETOPT_INTERFACE_VERSION 2

-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2

-# include <gnu-versions.h>

-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION

-#  define ELIDE_CODE

-# endif

-#endif

-

-#ifndef ELIDE_CODE

-

-

-/* This needs to come after some library #include

-   to get __GNU_LIBRARY__ defined.  */

-#ifdef	__GNU_LIBRARY__

-/* Don't include stdlib.h for non-GNU C libraries because some of them

-   contain conflicting prototypes for getopt.  */

-# include <stdlib.h>

-# include <unistd.h>

-#endif	/* GNU C library.  */

-

-#ifdef VMS

-# include <unixlib.h>

-# if HAVE_STRING_H - 0

-#  include <string.h>

-# endif

-#endif

-

-#ifndef _

-/* This is for other GNU distributions with internationalized messages.

-   When compiling libc, the _ macro is predefined.  */

-# ifdef HAVE_LIBINTL_H

-#  include <libintl.h>

-#  define _(msgid)	gettext (msgid)

-# else

-#  define _(msgid)	(msgid)

-# endif

-#endif

-

-/* This version of `getopt' appears to the caller like standard Unix `getopt'

-   but it behaves differently for the user, since it allows the user

-   to intersperse the options with the other arguments.

-

-   As `getopt' works, it permutes the elements of ARGV so that,

-   when it is done, all the options precede everything else.  Thus

-   all application programs are extended to handle flexible argument order.

-

-   Setting the environment variable POSIXLY_CORRECT disables permutation.

-   Then the behavior is completely standard.

-

-   GNU application programs can use a third alternative mode in which

-   they can distinguish the relative order of options and other arguments.  */

-

-#include "getopt_win.h"

-

-/* For communication from `getopt' to the caller.

-   When `getopt' finds an option that takes an argument,

-   the argument value is returned here.

-   Also, when `ordering' is RETURN_IN_ORDER,

-   each non-option ARGV-element is returned here.  */

-

-char *optarg;

-

-/* Index in ARGV of the next element to be scanned.

-   This is used for communication to and from the caller

-   and for communication between successive calls to `getopt'.

-

-   On entry to `getopt', zero means this is the first call; initialize.

-

-   When `getopt' returns -1, this is the index of the first of the

-   non-option elements that the caller should itself scan.

-

-   Otherwise, `optind' communicates from one call to the next

-   how much of ARGV has been scanned so far.  */

-

-/* 1003.2 says this must be 1 before any call.  */

-int optind = 1;

-

-/* Formerly, initialization of getopt depended on optind==0, which

-   causes problems with re-calling getopt as programs generally don't

-   know that. */

-

-int __getopt_initialized;

-

-/* The next char to be scanned in the option-element

-   in which the last option character we returned was found.

-   This allows us to pick up the scan where we left off.

-

-   If this is zero, or a null string, it means resume the scan

-   by advancing to the next ARGV-element.  */

-

-static char *nextchar;

-

-/* Callers store zero here to inhibit the error message

-   for unrecognized options.  */

-

-int opterr = 1;

-

-/* Set to an option character which was unrecognized.

-   This must be initialized on some systems to avoid linking in the

-   system's own getopt implementation.  */

-

-int optopt = '?';

-

-/* Describe how to deal with options that follow non-option ARGV-elements.

-

-   If the caller did not specify anything,

-   the default is REQUIRE_ORDER if the environment variable

-   POSIXLY_CORRECT is defined, PERMUTE otherwise.

-

-   REQUIRE_ORDER means don't recognize them as options;

-   stop option processing when the first non-option is seen.

-   This is what Unix does.

-   This mode of operation is selected by either setting the environment

-   variable POSIXLY_CORRECT, or using `+' as the first character

-   of the list of option characters.

-

-   PERMUTE is the default.  We permute the contents of ARGV as we scan,

-   so that eventually all the non-options are at the end.  This allows options

-   to be given in any order, even with programs that were not written to

-   expect this.

-

-   RETURN_IN_ORDER is an option available to programs that were written

-   to expect options and other ARGV-elements in any order and that care about

-   the ordering of the two.  We describe each non-option ARGV-element

-   as if it were the argument of an option with character code 1.

-   Using `-' as the first character of the list of option characters

-   selects this mode of operation.

-

-   The special argument `--' forces an end of option-scanning regardless

-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only

-   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */

-

-static enum

-{

-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER

-} ordering;

-

-/* Value of POSIXLY_CORRECT environment variable.  */

-static char *posixly_correct;

-

-#ifdef	__GNU_LIBRARY__

-/* We want to avoid inclusion of string.h with non-GNU libraries

-   because there are many ways it can cause trouble.

-   On some systems, it contains special magic macros that don't work

-   in GCC.  */

-# include <string.h>

-# define my_index	strchr

-#else

-

-#include <string.h>

-

-/* Avoid depending on library functions or files

-   whose names are inconsistent.  */

-

-#ifndef getenv

-extern char *getenv ();

-#endif

-

-static char *

-my_index (str, chr)

-     const char *str;

-     int chr;

-{

-  while (*str)

-    {

-      if (*str == chr)

-	return (char *) str;

-      str++;

-    }

-  return 0;

-}

-

-/* If using GCC, we can safely declare strlen this way.

-   If not using GCC, it is ok not to declare it.  */

-#ifdef __GNUC__

-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.

-   That was relevant to code that was here before.  */

-# if (!defined __STDC__ || !__STDC__) && !defined strlen

-/* gcc with -traditional declares the built-in strlen to return int,

-   and has done so at least since version 2.4.5. -- rms.  */

-extern int strlen (const char *);

-# endif /* not __STDC__ */

-#endif /* __GNUC__ */

-

-#endif /* not __GNU_LIBRARY__ */

-

-/* Handle permutation of arguments.  */

-

-/* Describe the part of ARGV that contains non-options that have

-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;

-   `last_nonopt' is the index after the last of them.  */

-

-static int first_nonopt;

-static int last_nonopt;

-

-#ifdef _LIBC

-/* Bash 2.0 gives us an environment variable containing flags

-   indicating ARGV elements that should not be considered arguments.  */

-

-/* Defined in getopt_init.c  */

-extern char *__getopt_nonoption_flags;

-

-static int nonoption_flags_max_len;

-static int nonoption_flags_len;

-

-static int original_argc;

-static char *const *original_argv;

-

-/* Make sure the environment variable bash 2.0 puts in the environment

-   is valid for the getopt call we must make sure that the ARGV passed

-   to getopt is that one passed to the process.  */

-static void

-__attribute__ ((unused))

-store_args_and_env (int argc, char *const *argv)

-{

-  /* XXX This is no good solution.  We should rather copy the args so

-     that we can compare them later.  But we must not use malloc(3).  */

-  original_argc = argc;

-  original_argv = argv;

-}

-# ifdef text_set_element

-text_set_element (__libc_subinit, store_args_and_env);

-# endif /* text_set_element */

-

-# define SWAP_FLAGS(ch1, ch2) \

-  if (nonoption_flags_len > 0)						      \

-    {									      \

-      char __tmp = __getopt_nonoption_flags[ch1];			      \

-      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \

-      __getopt_nonoption_flags[ch2] = __tmp;				      \

-    }

-#else	/* !_LIBC */

-# define SWAP_FLAGS(ch1, ch2)

-#endif	/* _LIBC */

-

-/* Exchange two adjacent subsequences of ARGV.

-   One subsequence is elements [first_nonopt,last_nonopt)

-   which contains all the non-options that have been skipped so far.

-   The other is elements [last_nonopt,optind), which contains all

-   the options processed since those non-options were skipped.

-

-   `first_nonopt' and `last_nonopt' are relocated so that they describe

-   the new indices of the non-options in ARGV after they are moved.  */

-

-#if defined __STDC__ && __STDC__

-static void exchange (char **);

-#endif

-

-static void

-exchange (argv)

-     char **argv;

-{

-  int bottom = first_nonopt;

-  int middle = last_nonopt;

-  int top = optind;

-  char *tem;

-

-  /* Exchange the shorter segment with the far end of the longer segment.

-     That puts the shorter segment into the right place.

-     It leaves the longer segment in the right place overall,

-     but it consists of two parts that need to be swapped next.  */

-

-#ifdef _LIBC

-  /* First make sure the handling of the `__getopt_nonoption_flags'

-     string can work normally.  Our top argument must be in the range

-     of the string.  */

-  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)

-    {

-      /* We must extend the array.  The user plays games with us and

-	 presents new arguments.  */

-      char *new_str = malloc (top + 1);

-      if (new_str == NULL)

-	nonoption_flags_len = nonoption_flags_max_len = 0;

-      else

-	{

-	  memset (__mempcpy (new_str, __getopt_nonoption_flags,

-			     nonoption_flags_max_len),

-		  '\0', top + 1 - nonoption_flags_max_len);

-	  nonoption_flags_max_len = top + 1;

-	  __getopt_nonoption_flags = new_str;

-	}

-    }

-#endif

-

-  while (top > middle && middle > bottom)

-    {

-      if (top - middle > middle - bottom)

-	{

-	  /* Bottom segment is the short one.  */

-	  int len = middle - bottom;

-	  register int i;

-

-	  /* Swap it with the top part of the top segment.  */

-	  for (i = 0; i < len; i++)

-	    {

-	      tem = argv[bottom + i];

-	      argv[bottom + i] = argv[top - (middle - bottom) + i];

-	      argv[top - (middle - bottom) + i] = tem;

-	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);

-	    }

-	  /* Exclude the moved bottom segment from further swapping.  */

-	  top -= len;

-	}

-      else

-	{

-	  /* Top segment is the short one.  */

-	  int len = top - middle;

-	  register int i;

-

-	  /* Swap it with the bottom part of the bottom segment.  */

-	  for (i = 0; i < len; i++)

-	    {

-	      tem = argv[bottom + i];

-	      argv[bottom + i] = argv[middle + i];

-	      argv[middle + i] = tem;

-	      SWAP_FLAGS (bottom + i, middle + i);

-	    }

-	  /* Exclude the moved top segment from further swapping.  */

-	  bottom += len;

-	}

-    }

-

-  /* Update records for the slots the non-options now occupy.  */

-

-  first_nonopt += (optind - last_nonopt);

-  last_nonopt = optind;

-}

-

-/* Initialize the internal data when the first call is made.  */

-

-#if defined __STDC__ && __STDC__

-static const char *_getopt_initialize (int, char *const *, const char *);

-#endif

-static const char *

-_getopt_initialize (argc, argv, optstring)

-     int argc;

-     char *const *argv;

-     const char *optstring;

-{

-  /* Start processing options with ARGV-element 1 (since ARGV-element 0

-     is the program name); the sequence of previously skipped

-     non-option ARGV-elements is empty.  */

-

-  first_nonopt = last_nonopt = optind;

-

-  nextchar = NULL;

-

-  posixly_correct = getenv ("POSIXLY_CORRECT");

-

-  /* Determine how to handle the ordering of options and nonoptions.  */

-

-  if (optstring[0] == '-')

-    {

-      ordering = RETURN_IN_ORDER;

-      ++optstring;

-    }

-  else if (optstring[0] == '+')

-    {

-      ordering = REQUIRE_ORDER;

-      ++optstring;

-    }

-  else if (posixly_correct != NULL)

-    ordering = REQUIRE_ORDER;

-  else

-    ordering = PERMUTE;

-

-#ifdef _LIBC

-  if (posixly_correct == NULL

-      && argc == original_argc && argv == original_argv)

-    {

-      if (nonoption_flags_max_len == 0)

-	{

-	  if (__getopt_nonoption_flags == NULL

-	      || __getopt_nonoption_flags[0] == '\0')

-	    nonoption_flags_max_len = -1;

-	  else

-	    {

-	      const char *orig_str = __getopt_nonoption_flags;

-	      int len = nonoption_flags_max_len = strlen (orig_str);

-	      if (nonoption_flags_max_len < argc)

-		nonoption_flags_max_len = argc;

-	      __getopt_nonoption_flags =

-		(char *) malloc (nonoption_flags_max_len);

-	      if (__getopt_nonoption_flags == NULL)

-		nonoption_flags_max_len = -1;

-	      else

-		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),

-			'\0', nonoption_flags_max_len - len);

-	    }

-	}

-      nonoption_flags_len = nonoption_flags_max_len;

-    }

-  else

-    nonoption_flags_len = 0;

-#endif

-

-  return optstring;

-}

-

-/* Scan elements of ARGV (whose length is ARGC) for option characters

-   given in OPTSTRING.

-

-   If an element of ARGV starts with '-', and is not exactly "-" or "--",

-   then it is an option element.  The characters of this element

-   (aside from the initial '-') are option characters.  If `getopt'

-   is called repeatedly, it returns successively each of the option characters

-   from each of the option elements.

-

-   If `getopt' finds another option character, it returns that character,

-   updating `optind' and `nextchar' so that the next call to `getopt' can

-   resume the scan with the following option character or ARGV-element.

-

-   If there are no more option characters, `getopt' returns -1.

-   Then `optind' is the index in ARGV of the first ARGV-element

-   that is not an option.  (The ARGV-elements have been permuted

-   so that those that are not options now come last.)

-

-   OPTSTRING is a string containing the legitimate option characters.

-   If an option character is seen that is not listed in OPTSTRING,

-   return '?' after printing an error message.  If you set `opterr' to

-   zero, the error message is suppressed but we still return '?'.

-

-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,

-   so the following text in the same ARGV-element, or the text of the following

-   ARGV-element, is returned in `optarg'.  Two colons mean an option that

-   wants an optional arg; if there is text in the current ARGV-element,

-   it is returned in `optarg', otherwise `optarg' is set to zero.

-

-   If OPTSTRING starts with `-' or `+', it requests different methods of

-   handling the non-option ARGV-elements.

-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.

-

-   Long-named options begin with `--' instead of `-'.

-   Their names may be abbreviated as long as the abbreviation is unique

-   or is an exact match for some defined option.  If they have an

-   argument, it follows the option name in the same ARGV-element, separated

-   from the option name by a `=', or else the in next ARGV-element.

-   When `getopt' finds a long-named option, it returns 0 if that option's

-   `flag' field is nonzero, the value of the option's `val' field

-   if the `flag' field is zero.

-

-   The elements of ARGV aren't really const, because we permute them.

-   But we pretend they're const in the prototype to be compatible

-   with other systems.

-

-   LONGOPTS is a vector of `struct option' terminated by an

-   element containing a name which is zero.

-

-   LONGIND returns the index in LONGOPT of the long-named option found.

-   It is only valid when a long-named option has been found by the most

-   recent call.

-

-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce

-   long-named options.  */

-

-int

-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)

-     int argc;

-     char *const *argv;

-     const char *optstring;

-     const struct option *longopts;

-     int *longind;

-     int long_only;

-{

-  optarg = NULL;

-

-  if (optind == 0 || !__getopt_initialized)

-    {

-      if (optind == 0)

-	optind = 1;	/* Don't scan ARGV[0], the program name.  */

-      optstring = _getopt_initialize (argc, argv, optstring);

-      __getopt_initialized = 1;

-    }

-

-  /* Test whether ARGV[optind] points to a non-option argument.

-     Either it does not have option syntax, or there is an environment flag

-     from the shell indicating it is not an option.  The later information

-     is only used when the used in the GNU libc.  */

-#ifdef _LIBC

-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \

-		      || (optind < nonoption_flags_len			      \

-			  && __getopt_nonoption_flags[optind] == '1'))

-#else

-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')

-#endif

-

-  if (nextchar == NULL || *nextchar == '\0')

-    {

-      /* Advance to the next ARGV-element.  */

-

-      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been

-	 moved back by the user (who may also have changed the arguments).  */

-      if (last_nonopt > optind)

-	last_nonopt = optind;

-      if (first_nonopt > optind)

-	first_nonopt = optind;

-

-      if (ordering == PERMUTE)

-	{

-	  /* If we have just processed some options following some non-options,

-	     exchange them so that the options come first.  */

-

-	  if (first_nonopt != last_nonopt && last_nonopt != optind)

-	    exchange ((char **) argv);

-	  else if (last_nonopt != optind)

-	    first_nonopt = optind;

-

-	  /* Skip any additional non-options

-	     and extend the range of non-options previously skipped.  */

-

-	  while (optind < argc && NONOPTION_P)

-	    optind++;

-	  last_nonopt = optind;

-	}

-

-      /* The special ARGV-element `--' means premature end of options.

-	 Skip it like a null option,

-	 then exchange with previous non-options as if it were an option,

-	 then skip everything else like a non-option.  */

-

-      if (optind != argc && !strcmp (argv[optind], "--"))

-	{

-	  optind++;

-

-	  if (first_nonopt != last_nonopt && last_nonopt != optind)

-	    exchange ((char **) argv);

-	  else if (first_nonopt == last_nonopt)

-	    first_nonopt = optind;

-	  last_nonopt = argc;

-

-	  optind = argc;

-	}

-

-      /* If we have done all the ARGV-elements, stop the scan

-	 and back over any non-options that we skipped and permuted.  */

-

-      if (optind == argc)

-	{

-	  /* Set the next-arg-index to point at the non-options

-	     that we previously skipped, so the caller will digest them.  */

-	  if (first_nonopt != last_nonopt)

-	    optind = first_nonopt;

-	  return -1;

-	}

-

-      /* If we have come to a non-option and did not permute it,

-	 either stop the scan or describe it to the caller and pass it by.  */

-

-      if (NONOPTION_P)

-	{

-	  if (ordering == REQUIRE_ORDER)

-	    return -1;

-	  optarg = argv[optind++];

-	  return 1;

-	}

-

-      /* We have found another option-ARGV-element.

-	 Skip the initial punctuation.  */

-

-      nextchar = (argv[optind] + 1

-		  + (longopts != NULL && argv[optind][1] == '-'));

-    }

-

-  /* Decode the current option-ARGV-element.  */

-

-  /* Check whether the ARGV-element is a long option.

-

-     If long_only and the ARGV-element has the form "-f", where f is

-     a valid short option, don't consider it an abbreviated form of

-     a long option that starts with f.  Otherwise there would be no

-     way to give the -f short option.

-

-     On the other hand, if there's a long option "fubar" and

-     the ARGV-element is "-fu", do consider that an abbreviation of

-     the long option, just like "--fu", and not "-f" with arg "u".

-

-     This distinction seems to be the most useful approach.  */

-

-  if (longopts != NULL

-      && (argv[optind][1] == '-'

-	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))

-    {

-      char *nameend;

-      const struct option *p;

-      const struct option *pfound = NULL;

-      int exact = 0;

-      int ambig = 0;

-      int indfound = -1;

-      int option_index;

-

-      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)

-	/* Do nothing.  */ ;

-

-      /* Test all long options for either exact match

-	 or abbreviated matches.  */

-      for (p = longopts, option_index = 0; p->name; p++, option_index++)

-	if (!strncmp (p->name, nextchar, nameend - nextchar))

-	  {

-	    if ((unsigned int) (nameend - nextchar)

-		== (unsigned int) strlen (p->name))

-	      {

-		/* Exact match found.  */

-		pfound = p;

-		indfound = option_index;

-		exact = 1;

-		break;

-	      }

-	    else if (pfound == NULL)

-	      {

-		/* First nonexact match found.  */

-		pfound = p;

-		indfound = option_index;

-	      }

-	    else

-	      /* Second or later nonexact match found.  */

-	      ambig = 1;

-	  }

-

-      if (ambig && !exact)

-	{

-	  if (opterr)

-	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),

-		     argv[0], argv[optind]);

-	  nextchar += strlen (nextchar);

-	  optind++;

-	  optopt = 0;

-	  return '?';

-	}

-

-      if (pfound != NULL)

-	{

-	  option_index = indfound;

-	  optind++;

-	  if (*nameend)

-	    {

-	      /* Don't test has_arg with >, because some C compilers don't

-		 allow it to be used on enums.  */

-	      if (pfound->has_arg)

-		optarg = nameend + 1;

-	      else

-		{

-		  if (opterr)

-		    {

-		      if (argv[optind - 1][1] == '-')

-			/* --option */

-			fprintf (stderr,

-				 _("%s: option `--%s' doesn't allow an argument\n"),

-				 argv[0], pfound->name);

-		      else

-			/* +option or -option */

-			fprintf (stderr,

-				 _("%s: option `%c%s' doesn't allow an argument\n"),

-				 argv[0], argv[optind - 1][0], pfound->name);

-		    }

-

-		  nextchar += strlen (nextchar);

-

-		  optopt = pfound->val;

-		  return '?';

-		}

-	    }

-	  else if (pfound->has_arg == 1)

-	    {

-	      if (optind < argc)

-		optarg = argv[optind++];

-	      else

-		{

-		  if (opterr)

-		    fprintf (stderr,

-			   _("%s: option `%s' requires an argument\n"),

-			   argv[0], argv[optind - 1]);

-		  nextchar += strlen (nextchar);

-		  optopt = pfound->val;

-		  return optstring[0] == ':' ? ':' : '?';

-		}

-	    }

-	  nextchar += strlen (nextchar);

-	  if (longind != NULL)

-	    *longind = option_index;

-	  if (pfound->flag)

-	    {

-	      *(pfound->flag) = pfound->val;

-	      return 0;

-	    }

-	  return pfound->val;

-	}

-

-      /* Can't find it as a long option.  If this is not getopt_long_only,

-	 or the option starts with '--' or is not a valid short

-	 option, then it's an error.

-	 Otherwise interpret it as a short option.  */

-      if (!long_only || argv[optind][1] == '-'

-	  || my_index (optstring, *nextchar) == NULL)

-	{

-	  if (opterr)

-	    {

-	      if (argv[optind][1] == '-')

-		/* --option */

-		fprintf (stderr, _("%s: unrecognized option `--%s'\n"),

-			 argv[0], nextchar);

-	      else

-		/* +option or -option */

-		fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),

-			 argv[0], argv[optind][0], nextchar);

-	    }

-	  nextchar = (char *) "";

-	  optind++;

-	  optopt = 0;

-	  return '?';

-	}

-    }

-

-  /* Look at and handle the next short option-character.  */

-

-  {

-    char c = *nextchar++;

-    char *temp = my_index (optstring, c);

-

-    /* Increment `optind' when we start to process its last character.  */

-    if (*nextchar == '\0')

-      ++optind;

-

-    if (temp == NULL || c == ':')

-      {

-	if (opterr)

-	  {

-	    if (posixly_correct)

-	      /* 1003.2 specifies the format of this message.  */

-	      fprintf (stderr, _("%s: illegal option -- %c\n"),

-		       argv[0], c);

-	    else

-	      fprintf (stderr, _("%s: invalid option -- %c\n"),

-		       argv[0], c);

-	  }

-	optopt = c;

-	return '?';

-      }

-    /* Convenience. Treat POSIX -W foo same as long option --foo */

-    if (temp[0] == 'W' && temp[1] == ';')

-      {

-	char *nameend;

-	const struct option *p;

-	const struct option *pfound = NULL;

-	int exact = 0;

-	int ambig = 0;

-	int indfound = 0;

-	int option_index;

-

-	/* This is an option that requires an argument.  */

-	if (*nextchar != '\0')

-	  {

-	    optarg = nextchar;

-	    /* If we end this ARGV-element by taking the rest as an arg,

-	       we must advance to the next element now.  */

-	    optind++;

-	  }

-	else if (optind == argc)

-	  {

-	    if (opterr)

-	      {

-		/* 1003.2 specifies the format of this message.  */

-		fprintf (stderr, _("%s: option requires an argument -- %c\n"),

-			 argv[0], c);

-	      }

-	    optopt = c;

-	    if (optstring[0] == ':')

-	      c = ':';

-	    else

-	      c = '?';

-	    return c;

-	  }

-	else

-	  /* We already incremented `optind' once;

-	     increment it again when taking next ARGV-elt as argument.  */

-	  optarg = argv[optind++];

-

-	/* optarg is now the argument, see if it's in the

-	   table of longopts.  */

-

-	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)

-	  /* Do nothing.  */ ;

-

-	/* Test all long options for either exact match

-	   or abbreviated matches.  */

-	for (p = longopts, option_index = 0; p->name; p++, option_index++)

-	  if (!strncmp (p->name, nextchar, nameend - nextchar))

-	    {

-	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))

-		{

-		  /* Exact match found.  */

-		  pfound = p;

-		  indfound = option_index;

-		  exact = 1;

-		  break;

-		}

-	      else if (pfound == NULL)

-		{

-		  /* First nonexact match found.  */

-		  pfound = p;

-		  indfound = option_index;

-		}

-	      else

-		/* Second or later nonexact match found.  */

-		ambig = 1;

-	    }

-	if (ambig && !exact)

-	  {

-	    if (opterr)

-	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),

-		       argv[0], argv[optind]);

-	    nextchar += strlen (nextchar);

-	    optind++;

-	    return '?';

-	  }

-	if (pfound != NULL)

-	  {

-	    option_index = indfound;

-	    if (*nameend)

-	      {

-		/* Don't test has_arg with >, because some C compilers don't

-		   allow it to be used on enums.  */

-		if (pfound->has_arg)

-		  optarg = nameend + 1;

-		else

-		  {

-		    if (opterr)

-		      fprintf (stderr, _("\

-%s: option `-W %s' doesn't allow an argument\n"),

-			       argv[0], pfound->name);

-

-		    nextchar += strlen (nextchar);

-		    return '?';

-		  }

-	      }

-	    else if (pfound->has_arg == 1)

-	      {

-		if (optind < argc)

-		  optarg = argv[optind++];

-		else

-		  {

-		    if (opterr)

-		      fprintf (stderr,

-			       _("%s: option `%s' requires an argument\n"),

-			       argv[0], argv[optind - 1]);

-		    nextchar += strlen (nextchar);

-		    return optstring[0] == ':' ? ':' : '?';

-		  }

-	      }

-	    nextchar += strlen (nextchar);

-	    if (longind != NULL)

-	      *longind = option_index;

-	    if (pfound->flag)

-	      {

-		*(pfound->flag) = pfound->val;

-		return 0;

-	      }

-	    return pfound->val;

-	  }

-	  nextchar = NULL;

-	  return 'W';	/* Let the application handle it.   */

-      }

-    if (temp[1] == ':')

-      {

-	if (temp[2] == ':')

-	  {

-	    /* This is an option that accepts an argument optionally.  */

-	    if (*nextchar != '\0')

-	      {

-		optarg = nextchar;

-		optind++;

-	      }

-	    else

-	      optarg = NULL;

-	    nextchar = NULL;

-	  }

-	else

-	  {

-	    /* This is an option that requires an argument.  */

-	    if (*nextchar != '\0')

-	      {

-		optarg = nextchar;

-		/* If we end this ARGV-element by taking the rest as an arg,

-		   we must advance to the next element now.  */

-		optind++;

-	      }

-	    else if (optind == argc)

-	      {

-		if (opterr)

-		  {

-		    /* 1003.2 specifies the format of this message.  */

-		    fprintf (stderr,

-			   _("%s: option requires an argument -- %c\n"),

-			   argv[0], c);

-		  }

-		optopt = c;

-		if (optstring[0] == ':')

-		  c = ':';

-		else

-		  c = '?';

-	      }

-	    else

-	      /* We already incremented `optind' once;

-		 increment it again when taking next ARGV-elt as argument.  */

-	      optarg = argv[optind++];

-	    nextchar = NULL;

-	  }

-      }

-    return c;

-  }

-}

-

-int

-getopt (argc, argv, optstring)

-     int argc;

-     char *const *argv;

-     const char *optstring;

-{

-  return _getopt_internal (argc, argv, optstring,

-			   (const struct option *) 0,

-			   (int *) 0,

-			   0);

-}

-

-#endif	/* Not ELIDE_CODE.  */

-

-#ifdef TEST

-

-/* Compile with -DTEST to make an executable for use in testing

-   the above definition of `getopt'.  */

-

-int

-main (argc, argv)

-     int argc;

-     char **argv;

-{

-  int c;

-  int digit_optind = 0;

-

-  while (1)

-    {

-      int this_option_optind = optind ? optind : 1;

-

-      c = getopt (argc, argv, "abc:d:0123456789");

-      if (c == -1)

-	break;

-

-      switch (c)

-	{

-	case '0':

-	case '1':

-	case '2':

-	case '3':

-	case '4':

-	case '5':

-	case '6':

-	case '7':

-	case '8':

-	case '9':

-	  if (digit_optind != 0 && digit_optind != this_option_optind)

-	    printf ("digits occur in two different argv-elements.\n");

-	  digit_optind = this_option_optind;

-	  printf ("option %c\n", c);

-	  break;

-

-	case 'a':

-	  printf ("option a\n");

-	  break;

-

-	case 'b':

-	  printf ("option b\n");

-	  break;

-

-	case 'c':

-	  printf ("option c with value `%s'\n", optarg);

-	  break;

-

-	case '?':

-	  break;

-

-	default:

-	  printf ("?? getopt returned character code 0%o ??\n", c);

-	}

-    }

-

-  if (optind < argc)

-    {

-      printf ("non-option ARGV-elements: ");

-      while (optind < argc)

-	printf ("%s ", argv[optind++]);

-      printf ("\n");

-    }

-

-  exit (0);

-}

-

-#endif /* TEST */

diff --git a/src/getopt1.c b/src/getopt1.c
deleted file mode 100644
index 39f8383..0000000
--- a/src/getopt1.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.

-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98

-     Free Software Foundation, Inc.

-   This file is part of the GNU C Library.

-

-   The GNU C Library is free software; you can redistribute it and/or

-   modify it under the terms of the GNU Library General Public License as

-   published by the Free Software Foundation; either version 2 of the

-   License, or (at your option) any later version.

-

-   The GNU C Library is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-   Library General Public License for more details.

-

-   You should have received a copy of the GNU Library General Public

-   License along with the GNU C Library; see the file COPYING.LIB.  If not,

-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-   Boston, MA 02111-1307, USA.  */

-

-#ifdef HAVE_CONFIG_H

-#include "config.h"

-#endif

-

-#include "getopt_win.h"

-

-#if !defined __STDC__ || !__STDC__

-/* This is a separate conditional since some stdc systems

-   reject `defined (const)'.  */

-#ifndef const

-#define const

-#endif

-#endif

-

-#include <stdio.h>

-

-/* Comment out all this code if we are using the GNU C Library, and are not

-   actually compiling the library itself.  This code is part of the GNU C

-   Library, but also included in many other GNU distributions.  Compiling

-   and linking in this code is a waste when using the GNU C library

-   (especially if it is a shared library).  Rather than having every GNU

-   program understand `configure --with-gnu-libc' and omit the object files,

-   it is simpler to just do this in the source for each such file.  */

-

-#define GETOPT_INTERFACE_VERSION 2

-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2

-#include <gnu-versions.h>

-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION

-#define ELIDE_CODE

-#endif

-#endif

-

-#ifndef ELIDE_CODE

-

-

-/* This needs to come after some library #include

-   to get __GNU_LIBRARY__ defined.  */

-#ifdef __GNU_LIBRARY__

-#include <stdlib.h>

-#endif

-

-#ifndef	NULL

-#define NULL 0

-#endif

-

-int

-getopt_long (argc, argv, options, long_options, opt_index)

-     int argc;

-     char *const *argv;

-     const char *options;

-     const struct option *long_options;

-     int *opt_index;

-{

-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);

-}

-

-/* Like getopt_long, but '-' as well as '--' can indicate a long option.

-   If an option that starts with '-' (not '--') doesn't match a long option,

-   but does match a short option, it is parsed as a short option

-   instead.  */

-

-int

-getopt_long_only (argc, argv, options, long_options, opt_index)

-     int argc;

-     char *const *argv;

-     const char *options;

-     const struct option *long_options;

-     int *opt_index;

-{

-  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);

-}

-

-

-#endif	/* Not ELIDE_CODE.  */

-

-#ifdef TEST

-

-#include <stdio.h>

-

-int

-main (argc, argv)

-     int argc;

-     char **argv;

-{

-  int c;

-  int digit_optind = 0;

-

-  while (1)

-    {

-      int this_option_optind = optind ? optind : 1;

-      int option_index = 0;

-      static struct option long_options[] =

-      {

-	{"add", 1, 0, 0},

-	{"append", 0, 0, 0},

-	{"delete", 1, 0, 0},

-	{"verbose", 0, 0, 0},

-	{"create", 0, 0, 0},

-	{"file", 1, 0, 0},

-	{0, 0, 0, 0}

-      };

-

-      c = getopt_long (argc, argv, "abc:d:0123456789",

-		       long_options, &option_index);

-      if (c == -1)

-	break;

-

-      switch (c)

-	{

-	case 0:

-	  printf ("option %s", long_options[option_index].name);

-	  if (optarg)

-	    printf (" with arg %s", optarg);

-	  printf ("\n");

-	  break;

-

-	case '0':

-	case '1':

-	case '2':

-	case '3':

-	case '4':

-	case '5':

-	case '6':

-	case '7':

-	case '8':

-	case '9':

-	  if (digit_optind != 0 && digit_optind != this_option_optind)

-	    printf ("digits occur in two different argv-elements.\n");

-	  digit_optind = this_option_optind;

-	  printf ("option %c\n", c);

-	  break;

-

-	case 'a':

-	  printf ("option a\n");

-	  break;

-

-	case 'b':

-	  printf ("option b\n");

-	  break;

-

-	case 'c':

-	  printf ("option c with value `%s'\n", optarg);

-	  break;

-

-	case 'd':

-	  printf ("option d with value `%s'\n", optarg);

-	  break;

-

-	case '?':

-	  break;

-

-	default:

-	  printf ("?? getopt returned character code 0%o ??\n", c);

-	}

-    }

-

-  if (optind < argc)

-    {

-      printf ("non-option ARGV-elements: ");

-      while (optind < argc)

-	printf ("%s ", argv[optind++]);

-      printf ("\n");

-    }

-

-  exit (0);

-}

-

-#endif /* TEST */

diff --git a/src/getopt_win.h b/src/getopt_win.h
deleted file mode 100644
index 91eb54e..0000000
--- a/src/getopt_win.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Declarations for getopt.

-   Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.

-   This file is part of the GNU C Library.

-

-   The GNU C Library is free software; you can redistribute it and/or

-   modify it under the terms of the GNU Library General Public License as

-   published by the Free Software Foundation; either version 2 of the

-   License, or (at your option) any later version.

-

-   The GNU C Library is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without even the implied warranty of

-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-   Library General Public License for more details.

-

-   You should have received a copy of the GNU Library General Public

-   License along with the GNU C Library; see the file COPYING.LIB.  If not,

-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

-   Boston, MA 02111-1307, USA.  */

-

-#ifndef _GETOPT_H

-

-#ifndef __need_getopt

-# define _GETOPT_H 1

-#endif

-

-#ifdef	__cplusplus

-extern "C" {

-#endif

-

-/* For communication from `getopt' to the caller.

-   When `getopt' finds an option that takes an argument,

-   the argument value is returned here.

-   Also, when `ordering' is RETURN_IN_ORDER,

-   each non-option ARGV-element is returned here.  */

-

-extern char *optarg;

-

-/* Index in ARGV of the next element to be scanned.

-   This is used for communication to and from the caller

-   and for communication between successive calls to `getopt'.

-

-   On entry to `getopt', zero means this is the first call; initialize.

-

-   When `getopt' returns -1, this is the index of the first of the

-   non-option elements that the caller should itself scan.

-

-   Otherwise, `optind' communicates from one call to the next

-   how much of ARGV has been scanned so far.  */

-

-extern int optind;

-

-/* Callers store zero here to inhibit the error message `getopt' prints

-   for unrecognized options.  */

-

-extern int opterr;

-

-/* Set to an option character which was unrecognized.  */

-

-extern int optopt;

-

-#ifndef __need_getopt

-/* Describe the long-named options requested by the application.

-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector

-   of `struct option' terminated by an element containing a name which is

-   zero.

-

-   The field `has_arg' is:

-   no_argument		(or 0) if the option does not take an argument,

-   required_argument	(or 1) if the option requires an argument,

-   optional_argument 	(or 2) if the option takes an optional argument.

-

-   If the field `flag' is not NULL, it points to a variable that is set

-   to the value given in the field `val' when the option is found, but

-   left unchanged if the option is not found.

-

-   To have a long-named option do something other than set an `int' to

-   a compiled-in constant, such as set a value from `optarg', set the

-   option's `flag' field to zero and its `val' field to a nonzero

-   value (the equivalent single-letter option character, if there is

-   one).  For long options that have a zero `flag' field, `getopt'

-   returns the contents of the `val' field.  */

-

-struct option

-{

-# if defined __STDC__ && __STDC__

-  const char *name;

-# else

-  char *name;

-# endif

-  /* has_arg can't be an enum because some compilers complain about

-     type mismatches in all the code that assumes it is an int.  */

-  int has_arg;

-  int *flag;

-  int val;

-};

-

-/* Names for the values of the `has_arg' field of `struct option'.  */

-

-# define no_argument		0

-# define required_argument	1

-# define optional_argument	2

-#endif	/* need getopt */

-

-

-/* Get definitions and prototypes for functions to process the

-   arguments in ARGV (ARGC of them, minus the program name) for

-   options given in OPTS.

-

-   Return the option character from OPTS just read.  Return -1 when

-   there are no more options.  For unrecognized options, or options

-   missing arguments, `optopt' is set to the option letter, and '?' is

-   returned.

-

-   The OPTS string is a list of characters which are recognized option

-   letters, optionally followed by colons, specifying that that letter

-   takes an argument, to be placed in `optarg'.

-

-   If a letter in OPTS is followed by two colons, its argument is

-   optional.  This behavior is specific to the GNU `getopt'.

-

-   The argument `--' causes premature termination of argument

-   scanning, explicitly telling `getopt' that there are no more

-   options.

-

-   If OPTS begins with `--', then non-option arguments are treated as

-   arguments to the option '\0'.  This behavior is specific to the GNU

-   `getopt'.  */

-

-#if defined __STDC__ && __STDC__

-# ifdef __GNU_LIBRARY__

-/* Many other libraries have conflicting prototypes for getopt, with

-   differences in the consts, in stdlib.h.  To avoid compilation

-   errors, only prototype getopt for the GNU C library.  */

-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);

-# else /* not __GNU_LIBRARY__ */

-extern int getopt ();

-# endif /* __GNU_LIBRARY__ */

-

-# ifndef __need_getopt

-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,

-		        const struct option *__longopts, int *__longind);

-extern int getopt_long_only (int __argc, char *const *__argv,

-			     const char *__shortopts,

-		             const struct option *__longopts, int *__longind);

-

-/* Internal only.  Users should not call this directly.  */

-extern int _getopt_internal (int __argc, char *const *__argv,

-			     const char *__shortopts,

-		             const struct option *__longopts, int *__longind,

-			     int __long_only);

-# endif

-#else /* not __STDC__ */

-extern int getopt ();

-# ifndef __need_getopt

-extern int getopt_long ();

-extern int getopt_long_only ();

-

-extern int _getopt_internal ();

-# endif

-#endif /* __STDC__ */

-

-#ifdef	__cplusplus

-}

-#endif

-

-/* Make sure we later can get all the definitions and declarations.  */

-#undef __need_getopt

-

-#endif /* getopt.h */

diff --git a/src/skeleton.c b/src/skeleton.c
deleted file mode 100644
index 22159d5..0000000
--- a/src/skeleton.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * skeleton.c
- * author: Tahseen Mohammad
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <ogg/ogg.h>
-
-#include "skeleton.h"
-
-/* write an ogg_page to a file pointer */
-int write_ogg_page_to_file(ogg_page *og, FILE *out) {
-   int written;
-   
-   written = fwrite(og->header,1, og->header_len, out);
-   written += fwrite(og->body,1, og->body_len, out);
-
-   return written;
-}
-
-int add_message_header_field(fisbone_packet *fp, 
-                                        char *header_key, 
-                                        char *header_value) {
-
-    /* size of both key and value + ': ' + CRLF */
-    int this_message_size = strlen(header_key) + strlen(header_value) + 4;
-    if (fp->message_header_fields == NULL) {
-        fp->message_header_fields = _ogg_calloc(this_message_size, sizeof(char));
-    } else {
-        int new_size = (fp->current_header_size + this_message_size) * sizeof(char);
-        fp->message_header_fields = _ogg_realloc(fp->message_header_fields, new_size);
-    }
-    snprintf(fp->message_header_fields + fp->current_header_size, 
-                this_message_size+1, 
-                "%s: %s\r\n", 
-                header_key, 
-                header_value);
-    fp->current_header_size += this_message_size;
-
-    return 0;
-}
-
-/* create a ogg_packet from a fishead_packet structure */
-ogg_packet ogg_from_fishead(fishead_packet *fp) {
-
-    ogg_packet op;
-
-    memset(&op, 0, sizeof(op));
-    op.packet = _ogg_calloc(FISHEAD_SIZE, sizeof(unsigned char));
-    memset(op.packet, 0, FISHEAD_SIZE);
-
-    memcpy (op.packet, FISHEAD_IDENTIFIER, 8); /* identifier */
-    *((ogg_uint16_t*)(op.packet+8)) = SKELETON_VERSION_MAJOR; /* version major */
-    *((ogg_uint16_t*)(op.packet+10)) = SKELETON_VERSION_MINOR; /* version minor */
-    *((ogg_int64_t*)(op.packet+12)) = (ogg_int64_t)fp->ptime_n; /* presentationtime numerator */
-    *((ogg_int64_t*)(op.packet+20)) = (ogg_int64_t)fp->ptime_d; /* presentationtime denominator */
-    *((ogg_int64_t*)(op.packet+28)) = (ogg_int64_t)fp->btime_n; /* basetime numerator */
-    *((ogg_int64_t*)(op.packet+36)) = (ogg_int64_t)fp->btime_d; /* basetime denominator */
-    /* TODO: UTC time, set to zero for now */
-
-    op.b_o_s = 1;   /* its the first packet of the stream */
-    op.e_o_s = 0;   /* its not the last packet of the stream */
-    op.bytes = FISHEAD_SIZE;  /* length of the packet in bytes */
-
-    return op;
-}
-
-/* create a ogg_packet from a fisbone_packet structure. 
- * call this method after the fisbone_packet is filled and all message header fields are added
- * by calling add_message_header_field method.
- */
-ogg_packet ogg_from_fisbone(fisbone_packet *fp) {
-    
-    ogg_packet op;
-    int packet_size = FISBONE_SIZE + fp->current_header_size;
-
-    memset (&op, 0, sizeof (op));       
-    op.packet = _ogg_calloc (packet_size, sizeof(unsigned char));
-    memset (op.packet, 0, packet_size);
-    memcpy (op.packet, FISBONE_IDENTIFIER, 8); /* identifier */
-    *((ogg_uint32_t*)(op.packet+8)) = FISBONE_MESSAGE_HEADER_OFFSET; /* offset of the message header fields */
-    *((ogg_uint32_t*)(op.packet+12)) = fp->serial_no; /* serialno of the respective stream */
-    *((ogg_uint32_t*)(op.packet+16)) = fp->nr_header_packet; /* number of header packets */
-    *((ogg_int64_t*)(op.packet+20)) = fp->granule_rate_n; /* granulrate numerator */
-    *((ogg_int64_t*)(op.packet+28)) = fp->granule_rate_d; /* granulrate denominator */
-    *((ogg_int64_t*)(op.packet+36)) = fp->start_granule; /* start granule */
-    *((ogg_uint32_t*)(op.packet+44)) = fp->preroll; /* preroll, for theora its 0 */
-    *(op.packet+48) = fp->granule_shift; /* granule shift */
-    memcpy((op.packet+FISBONE_SIZE), fp->message_header_fields, fp->current_header_size);
-
-    op.b_o_s = 0;
-    op.e_o_s = 0;
-    op.bytes = packet_size; /* size of the packet in bytes */
-
-    return op;
-}
-
-/* fills up a fishead_packet from a fishead ogg_packet of a skeleton bistream */
-fishead_packet fishead_from_ogg(ogg_packet *op) {
-	
-    fishead_packet fp;
-
-    if (memcmp(op->packet, FISHEAD_IDENTIFIER, 8))
-	; /* invalid packet what do we do? */
-
-    fp.version_major = *((ogg_uint16_t*)(op->packet+8)); /* version major */
-    fp.version_minor = *((ogg_uint16_t*)(op->packet+10)); /* version minor */
-    fp.ptime_n = *((ogg_int64_t*)(op->packet+12)); /* presentationtime numerator */
-    fp.ptime_d = *((ogg_int64_t*)(op->packet+20)); /* presentationtime denominator */
-    fp.btime_n = *((ogg_int64_t*)(op->packet+28)); /* basetime numerator */
-    fp.btime_d = *((ogg_int64_t*)(op->packet+36)); /* basetime denominator */
-    memcpy(fp.UTC, op->packet+44, 20);
-
-    return fp;
-}
-
-/* fills up a fisbone_packet from a fisbone ogg_packet of a skeleton bitstream */
-fisbone_packet fisbone_from_ogg(ogg_packet *op) {
-
-    fisbone_packet fp;
-    
-    if (memcmp(op->packet, FISBONE_IDENTIFIER, 8))
-	; /* invalid value, what do we do? */
-    fp.serial_no = *((ogg_uint32_t*)(op->packet+12)); /* serialno of the stream represented by this fisbone packet */
-    fp.nr_header_packet = *((ogg_uint32_t*)(op->packet+16)); /* number of header packets */
-    fp.granule_rate_n = *((ogg_int64_t*)(op->packet+20)); /* granulrate numerator */
-    fp.granule_rate_d = *((ogg_int64_t*)(op->packet+28)); /* granulrate denominator */
-    fp.start_granule = *((ogg_int64_t*)(op->packet+36)); /* start granule */
-    fp.preroll = *((ogg_uint32_t*)(op->packet+44)); /* preroll, for theora its 0 */
-    fp.granule_shift = *(op->packet+48); /* granule shift */
-    fp.current_header_size = op->bytes - FISBONE_SIZE;
-    fp.message_header_fields = _ogg_calloc(fp.current_header_size+1, sizeof(char));
-    memcpy(fp.message_header_fields, op->packet+FISBONE_SIZE, fp.current_header_size);
-
-    return fp;
-}
-
-int add_fishead_to_stream(ogg_stream_state *os, fishead_packet *fp) {
-
-    ogg_packet op;
-
-    op = ogg_from_fishead(fp);
-    ogg_stream_packetin(os, &op);
-    _ogg_free(op.packet);
-
-    return 0;
-}
-
-int add_fisbone_to_stream(ogg_stream_state *os, fisbone_packet *fp) {
-
-    ogg_packet op;
-
-    op = ogg_from_fisbone(fp);
-    ogg_stream_packetin(os, &op);
-    _ogg_free(op.packet);
-
-    return 0;
-}
-
-int add_eos_packet_to_stream(ogg_stream_state *os) {
-
-    ogg_packet op;
-
-    memset (&op, 0, sizeof(op));
-    op.e_o_s = 1;
-    ogg_stream_packetin(os, &op);
-
-    return 0;
-}
-
-int flush_ogg_stream_to_file(ogg_stream_state *os, FILE *out) {
-
-    ogg_page og;
-    int result;
-
-    while((result = ogg_stream_flush(os, &og)))
-    {
-        if(!result) break;
-        result = write_ogg_page_to_file(&og, out);
-        if(result != og.header_len + og.body_len)
-            return 1;
-    }
-
-    return 0;
-}
diff --git a/src/skeleton.h b/src/skeleton.h
deleted file mode 100644
index f07d7a3..0000000
--- a/src/skeleton.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * skeleton.h
- * author: Tahseen Mohammad
- */
-
-#ifndef _SKELETON_H
-#define _SKELETON_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
-
-#include <ogg/ogg.h>
-
-#define SKELETON_VERSION_MAJOR 3
-#define SKELETON_VERSION_MINOR 0
-#define FISHEAD_IDENTIFIER "fishead\0"
-#define FISBONE_IDENTIFIER "fisbone\0"
-#define FISHEAD_SIZE 64
-#define FISBONE_SIZE 52
-#define FISBONE_MESSAGE_HEADER_OFFSET 44
-
-/* fishead_packet holds a fishead header packet. */
-typedef struct {
-    ogg_uint16_t version_major;				    /* skeleton version major */
-    ogg_uint16_t version_minor;				    /* skeleton version minor */
-    /* Start time of the presentation
-     * For a new stream presentationtime & basetime is same. */
-    ogg_int64_t ptime_n;                                    /* presentation time numerator */
-    ogg_int64_t ptime_d;                                    /* presentation time denominator */
-    ogg_int64_t btime_n;                                    /* basetime numerator */
-    ogg_int64_t btime_d;                                    /* basetime denominator */
-    /* will holds the time of origin of the stream, a 20 bit field. */
-    unsigned char UTC[20];
-} fishead_packet;
-
-/* fisbone_packet holds a fisbone header packet. */
-typedef struct {
-    ogg_uint32_t serial_no;                                 /* serial no of the corresponding stream */
-    ogg_uint32_t nr_header_packet;                      /* number of header packets */
-    /* granule rate is the temporal resolution of the logical bitstream */
-    ogg_int64_t granule_rate_n;                            /* granule rate numerator */
-    ogg_int64_t granule_rate_d;                            /* granule rate denominator */
-    ogg_int64_t start_granule;                             /* start granule value */
-    ogg_uint32_t preroll;                                   /* preroll */
-    unsigned char granule_shift;		            /* 1 byte value holding the granule shift */
-    char *message_header_fields;                            /* holds all the message header fields */
-    /* current total size of the message header fields, for realloc purpose, initially zero */
-    ogg_uint32_t current_header_size;
-} fisbone_packet;
-
-extern int write_ogg_page_to_file(ogg_page *og, FILE *out);
-extern int add_message_header_field(fisbone_packet *fp, char *header_key, char *header_value);
-/* remember to deallocate the returned ogg_packet properly */
-extern ogg_packet ogg_from_fishead(fishead_packet *fp);
-extern ogg_packet ogg_from_fisbone(fisbone_packet *fp);
-extern fishead_packet fishead_from_ogg(ogg_packet *op);
-extern fisbone_packet fisbone_from_ogg(ogg_packet *op);
-extern int add_fishead_to_stream(ogg_stream_state *os, fishead_packet *fp);
-extern int add_fisbone_to_stream(ogg_stream_state *os, fisbone_packet *fp);
-extern int add_eos_packet_to_stream(ogg_stream_state *os);
-extern int flush_ogg_stream_to_file(ogg_stream_state *os, FILE *out);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* _SKELETON_H */
-
-
-
-
-
-
diff --git a/src/speexdec.1 b/src/speexdec.1
deleted file mode 100644
index 3545f09..0000000
--- a/src/speexdec.1
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.29.
-.TH SPEEXDEC "1" "September 2003" "speexdec version 1.1" "User Commands"
-.SH NAME
-speexdec \- The reference implementation speex decoder.
-.SH SYNOPSIS
-.B speexdec
-[\fIoptions\fR] \fIinput_file.spx \fR[\fIoutput_file\fR]
-.SH DESCRIPTION
-Decodes a Speex file and produce a WAV file or raw file
-.SS "input_file can be:"
-.TP
-filename.spx
-regular Speex file
-.TP
--
-stdin
-.SS "output_file can be:"
-.TP
-filename.wav
-Wav file
-.TP
-filename.*
-Raw PCM file (any extension other that .wav)
-.TP
--
-stdout
-.TP
-(nothing)
-Will be played to soundcard
-.SH OPTIONS
-.TP
-\fB\-\-enh\fR
-Enable perceptual enhancement (default)
-.TP
-\fB\-\-no\-enh\fR
-Disable perceptual enhancement
-.TP
-\fB\-\-force\-nb\fR
-Force decoding in narrowband
-.TP
-\fB\-\-force\-wb\fR
-Force decoding in wideband
-.TP
-\fB\-\-force\-uwb\fR
-Force decoding in ultra-wideband
-.TP
-\fB\-\-mono\fR
-Force decoding in mono
-.TP
-\fB\-\-stereo\fR
-Force decoding in stereo
-.TP
-\fB\-\-rate\fR n
-Force decoding at sampling rate n Hz
-.TP
-\fB\-\-packet\-loss\fR n
-Simulate n % random packet loss
-.TP
-\fB\-V\fR
-Verbose mode (show bit-rate)
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-This help
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Version information
-.TP
-\fB\-\-pf\fR
-Deprecated, use \fB\-\-enh\fR instead
-.TP
-\fB\-\-no\-pf\fR
-Deprecated, use \fB\-\-no\-enh\fR instead
-.PP
-More information is available from the Speex site: http://www.speex.org
-.PP
-Please report bugs to the mailing list `speex-dev@xiph.org'.
-.SH COPYRIGHT
-Copyright \(co 2002 Jean-Marc Valin
diff --git a/src/speexdec.c b/src/speexdec.c
deleted file mode 100644
index 1ee3a50..0000000
--- a/src/speexdec.c
+++ /dev/null
@@ -1,808 +0,0 @@
-/* Copyright (C) 2002-2006 Jean-Marc Valin 
-   File: speexdec.c
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#if !defined WIN32 && !defined _WIN32
-#include <unistd.h>
-#endif
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-#ifndef HAVE_GETOPT_LONG
-#include "getopt_win.h"
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#include "../include/speex/speex.h"
-#include <ogg/ogg.h>
-
-#if defined WIN32 || defined _WIN32
-#include "wave_out.h"
-/* We need the following two to set stdout to binary */
-#include <io.h>
-#include <fcntl.h>
-#endif
-#include <math.h>
-
-#ifdef __MINGW32__
-#include "wave_out.c"
-#endif
-
-#ifdef HAVE_SYS_SOUNDCARD_H
-#include <sys/soundcard.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-
-#elif defined HAVE_SYS_AUDIOIO_H
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/audioio.h>
-#ifndef AUDIO_ENCODING_SLINEAR
-#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR /* Solaris */
-#endif
-
-#endif
-
-#include <string.h>
-#include "wav_io.h"
-#include "../include/speex/speex_header.h"
-#include "../include/speex/speex_stereo.h"
-#include "../include/speex/speex_callbacks.h"
-
-#define MAX_FRAME_SIZE 2000
-
-#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
-                           ((buf[base+2]<<16)&0xff0000)| \
-                           ((buf[base+1]<<8)&0xff00)| \
-  	           	    (buf[base]&0xff))
-
-static void print_comments(char *comments, int length)
-{
-   char *c=comments;
-   int len, i, nb_fields;
-   char *end;
-   
-   if (length<8)
-   {
-      fprintf (stderr, "Invalid/corrupted comments\n");
-      return;
-   }
-   end = c+length;
-   len=readint(c, 0);
-   c+=4;
-   if (len < 0 || c+len>end)
-   {
-      fprintf (stderr, "Invalid/corrupted comments\n");
-      return;
-   }
-   fwrite(c, 1, len, stderr);
-   c+=len;
-   fprintf (stderr, "\n");
-   if (c+4>end)
-   {
-      fprintf (stderr, "Invalid/corrupted comments\n");
-      return;
-   }
-   nb_fields=readint(c, 0);
-   c+=4;
-   for (i=0;i<nb_fields;i++)
-   {
-      if (c+4>end)
-      {
-         fprintf (stderr, "Invalid/corrupted comments\n");
-         return;
-      }
-      len=readint(c, 0);
-      c+=4;
-      if (len < 0 || c+len>end)
-      {
-         fprintf (stderr, "Invalid/corrupted comments\n");
-         return;
-      }
-      fwrite(c, 1, len, stderr);
-      c+=len;
-      fprintf (stderr, "\n");
-   }
-}
-
-FILE *out_file_open(char *outFile, int rate, int *channels)
-{
-   FILE *fout=NULL;
-   /*Open output file*/
-   if (strlen(outFile)==0)
-   {
-#if defined HAVE_SYS_SOUNDCARD_H
-      int audio_fd, format, stereo;
-      audio_fd=open("/dev/dsp", O_WRONLY);
-      if (audio_fd<0)
-      {
-         perror("Cannot open /dev/dsp");
-         exit(1);         
-      }
-
-      format=AFMT_S16_NE;
-      if (ioctl(audio_fd, SNDCTL_DSP_SETFMT, &format)==-1)
-      {
-         perror("SNDCTL_DSP_SETFMT");
-         close(audio_fd);
-         exit(1);
-      }
-
-      stereo=0;
-      if (*channels==2)
-         stereo=1;
-      if (ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo)==-1)
-      {
-         perror("SNDCTL_DSP_STEREO");
-         close(audio_fd);
-         exit(1);
-      }
-      if (stereo!=0)
-      {
-         if (*channels==1)
-            fprintf (stderr, "Cannot set mono mode, will decode in stereo\n");
-         *channels=2;
-      }
-
-      if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &rate)==-1)
-      {
-         perror("SNDCTL_DSP_SPEED");
-         close(audio_fd);
-         exit(1);
-      }
-      fout = fdopen(audio_fd, "w");
-#elif defined HAVE_SYS_AUDIOIO_H
-      audio_info_t info;
-      int audio_fd;
-      
-      audio_fd = open("/dev/audio", O_WRONLY);
-      if (audio_fd<0)
-      {
-         perror("Cannot open /dev/audio");
-         exit(1);
-      }
-
-      AUDIO_INITINFO(&info);
-#ifdef AUMODE_PLAY    /* NetBSD/OpenBSD */
-      info.mode = AUMODE_PLAY;
-#endif
-      info.play.encoding = AUDIO_ENCODING_SLINEAR;
-      info.play.precision = 16;
-      info.play.sample_rate = rate;
-      info.play.channels = *channels;
-      
-      if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0)
-      {
-         perror ("AUDIO_SETINFO");
-         exit(1);
-      }
-      fout = fdopen(audio_fd, "w");
-#elif defined WIN32 || defined _WIN32
-      {
-         unsigned int speex_channels = *channels;
-         if (Set_WIN_Params (INVALID_FILEDESC, rate, SAMPLE_SIZE, speex_channels))
-         {
-            fprintf (stderr, "Can't access %s\n", "WAVE OUT");
-            exit(1);
-         }
-      }
-#else
-      fprintf (stderr, "No soundcard support\n");
-      exit(1);
-#endif
-   } else {
-      if (strcmp(outFile,"-")==0)
-      {
-#if defined WIN32 || defined _WIN32
-         _setmode(_fileno(stdout), _O_BINARY);
-#elif defined OS2
-         _fsetmode(stdout,"b");
-#endif
-         fout=stdout;
-      }
-      else 
-      {
-         fout = fopen(outFile, "wb");
-         if (!fout)
-         {
-            perror(outFile);
-            exit(1);
-         }
-         if (strcmp(outFile+strlen(outFile)-4,".wav")==0 || strcmp(outFile+strlen(outFile)-4,".WAV")==0)
-            write_wav_header(fout, rate, *channels, 0, 0);
-      }
-   }
-   return fout;
-}
-
-void usage()
-{
-   printf ("Usage: speexdec [options] input_file.spx [output_file]\n");
-   printf ("\n");
-   printf ("Decodes a Speex file and produce a WAV file or raw file\n");
-   printf ("\n");
-   printf ("input_file can be:\n");
-   printf ("  filename.spx         regular Speex file\n");
-   printf ("  -                    stdin\n");
-   printf ("\n");  
-   printf ("output_file can be:\n");
-   printf ("  filename.wav         Wav file\n");
-   printf ("  filename.*           Raw PCM file (any extension other that .wav)\n");
-   printf ("  -                    stdout\n");
-   printf ("  (nothing)            Will be played to soundcard\n");
-   printf ("\n");  
-   printf ("Options:\n");
-   printf (" --enh                 Enable perceptual enhancement (default)\n");
-   printf (" --no-enh              Disable perceptual enhancement\n");
-   printf (" --force-nb            Force decoding in narrowband\n");
-   printf (" --force-wb            Force decoding in wideband\n");
-   printf (" --force-uwb           Force decoding in ultra-wideband\n");
-   printf (" --mono                Force decoding in mono\n");
-   printf (" --stereo              Force decoding in stereo\n");
-   printf (" --rate n              Force decoding at sampling rate n Hz\n");
-   printf (" --packet-loss n       Simulate n %% random packet loss\n");
-   printf (" -V                    Verbose mode (show bit-rate)\n"); 
-   printf (" -h, --help            This help\n");
-   printf (" -v, --version         Version information\n");
-   printf (" --pf                  Deprecated, use --enh instead\n");
-   printf (" --no-pf               Deprecated, use --no-enh instead\n");
-   printf ("\n");
-   printf ("More information is available from the Speex site: http://www.speex.org\n");
-   printf ("\n");
-   printf ("Please report bugs to the mailing list `speex-dev@xiph.org'.\n");
-}
-
-void version()
-{
-   const char* speex_version;
-   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
-   printf ("speexdec (Speex decoder) version %s (compiled " __DATE__ ")\n", speex_version);
-   printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
-}
-
-void version_short()
-{
-   const char* speex_version;
-   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
-   printf ("speexdec version %s\n", speex_version);
-   printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
-}
-
-static void *process_header(ogg_packet *op, spx_int32_t enh_enabled, spx_int32_t *frame_size, int *granule_frame_size, spx_int32_t *rate, int *nframes, int forceMode, int *channels, SpeexStereoState *stereo, int *extra_headers, int quiet)
-{
-   void *st;
-   const SpeexMode *mode;
-   SpeexHeader *header;
-   int modeID;
-   SpeexCallback callback;
-      
-   header = speex_packet_to_header((char*)op->packet, op->bytes);
-   if (!header)
-   {
-      fprintf (stderr, "Cannot read header\n");
-      return NULL;
-   }
-   if (header->mode >= SPEEX_NB_MODES || header->mode<0)
-   {
-      fprintf (stderr, "Mode number %d does not (yet/any longer) exist in this version\n", 
-               header->mode);
-      free(header);
-      return NULL;
-   }
-      
-   modeID = header->mode;
-   if (forceMode!=-1)
-      modeID = forceMode;
-
-   mode = speex_lib_get_mode (modeID);
-   
-   if (header->speex_version_id > 1)
-   {
-      fprintf (stderr, "This file was encoded with Speex bit-stream version %d, which I don't know how to decode\n", header->speex_version_id);
-      free(header);
-      return NULL;
-   }
-
-   if (mode->bitstream_version < header->mode_bitstream_version)
-   {
-      fprintf (stderr, "The file was encoded with a newer version of Speex. You need to upgrade in order to play it.\n");
-      free(header);
-      return NULL;
-   }
-   if (mode->bitstream_version > header->mode_bitstream_version) 
-   {
-      fprintf (stderr, "The file was encoded with an older version of Speex. You would need to downgrade the version in order to play it.\n");
-      free(header);
-      return NULL;
-   }
-   
-   st = speex_decoder_init(mode);
-   if (!st)
-   {
-      fprintf (stderr, "Decoder initialization failed.\n");
-      free(header);
-      return NULL;
-   }
-   speex_decoder_ctl(st, SPEEX_SET_ENH, &enh_enabled);
-   speex_decoder_ctl(st, SPEEX_GET_FRAME_SIZE, frame_size);
-   *granule_frame_size = *frame_size;
-
-   if (!*rate)
-      *rate = header->rate;
-   /* Adjust rate if --force-* options are used */
-   if (forceMode!=-1)
-   {
-      if (header->mode < forceMode)
-      {
-         *rate <<= (forceMode - header->mode);
-         *granule_frame_size >>= (forceMode - header->mode);
-      }
-      if (header->mode > forceMode)
-      {
-         *rate >>= (header->mode - forceMode);
-         *granule_frame_size <<= (header->mode - forceMode);
-      }
-   }
-
-
-   speex_decoder_ctl(st, SPEEX_SET_SAMPLING_RATE, rate);
-
-   *nframes = header->frames_per_packet;
-
-   if (*channels==-1)
-      *channels = header->nb_channels;
-
-   if (!(*channels==1))
-   {
-      *channels = 2;
-      callback.callback_id = SPEEX_INBAND_STEREO;
-      callback.func = speex_std_stereo_request_handler;
-      callback.data = stereo;
-      speex_decoder_ctl(st, SPEEX_SET_HANDLER, &callback);
-   }
-   
-   if (!quiet)
-   {
-      fprintf (stderr, "Decoding %d Hz audio using %s mode", 
-               *rate, mode->modeName);
-
-      if (*channels==1)
-         fprintf (stderr, " (mono");
-      else
-         fprintf (stderr, " (stereo");
-      
-      if (header->vbr)
-         fprintf (stderr, ", VBR)\n");
-      else
-         fprintf(stderr, ")\n");
-      /*fprintf (stderr, "Decoding %d Hz audio at %d bps using %s mode\n", 
-       *rate, mode->bitrate, mode->modeName);*/
-   }
-
-   *extra_headers = header->extra_headers;
-
-   free(header);
-   return st;
-}
-
-int main(int argc, char **argv)
-{
-   int c;
-   int option_index = 0;
-   char *inFile, *outFile;
-   FILE *fin, *fout=NULL;
-   short out[MAX_FRAME_SIZE];
-   short output[MAX_FRAME_SIZE];
-   int frame_size=0, granule_frame_size=0;
-   void *st=NULL;
-   SpeexBits bits;
-   int packet_count=0;
-   int stream_init = 0;
-   int quiet = 0;
-   ogg_int64_t page_granule=0, last_granule=0;
-   int skip_samples=0, page_nb_packets;
-   struct option long_options[] =
-   {
-      {"help", no_argument, NULL, 0},
-      {"quiet", no_argument, NULL, 0},
-      {"version", no_argument, NULL, 0},
-      {"version-short", no_argument, NULL, 0},
-      {"enh", no_argument, NULL, 0},
-      {"no-enh", no_argument, NULL, 0},
-      {"pf", no_argument, NULL, 0},
-      {"no-pf", no_argument, NULL, 0},
-      {"force-nb", no_argument, NULL, 0},
-      {"force-wb", no_argument, NULL, 0},
-      {"force-uwb", no_argument, NULL, 0},
-      {"rate", required_argument, NULL, 0},
-      {"mono", no_argument, NULL, 0},
-      {"stereo", no_argument, NULL, 0},
-      {"packet-loss", required_argument, NULL, 0},
-      {0, 0, 0, 0}
-   };
-   ogg_sync_state oy;
-   ogg_page       og;
-   ogg_packet     op;
-   ogg_stream_state os;
-   int enh_enabled;
-   int nframes=2;
-   int print_bitrate=0;
-   int close_in=0;
-   int eos=0;
-   int forceMode=-1;
-   int audio_size=0;
-   float loss_percent=-1;
-   SpeexStereoState stereo = SPEEX_STEREO_STATE_INIT;
-   int channels=-1;
-   int rate=0;
-   int extra_headers=0;
-   int wav_format=0;
-   int lookahead;
-   int speex_serialno = -1;
-
-   enh_enabled = 1;
-
-   /*Process options*/
-   while(1)
-   {
-      c = getopt_long (argc, argv, "hvV",
-                       long_options, &option_index);
-      if (c==-1)
-         break;
-      
-      switch(c)
-      {
-      case 0:
-         if (strcmp(long_options[option_index].name,"help")==0)
-         {
-            usage();
-            exit(0);
-         } else if (strcmp(long_options[option_index].name,"quiet")==0)
-         {
-            quiet = 1;
-         } else if (strcmp(long_options[option_index].name,"version")==0)
-         {
-            version();
-            exit(0);
-         } else if (strcmp(long_options[option_index].name,"version-short")==0)
-         {
-            version_short();
-            exit(0);
-         } else if (strcmp(long_options[option_index].name,"enh")==0)
-         {
-            enh_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"no-enh")==0)
-         {
-            enh_enabled=0;
-         } else if (strcmp(long_options[option_index].name,"pf")==0)
-         {
-            fprintf (stderr, "--pf is deprecated, use --enh instead\n");
-            enh_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"no-pf")==0)
-         {
-            fprintf (stderr, "--no-pf is deprecated, use --no-enh instead\n");
-            enh_enabled=0;
-         } else if (strcmp(long_options[option_index].name,"force-nb")==0)
-         {
-            forceMode=0;
-         } else if (strcmp(long_options[option_index].name,"force-wb")==0)
-         {
-            forceMode=1;
-         } else if (strcmp(long_options[option_index].name,"force-uwb")==0)
-         {
-            forceMode=2;
-         } else if (strcmp(long_options[option_index].name,"mono")==0)
-         {
-            channels=1;
-         } else if (strcmp(long_options[option_index].name,"stereo")==0)
-         {
-            channels=2;
-         } else if (strcmp(long_options[option_index].name,"rate")==0)
-         {
-            rate=atoi (optarg);
-         } else if (strcmp(long_options[option_index].name,"packet-loss")==0)
-         {
-            loss_percent = atof(optarg);
-         }
-         break;
-      case 'h':
-         usage();
-         exit(0);
-         break;
-      case 'v':
-         version();
-         exit(0);
-         break;
-      case 'V':
-         print_bitrate=1;
-         break;
-      case '?':
-         usage();
-         exit(1);
-         break;
-      }
-   }
-   if (argc-optind!=2 && argc-optind!=1)
-   {
-      usage();
-      exit(1);
-   }
-   inFile=argv[optind];
-
-   if (argc-optind==2)
-      outFile=argv[optind+1];
-   else
-      outFile = "";
-   wav_format = strlen(outFile)>=4 && (
-                                       strcmp(outFile+strlen(outFile)-4,".wav")==0
-                                       || strcmp(outFile+strlen(outFile)-4,".WAV")==0);
-   /*Open input file*/
-   if (strcmp(inFile, "-")==0)
-   {
-#if defined WIN32 || defined _WIN32
-      _setmode(_fileno(stdin), _O_BINARY);
-#endif
-      fin=stdin;
-   }
-   else 
-   {
-      fin = fopen(inFile, "rb");
-      if (!fin)
-      {
-         perror(inFile);
-         exit(1);
-      }
-      close_in=1;
-   }
-
-
-   /*Init Ogg data struct*/
-   ogg_sync_init(&oy);
-   
-   speex_bits_init(&bits);
-   /*Main decoding loop*/
-   
-   while (1)
-   {
-      char *data;
-      int i, j, nb_read;
-      /*Get the ogg buffer for writing*/
-      data = ogg_sync_buffer(&oy, 200);
-      /*Read bitstream from input file*/
-      nb_read = fread(data, sizeof(char), 200, fin);      
-      ogg_sync_wrote(&oy, nb_read);
-
-      /*Loop for all complete pages we got (most likely only one)*/
-      while (ogg_sync_pageout(&oy, &og)==1)
-      {
-         int packet_no;
-         if (stream_init == 0) {
-            ogg_stream_init(&os, ogg_page_serialno(&og));
-            stream_init = 1;
-         }
-	 if (ogg_page_serialno(&og) != os.serialno) {
-	    /* so all streams are read. */
-	    ogg_stream_reset_serialno(&os, ogg_page_serialno(&og));
-	 }
-         /*Add page to the bitstream*/
-         ogg_stream_pagein(&os, &og);
-         page_granule = ogg_page_granulepos(&og);
-         page_nb_packets = ogg_page_packets(&og);
-         if (page_granule>0 && frame_size)
-         {
-            /* FIXME: shift the granule values if --force-* is specified */
-            skip_samples = frame_size*(page_nb_packets*granule_frame_size*nframes - (page_granule-last_granule))/granule_frame_size;
-            if (ogg_page_eos(&og))
-               skip_samples = -skip_samples;
-            /*else if (!ogg_page_bos(&og))
-               skip_samples = 0;*/
-         } else
-         {
-            skip_samples = 0;
-         }
-         /*printf ("page granulepos: %d %d %d\n", skip_samples, page_nb_packets, (int)page_granule);*/
-         last_granule = page_granule;
-         /*Extract all available packets*/
-         packet_no=0;
-         while (!eos && ogg_stream_packetout(&os, &op) == 1)
-         {
-	    if (op.bytes>=5 && !memcmp(op.packet, "Speex", 5)) {
-	       speex_serialno = os.serialno;
-	    }
-	    if (speex_serialno == -1 || os.serialno != speex_serialno)
-	       break;
-            /*If first packet, process as Speex header*/
-            if (packet_count==0)
-            {
-               st = process_header(&op, enh_enabled, &frame_size, &granule_frame_size, &rate, &nframes, forceMode, &channels, &stereo, &extra_headers, quiet);
-               if (!st)
-                  exit(1);
-               speex_decoder_ctl(st, SPEEX_GET_LOOKAHEAD, &lookahead);
-               if (!nframes)
-                  nframes=1;
-               fout = out_file_open(outFile, rate, &channels);
-
-            } else if (packet_count==1)
-            {
-               if (!quiet)
-                  print_comments((char*)op.packet, op.bytes);
-            } else if (packet_count<=1+extra_headers)
-            {
-               /* Ignore extra headers */
-            } else {
-               int lost=0;
-               packet_no++;
-               if (loss_percent>0 && 100*((float)rand())/RAND_MAX<loss_percent)
-                  lost=1;
-
-               /*End of stream condition*/
-               if (op.e_o_s && os.serialno == speex_serialno) /* don't care for anything except speex eos */
-                  eos=1;
-	       
-               /*Copy Ogg packet to Speex bitstream*/
-               speex_bits_read_from(&bits, (char*)op.packet, op.bytes);
-               for (j=0;j!=nframes;j++)
-               {
-                  int ret;
-                  /*Decode frame*/
-                  if (!lost)
-                     ret = speex_decode_int(st, &bits, output);
-                  else
-                     ret = speex_decode_int(st, NULL, output);
-
-                  /*for (i=0;i<frame_size*channels;i++)
-                    printf ("%d\n", (int)output[i]);*/
-
-                  if (ret==-1)
-                     break;
-                  if (ret==-2)
-                  {
-                     fprintf (stderr, "Decoding error: corrupted stream?\n");
-                     break;
-                  }
-                  if (speex_bits_remaining(&bits)<0)
-                  {
-                     fprintf (stderr, "Decoding overflow: corrupted stream?\n");
-                     break;
-                  }
-                  if (channels==2)
-                     speex_decode_stereo_int(output, frame_size, &stereo);
-
-                  if (print_bitrate) {
-                     spx_int32_t tmp;
-                     char ch=13;
-                     speex_decoder_ctl(st, SPEEX_GET_BITRATE, &tmp);
-                     fputc (ch, stderr);
-                     fprintf (stderr, "Bitrate is use: %d bps     ", tmp);
-                  }
-                  /*Convert to short and save to output file*/
-		  if (strlen(outFile)!=0)
-                  {
-                     for (i=0;i<frame_size*channels;i++)
-                        out[i]=le_short(output[i]);
-		  } else {
-                     for (i=0;i<frame_size*channels;i++)
-                        out[i]=output[i];
-		  }
-                  {
-                     int frame_offset = 0;
-                     int new_frame_size = frame_size;
-                     /*printf ("packet %d %d\n", packet_no, skip_samples);*/
-                     /*fprintf (stderr, "packet %d %d %d\n", packet_no, skip_samples, lookahead);*/
-                     if (packet_no == 1 && j==0 && skip_samples > 0)
-                     {
-                        /*printf ("chopping first packet\n");*/
-                        new_frame_size -= skip_samples+lookahead;
-                        frame_offset = skip_samples+lookahead;
-                     }
-                     if (packet_no == page_nb_packets && skip_samples < 0)
-                     {
-                        int packet_length = nframes*frame_size+skip_samples+lookahead;
-                        new_frame_size = packet_length - j*frame_size;
-                        if (new_frame_size<0)
-                           new_frame_size = 0;
-                        if (new_frame_size>frame_size)
-                           new_frame_size = frame_size;
-                        /*printf ("chopping end: %d %d %d\n", new_frame_size, packet_length, packet_no);*/
-                     }
-                     if (new_frame_size>0)
-                     {  
-#if defined WIN32 || defined _WIN32
-                        if (strlen(outFile)==0)
-                           WIN_Play_Samples (out+frame_offset*channels, sizeof(short) * new_frame_size*channels);
-                        else
-#endif
-                           fwrite(out+frame_offset*channels, sizeof(short), new_frame_size*channels, fout);
-                  
-                        audio_size+=sizeof(short)*new_frame_size*channels;
-                     }
-                  }
-               }
-            }
-            packet_count++;
-         }
-      }
-      if (feof(fin))
-         break;
-
-   }
-
-   if (fout && wav_format)
-   {
-      if (fseek(fout,4,SEEK_SET)==0)
-      {
-         int tmp;
-         tmp = le_int(audio_size+36);
-         fwrite(&tmp,4,1,fout);
-         if (fseek(fout,32,SEEK_CUR)==0)
-         {
-            tmp = le_int(audio_size);
-            fwrite(&tmp,4,1,fout);
-         } else
-         {
-            fprintf (stderr, "First seek worked, second didn't\n");
-         }
-      } else {
-         fprintf (stderr, "Cannot seek on wave file, size will be incorrect\n");
-      }
-   }
-
-   if (st)
-      speex_decoder_destroy(st);
-   else 
-   {
-      fprintf (stderr, "This doesn't look like a Speex file\n");
-   }
-   speex_bits_destroy(&bits);
-   if (stream_init)
-      ogg_stream_clear(&os);
-   ogg_sync_clear(&oy);
-
-#if defined WIN32 || defined _WIN32
-   if (strlen(outFile)==0)
-      WIN_Audio_close ();
-#endif
-
-   if (close_in)
-      fclose(fin);
-   if (fout != NULL)
-      fclose(fout);   
-
-   return 0;
-}
diff --git a/src/speexenc.1 b/src/speexenc.1
deleted file mode 100644
index 9b0d6a7..0000000
--- a/src/speexenc.1
+++ /dev/null
@@ -1,105 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.29.
-.TH SPEEXENC "1" "September 2003" "speexenc version 1.1" "User Commands"
-.SH NAME
-speexenc \- The reference implementation speex encoder.
-.SH SYNOPSIS
-.B speexenc
-[\fIoptions\fR] \fIinput_file output_file\fR
-.SH DESCRIPTION
-Encodes input_file using Speex. It can read the WAV or raw files.
-.SS "input_file can be:"
-.TP
-filename.wav
-wav file
-.TP
-filename.*
-Raw PCM file (any extension other than .wav)
-.TP
--
-stdin
-.SS "output_file can be:"
-.TP
-filename.spx
-Speex file
-.TP
--
-stdout
-.SH OPTIONS
-.TP
-\fB\-n\fR, \fB\-\-narrowband\fR
-Narrowband (8 kHz) input file
-.TP
-\fB\-w\fR, \fB\-\-wideband\fR
-Wideband (16 kHz) input file
-.HP
-\fB\-u\fR, \fB\-\-ultra\-wideband\fR "Ultra-wideband" (32 kHz) input file
-.TP
-\fB\-\-quality\fR n
-Encoding quality (0-10), default 8
-.TP
-\fB\-\-bitrate\fR n
-Encoding bit-rate (use bit-rate n or lower)
-.TP
-\fB\-\-vbr\fR
-Enable variable bit-rate (VBR)
-.TP
-\fB\-\-abr\fR rate
-Enable average bit-rate (ABR) at rate bps
-.TP
-\fB\-\-vad\fR
-Enable voice activity detection (VAD)
-.TP
-\fB\-\-dtx\fR
-Enable file-based discontinuous transmission (DTX)
-.TP
-\fB\-\-comp\fR n
-Set encoding complexity (0-10), default 3
-.TP
-\fB\-\-nframes\fR n
-Number of frames per Ogg packet (1-10), default 1
-.TP
-\fB\-\-comment\fR
-Add the given string as an extra comment. This may be
-used multiple times
-.TP
-\fB\-\-author\fR
-Author of this track
-.TP
-\fB\-\-title\fR
-Title for this track
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-This help
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Version information
-.TP
-\fB\-V\fR
-Verbose mode (show bit-rate)
-.SS "Raw input options:"
-.TP
-\fB\-\-rate\fR n
-Sampling rate for raw input
-.TP
-\fB\-\-stereo\fR
-Consider raw input as stereo
-.TP
-\fB\-\-le\fR
-Raw input is little-endian
-.TP
-\fB\-\-be\fR
-Raw input is big-endian
-.TP
-\fB\-\-8bit\fR
-Raw input is 8-bit unsigned
-.TP
-\fB\-\-16bit\fR
-Raw input is 16-bit signed
-.PP
-Default raw PCM input is 16-bit, little-endian, mono
-.PP
-More information is available from the Speex site: http://www.speex.org
-.PP
-Please report bugs to the mailing list `speex-dev@xiph.org'.
-.SH COPYRIGHT
-Copyright \(co 2002 Jean-Marc Valin
diff --git a/src/speexenc.c b/src/speexenc.c
deleted file mode 100644
index 5084918..0000000
--- a/src/speexenc.c
+++ /dev/null
@@ -1,1016 +0,0 @@
-/* Copyright (C) 2002-2006 Jean-Marc Valin 
-   File: speexenc.c
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#if !defined WIN32 && !defined _WIN32
-#include <unistd.h>
-#endif
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-#ifndef HAVE_GETOPT_LONG
-#include "getopt_win.h"
-#endif
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "../include/speex/speex.h"
-#include <ogg/ogg.h>
-#include "wav_io.h"
-#include "../include/speex/speex_header.h"
-#include "../include/speex/speex_stereo.h"
-#include "../include/speex/speex_preprocess.h"
-
-#if defined WIN32 || defined _WIN32
-/* We need the following two to set stdout to binary */
-#include <io.h>
-#include <fcntl.h>
-#endif
-
-#include "skeleton.h"
-
-
-void comment_init(char **comments, int* length, char *vendor_string);
-void comment_add(char **comments, int* length, char *tag, char *val);
-
-
-/*Write an Ogg page to a file pointer*/
-int oe_write_page(ogg_page *page, FILE *fp)
-{
-   int written;
-   written = fwrite(page->header,1,page->header_len, fp);
-   written += fwrite(page->body,1,page->body_len, fp);
-   
-   return written;
-}
-
-#define MAX_FRAME_SIZE 2000
-#define MAX_FRAME_BYTES 2000
-
-/* Convert input audio bits, endians and channels */
-static int read_samples(FILE *fin,int frame_size, int bits, int channels, int lsb, short * input, char *buff, spx_int32_t *size)
-{   
-   unsigned char in[MAX_FRAME_BYTES*2];
-   int i;
-   short *s;
-   int nb_read;
-
-   if (size && *size<=0)
-   {
-      return 0;
-   }
-   /*Read input audio*/
-   if (size)
-      *size -= bits/8*channels*frame_size;
-   if (buff)
-   {
-      for (i=0;i<12;i++)
-         in[i]=buff[i];
-      nb_read = fread(in+12,1,bits/8*channels*frame_size-12, fin) + 12;
-      if (size)
-         *size += 12;
-   } else {
-      nb_read = fread(in,1,bits/8*channels* frame_size, fin);
-   }
-   nb_read /= bits/8*channels;
-
-   /*fprintf (stderr, "%d\n", nb_read);*/
-   if (nb_read==0)
-      return 0;
-
-   s=(short*)in;
-   if(bits==8)
-   {
-      /* Convert 8->16 bits */
-      for(i=frame_size*channels-1;i>=0;i--)
-      {
-         s[i]=(in[i]<<8)^0x8000;
-      }
-   } else
-   {
-      /* convert to our endian format */
-      for(i=0;i<frame_size*channels;i++)
-      {
-         if(lsb) 
-            s[i]=le_short(s[i]); 
-         else
-            s[i]=be_short(s[i]);
-      }
-   }
-
-   /* FIXME: This is probably redundent now */
-   /* copy to float input buffer */
-   for (i=0;i<frame_size*channels;i++)
-   {
-      input[i]=(short)s[i];
-   }
-
-   for (i=nb_read*channels;i<frame_size*channels;i++)
-   {
-      input[i]=0;
-   }
-
-
-   return nb_read;
-}
-
-void add_fishead_packet (ogg_stream_state *os) {
-
-   fishead_packet fp;
-
-   memset(&fp, 0, sizeof(fp));
-   fp.ptime_n = 0;
-   fp.ptime_d = 1000;
-   fp.btime_n = 0;
-   fp.btime_d = 1000;
-
-   add_fishead_to_stream(os, &fp);
-}
-
-/*
- * Adds the fishead packets in the skeleton output stream along with the e_o_s packet
- */
-void add_fisbone_packet (ogg_stream_state *os, spx_int32_t serialno, SpeexHeader *header) {
-
-   fisbone_packet fp;
-
-   memset(&fp, 0, sizeof(fp));
-   fp.serial_no = serialno;
-   fp.nr_header_packet = 2 + header->extra_headers;
-   fp.granule_rate_n = header->rate;
-   fp.granule_rate_d = 1;
-   fp.start_granule = 0;
-   fp.preroll = 3;
-   fp.granule_shift = 0;
-
-   add_message_header_field(&fp, "Content-Type", "audio/x-speex");
-
-   add_fisbone_to_stream(os, &fp);
-}
-
-void version()
-{
-   const char* speex_version;
-   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
-   printf ("speexenc (Speex encoder) version %s (compiled " __DATE__ ")\n", speex_version);
-   printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
-}
-
-void version_short()
-{
-   const char* speex_version;
-   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
-   printf ("speexenc version %s\n", speex_version);
-   printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
-}
-
-void usage()
-{
-   printf ("Usage: speexenc [options] input_file output_file\n");
-   printf ("\n");
-   printf ("Encodes input_file using Speex. It can read the WAV or raw files.\n");
-   printf ("\n");
-   printf ("input_file can be:\n");
-   printf ("  filename.wav      wav file\n");
-   printf ("  filename.*        Raw PCM file (any extension other than .wav)\n");
-   printf ("  -                 stdin\n");
-   printf ("\n");  
-   printf ("output_file can be:\n");
-   printf ("  filename.spx      Speex file\n");
-   printf ("  -                 stdout\n");
-   printf ("\n");  
-   printf ("Options:\n");
-   printf (" -n, --narrowband   Narrowband (8 kHz) input file\n"); 
-   printf (" -w, --wideband     Wideband (16 kHz) input file\n"); 
-   printf (" -u, --ultra-wideband \"Ultra-wideband\" (32 kHz) input file\n"); 
-   printf (" --quality n        Encoding quality (0-10), default 8\n"); 
-   printf (" --bitrate n        Encoding bit-rate (use bit-rate n or lower)\n"); 
-   printf (" --vbr              Enable variable bit-rate (VBR)\n"); 
-   printf (" --vbr-max-bitrate  Set max VBR bit-rate allowed\n"); 
-   printf (" --abr rate         Enable average bit-rate (ABR) at rate bps\n"); 
-   printf (" --vad              Enable voice activity detection (VAD)\n"); 
-   printf (" --dtx              Enable file-based discontinuous transmission (DTX)\n"); 
-   printf (" --comp n           Set encoding complexity (0-10), default 3\n"); 
-   printf (" --nframes n        Number of frames per Ogg packet (1-10), default 1\n"); 
-   printf (" --denoise          Denoise the input before encoding\n"); 
-   printf (" --agc              Apply adaptive gain control (AGC) before encoding\n"); 
-   printf (" --no-highpass      Disable the encoder's built-in high-pass filter\n");
-   printf (" --skeleton         Outputs ogg skeleton metadata (may cause incompatibilities)\n");
-   printf (" --comment          Add the given string as an extra comment. This may be\n");
-   printf ("                     used multiple times\n");
-   printf (" --author           Author of this track\n");
-   printf (" --title            Title for this track\n");
-   printf (" -h, --help         This help\n"); 
-   printf (" -v, --version      Version information\n"); 
-   printf (" -V                 Verbose mode (show bit-rate)\n"); 
-   printf (" --print-rate       Print the bitrate for each frame to standard output\n");
-   printf ("Raw input options:\n");
-   printf (" --rate n           Sampling rate for raw input\n"); 
-   printf (" --stereo           Consider raw input as stereo\n"); 
-   printf (" --le               Raw input is little-endian\n"); 
-   printf (" --be               Raw input is big-endian\n"); 
-   printf (" --8bit             Raw input is 8-bit unsigned\n"); 
-   printf (" --16bit            Raw input is 16-bit signed\n"); 
-   printf ("Default raw PCM input is 16-bit, little-endian, mono\n"); 
-   printf ("\n");
-   printf ("More information is available from the Speex site: http://www.speex.org\n");
-   printf ("\n");
-   printf ("Please report bugs to the mailing list `speex-dev@xiph.org'.\n");
-}
-
-
-int main(int argc, char **argv)
-{
-   int nb_samples, total_samples=0, nb_encoded;
-   int c;
-   int option_index = 0;
-   char *inFile, *outFile;
-   FILE *fin, *fout;
-   short input[MAX_FRAME_SIZE];
-   spx_int32_t frame_size;
-   int quiet=0;
-   spx_int32_t vbr_enabled=0;
-   spx_int32_t vbr_max=0;
-   int abr_enabled=0;
-   spx_int32_t vad_enabled=0;
-   spx_int32_t dtx_enabled=0;
-   int nbBytes;
-   const SpeexMode *mode=NULL;
-   int modeID = -1;
-   void *st;
-   SpeexBits bits;
-   char cbits[MAX_FRAME_BYTES];
-   int with_skeleton = 0;
-   struct option long_options[] =
-   {
-      {"wideband", no_argument, NULL, 0},
-      {"ultra-wideband", no_argument, NULL, 0},
-      {"narrowband", no_argument, NULL, 0},
-      {"vbr", no_argument, NULL, 0},
-      {"vbr-max-bitrate", required_argument, NULL, 0},
-      {"abr", required_argument, NULL, 0},
-      {"vad", no_argument, NULL, 0},
-      {"dtx", no_argument, NULL, 0},
-      {"quality", required_argument, NULL, 0},
-      {"bitrate", required_argument, NULL, 0},
-      {"nframes", required_argument, NULL, 0},
-      {"comp", required_argument, NULL, 0},
-      {"denoise", no_argument, NULL, 0},
-      {"agc", no_argument, NULL, 0},
-      {"no-highpass", no_argument, NULL, 0},
-      {"skeleton",no_argument,NULL, 0},
-      {"help", no_argument, NULL, 0},
-      {"quiet", no_argument, NULL, 0},
-      {"le", no_argument, NULL, 0},
-      {"be", no_argument, NULL, 0},
-      {"8bit", no_argument, NULL, 0},
-      {"16bit", no_argument, NULL, 0},
-      {"stereo", no_argument, NULL, 0},
-      {"rate", required_argument, NULL, 0},
-      {"version", no_argument, NULL, 0},
-      {"version-short", no_argument, NULL, 0},
-      {"comment", required_argument, NULL, 0},
-      {"author", required_argument, NULL, 0},
-      {"title", required_argument, NULL, 0},
-      {"print-rate", no_argument, NULL, 0},
-      {0, 0, 0, 0}
-   };
-   int print_bitrate=0;
-   spx_int32_t rate=0;
-   spx_int32_t size;
-   int chan=1;
-   int fmt=16;
-   spx_int32_t quality=-1;
-   float vbr_quality=-1;
-   int lsb=1;
-   ogg_stream_state os;
-   ogg_stream_state so; /* ogg stream for skeleton bitstream */
-   ogg_page 		 og;
-   ogg_packet 		 op;
-   int bytes_written=0, ret, result;
-   int id=-1;
-   SpeexHeader header;
-   int nframes=1;
-   spx_int32_t complexity=3;
-   const char* speex_version;
-   char vendor_string[64];
-   char *comments;
-   int comments_length;
-   int close_in=0, close_out=0;
-   int eos=0;
-   spx_int32_t bitrate=0;
-   double cumul_bits=0, enc_frames=0;
-   char first_bytes[12];
-   int wave_input=0;
-   spx_int32_t tmp;
-   SpeexPreprocessState *preprocess = NULL;
-   int denoise_enabled=0, agc_enabled=0;
-   int highpass_enabled=1;
-   int output_rate=0;
-   spx_int32_t lookahead = 0;
-
-   speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version);
-   snprintf(vendor_string, sizeof(vendor_string), "Encoded with Speex %s", speex_version);
-   
-   comment_init(&comments, &comments_length, vendor_string);
-
-   /*Process command-line options*/
-   while(1)
-   {
-      c = getopt_long (argc, argv, "nwuhvV",
-                       long_options, &option_index);
-      if (c==-1)
-         break;
-      
-      switch(c)
-      {
-      case 0:
-         if (strcmp(long_options[option_index].name,"narrowband")==0)
-         {
-            modeID = SPEEX_MODEID_NB;
-         } else if (strcmp(long_options[option_index].name,"wideband")==0)
-         {
-            modeID = SPEEX_MODEID_WB;
-         } else if (strcmp(long_options[option_index].name,"ultra-wideband")==0)
-         {
-            modeID = SPEEX_MODEID_UWB;
-         } else if (strcmp(long_options[option_index].name,"vbr")==0)
-         {
-            vbr_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"vbr-max-bitrate")==0)
-         {
-            vbr_max=atoi(optarg);
-            if (vbr_max<1)
-            {
-               fprintf (stderr, "Invalid VBR max bit-rate value: %d\n", vbr_max);
-               exit(1);
-            }
-         } else if (strcmp(long_options[option_index].name,"abr")==0)
-         {
-            abr_enabled=atoi(optarg);
-            if (!abr_enabled)
-            {
-               fprintf (stderr, "Invalid ABR value: %d\n", abr_enabled);
-               exit(1);
-            }
-         } else if (strcmp(long_options[option_index].name,"vad")==0)
-         {
-            vad_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"dtx")==0)
-         {
-            dtx_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"quality")==0)
-         {
-            quality = atoi (optarg);
-            vbr_quality=atof(optarg);
-         } else if (strcmp(long_options[option_index].name,"bitrate")==0)
-         {
-            bitrate = atoi (optarg);
-         } else if (strcmp(long_options[option_index].name,"nframes")==0)
-         {
-            nframes = atoi (optarg);
-            if (nframes<1)
-               nframes=1;
-            if (nframes>10)
-               nframes=10;
-         } else if (strcmp(long_options[option_index].name,"comp")==0)
-         {
-            complexity = atoi (optarg);
-         } else if (strcmp(long_options[option_index].name,"denoise")==0)
-         {
-            denoise_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"agc")==0)
-         {
-            agc_enabled=1;
-         } else if (strcmp(long_options[option_index].name,"no-highpass")==0)
-         {
-            highpass_enabled=0;
-         } else if (strcmp(long_options[option_index].name,"skeleton")==0)
-         {
-            with_skeleton=1;
-         } else if (strcmp(long_options[option_index].name,"help")==0)
-         {
-            usage();
-            exit(0);
-         } else if (strcmp(long_options[option_index].name,"quiet")==0)
-         {
-            quiet = 1;
-         } else if (strcmp(long_options[option_index].name,"version")==0)
-         {
-            version();
-            exit(0);
-         } else if (strcmp(long_options[option_index].name,"version-short")==0)
-         {
-            version_short();
-            exit(0);
-         } else if (strcmp(long_options[option_index].name,"print-rate")==0)
-         {
-			 output_rate=1;
-         } else if (strcmp(long_options[option_index].name,"le")==0)
-         {
-            lsb=1;
-         } else if (strcmp(long_options[option_index].name,"be")==0)
-         {
-            lsb=0;
-         } else if (strcmp(long_options[option_index].name,"8bit")==0)
-         {
-            fmt=8;
-         } else if (strcmp(long_options[option_index].name,"16bit")==0)
-         {
-            fmt=16;
-         } else if (strcmp(long_options[option_index].name,"stereo")==0)
-         {
-            chan=2;
-         } else if (strcmp(long_options[option_index].name,"rate")==0)
-         {
-            rate=atoi (optarg);
-         } else if (strcmp(long_options[option_index].name,"comment")==0)
-         {
-	   if (!strchr(optarg, '='))
-	   {
-	     fprintf (stderr, "Invalid comment: %s\n", optarg);
-	     fprintf (stderr, "Comments must be of the form name=value\n");
-	     exit(1);
-	   }
-           comment_add(&comments, &comments_length, NULL, optarg); 
-         } else if (strcmp(long_options[option_index].name,"author")==0)
-         {
-           comment_add(&comments, &comments_length, "author=", optarg); 
-         } else if (strcmp(long_options[option_index].name,"title")==0)
-         {
-           comment_add(&comments, &comments_length, "title=", optarg); 
-         }
-
-         break;
-      case 'n':
-         modeID = SPEEX_MODEID_NB;
-         break;
-      case 'h':
-         usage();
-         exit(0);
-         break;
-      case 'v':
-         version();
-         exit(0);
-         break;
-      case 'V':
-         print_bitrate=1;
-         break;
-      case 'w':
-         modeID = SPEEX_MODEID_WB;
-         break;
-      case 'u':
-         modeID = SPEEX_MODEID_UWB;
-         break;
-      case '?':
-         usage();
-         exit(1);
-         break;
-      }
-   }
-   if (argc-optind!=2)
-   {
-      usage();
-      exit(1);
-   }
-   inFile=argv[optind];
-   outFile=argv[optind+1];
-
-   /*Initialize Ogg stream struct*/
-   srand(time(NULL));
-   if (ogg_stream_init(&os, rand())==-1)
-   {
-      fprintf(stderr,"Error: stream init failed\n");
-      exit(1);
-   }
-   if (with_skeleton && ogg_stream_init(&so, rand())==-1)
-   {
-      fprintf(stderr,"Error: stream init failed\n");
-      exit(1);
-   }
-
-   if (strcmp(inFile, "-")==0)
-   {
-#if defined WIN32 || defined _WIN32
-         _setmode(_fileno(stdin), _O_BINARY);
-#elif defined OS2
-         _fsetmode(stdin,"b");
-#endif
-      fin=stdin;
-   }
-   else 
-   {
-      fin = fopen(inFile, "rb");
-      if (!fin)
-      {
-         perror(inFile);
-         exit(1);
-      }
-      close_in=1;
-   }
-
-   {
-      if (fread(first_bytes, 1, 12, fin) != 12)
-	  {
-		  perror("short file");
-		  exit(1);
-	  }
-      if (strncmp(first_bytes,"RIFF",4)==0 && strncmp(first_bytes,"RIFF",4)==0)
-      {
-         if (read_wav_header(fin, &rate, &chan, &fmt, &size)==-1)
-            exit(1);
-         wave_input=1;
-         lsb=1; /* CHECK: exists big-endian .wav ?? */
-      }
-   }
-
-   if (modeID==-1 && !rate)
-   {
-      /* By default, use narrowband/8 kHz */
-      modeID = SPEEX_MODEID_NB;
-      rate=8000;
-   } else if (modeID!=-1 && rate)
-   {
-      mode = speex_lib_get_mode (modeID);
-      if (rate>48000)
-      {
-         fprintf (stderr, "Error: sampling rate too high: %d Hz, try down-sampling\n", rate);
-         exit(1);
-      } else if (rate>25000)
-      {
-         if (modeID != SPEEX_MODEID_UWB)
-         {
-            fprintf (stderr, "Warning: Trying to encode in %s at %d Hz. I'll do it but I suggest you try ultra-wideband instead\n", mode->modeName , rate);
-         }
-      } else if (rate>12500)
-      {
-         if (modeID != SPEEX_MODEID_WB)
-         {
-            fprintf (stderr, "Warning: Trying to encode in %s at %d Hz. I'll do it but I suggest you try wideband instead\n", mode->modeName , rate);
-         }
-      } else if (rate>=6000)
-      {
-         if (modeID != SPEEX_MODEID_NB)
-         {
-            fprintf (stderr, "Warning: Trying to encode in %s at %d Hz. I'll do it but I suggest you try narrowband instead\n", mode->modeName , rate);
-         }
-      } else {
-         fprintf (stderr, "Error: sampling rate too low: %d Hz\n", rate);
-         exit(1);
-      }
-   } else if (modeID==-1)
-   {
-      if (rate>48000)
-      {
-         fprintf (stderr, "Error: sampling rate too high: %d Hz, try down-sampling\n", rate);
-         exit(1);
-      } else if (rate>25000)
-      {
-         modeID = SPEEX_MODEID_UWB;
-      } else if (rate>12500)
-      {
-         modeID = SPEEX_MODEID_WB;
-      } else if (rate>=6000)
-      {
-         modeID = SPEEX_MODEID_NB;
-      } else {
-         fprintf (stderr, "Error: Sampling rate too low: %d Hz\n", rate);
-         exit(1);
-      }
-   } else if (!rate)
-   {
-      if (modeID == SPEEX_MODEID_NB)
-         rate=8000;
-      else if (modeID == SPEEX_MODEID_WB)
-         rate=16000;
-      else if (modeID == SPEEX_MODEID_UWB)
-         rate=32000;
-   }
-
-   if (!quiet)
-      if (rate!=8000 && rate!=16000 && rate!=32000)
-         fprintf (stderr, "Warning: Speex is only optimized for 8, 16 and 32 kHz. It will still work at %d Hz but your mileage may vary\n", rate); 
-
-   if (!mode)
-      mode = speex_lib_get_mode (modeID);
-
-   speex_init_header(&header, rate, 1, mode);
-   header.frames_per_packet=nframes;
-   header.vbr=vbr_enabled;
-   header.nb_channels = chan;
-
-   {
-      char *st_string="mono";
-      if (chan==2)
-         st_string="stereo";
-      if (!quiet)
-         fprintf (stderr, "Encoding %d Hz audio using %s mode (%s)\n", 
-               header.rate, mode->modeName, st_string);
-   }
-   /*fprintf (stderr, "Encoding %d Hz audio at %d bps using %s mode\n", 
-     header.rate, mode->bitrate, mode->modeName);*/
-
-   /*Initialize Speex encoder*/
-   st = speex_encoder_init(mode);
-
-   if (strcmp(outFile,"-")==0)
-   {
-#if defined WIN32 || defined _WIN32
-      _setmode(_fileno(stdout), _O_BINARY);
-#endif
-      fout=stdout;
-   }
-   else 
-   {
-      fout = fopen(outFile, "wb");
-      if (!fout)
-      {
-         perror(outFile);
-         exit(1);
-      }
-      close_out=1;
-   }
-
-   speex_encoder_ctl(st, SPEEX_GET_FRAME_SIZE, &frame_size);
-   speex_encoder_ctl(st, SPEEX_SET_COMPLEXITY, &complexity);
-   speex_encoder_ctl(st, SPEEX_SET_SAMPLING_RATE, &rate);
-
-   if (quality >= 0)
-   {
-      if (vbr_enabled)
-      {
-         if (vbr_max>0)
-            speex_encoder_ctl(st, SPEEX_SET_VBR_MAX_BITRATE, &vbr_max);
-         speex_encoder_ctl(st, SPEEX_SET_VBR_QUALITY, &vbr_quality);
-      }
-      else
-         speex_encoder_ctl(st, SPEEX_SET_QUALITY, &quality);
-   }
-   if (bitrate)
-   {
-      if (quality >= 0 && vbr_enabled)
-         fprintf (stderr, "Warning: --bitrate option is overriding --quality\n");
-      speex_encoder_ctl(st, SPEEX_SET_BITRATE, &bitrate);
-   }
-   if (vbr_enabled)
-   {
-      tmp=1;
-      speex_encoder_ctl(st, SPEEX_SET_VBR, &tmp);
-   } else if (vad_enabled)
-   {
-      tmp=1;
-      speex_encoder_ctl(st, SPEEX_SET_VAD, &tmp);
-   }
-   if (dtx_enabled)
-      speex_encoder_ctl(st, SPEEX_SET_DTX, &tmp);
-   if (dtx_enabled && !(vbr_enabled || abr_enabled || vad_enabled))
-   {
-      fprintf (stderr, "Warning: --dtx is useless without --vad, --vbr or --abr\n");
-   } else if ((vbr_enabled || abr_enabled) && (vad_enabled))
-   {
-      fprintf (stderr, "Warning: --vad is already implied by --vbr or --abr\n");
-   }
-   if (with_skeleton) {
-      fprintf (stderr, "Warning: Enabling skeleton output may cause some decoders to fail.\n");
-   }
-
-   if (abr_enabled)
-   {
-      speex_encoder_ctl(st, SPEEX_SET_ABR, &abr_enabled);
-   }
-
-   speex_encoder_ctl(st, SPEEX_SET_HIGHPASS, &highpass_enabled);
-
-   speex_encoder_ctl(st, SPEEX_GET_LOOKAHEAD, &lookahead);
-   
-   if (denoise_enabled || agc_enabled)
-   {
-      preprocess = speex_preprocess_state_init(frame_size, rate);
-      speex_preprocess_ctl(preprocess, SPEEX_PREPROCESS_SET_DENOISE, &denoise_enabled);
-      speex_preprocess_ctl(preprocess, SPEEX_PREPROCESS_SET_AGC, &agc_enabled);
-      lookahead += frame_size;
-   }
-
-   /* first packet should be the skeleton header. */
-
-   if (with_skeleton) {
-      add_fishead_packet(&so);
-      if ((ret = flush_ogg_stream_to_file(&so, fout))) {
-	 fprintf (stderr,"Error: failed skeleton (fishead) header to output stream\n");
-         exit(1);
-      } else
-	 bytes_written += ret;
-   }
-
-   /*Write header*/
-   {
-      int packet_size;
-      op.packet = (unsigned char *)speex_header_to_packet(&header, &packet_size);
-      op.bytes = packet_size;
-      op.b_o_s = 1;
-      op.e_o_s = 0;
-      op.granulepos = 0;
-      op.packetno = 0;
-      ogg_stream_packetin(&os, &op);
-      free(op.packet);
-
-      while((result = ogg_stream_flush(&os, &og)))
-      {
-         if(!result) break;
-         ret = oe_write_page(&og, fout);
-         if(ret != og.header_len + og.body_len)
-         {
-            fprintf (stderr,"Error: failed writing header to output stream\n");
-            exit(1);
-         }
-         else
-            bytes_written += ret;
-      }
-
-      op.packet = (unsigned char *)comments;
-      op.bytes = comments_length;
-      op.b_o_s = 0;
-      op.e_o_s = 0;
-      op.granulepos = 0;
-      op.packetno = 1;
-      ogg_stream_packetin(&os, &op);
-   }
-
-   /* fisbone packet should be write after all bos pages */
-   if (with_skeleton) {
-      add_fisbone_packet(&so, os.serialno, &header);
-      if ((ret = flush_ogg_stream_to_file(&so, fout))) {
-	 fprintf (stderr,"Error: failed writing skeleton (fisbone )header to output stream\n");
-         exit(1);
-      } else
-	 bytes_written += ret;
-   }
-
-   /* writing the rest of the speex header packets */
-   while((result = ogg_stream_flush(&os, &og)))
-   {
-      if(!result) break;
-      ret = oe_write_page(&og, fout);
-      if(ret != og.header_len + og.body_len)
-      {
-         fprintf (stderr,"Error: failed writing header to output stream\n");
-         exit(1);
-      }
-      else
-         bytes_written += ret;
-   }
-
-   free(comments);
-
-   /* write the skeleton eos packet */
-   if (with_skeleton) {
-      add_eos_packet_to_stream(&so);
-      if ((ret = flush_ogg_stream_to_file(&so, fout))) {
-         fprintf (stderr,"Error: failed writing skeleton header to output stream\n");
-         exit(1);
-      } else
-	 bytes_written += ret;
-   }
-
-
-   speex_bits_init(&bits);
-
-   if (!wave_input)
-   {
-      nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, first_bytes, NULL);
-   } else {
-      nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, &size);
-   }
-   if (nb_samples==0)
-      eos=1;
-   total_samples += nb_samples;
-   nb_encoded = -lookahead;
-   /*Main encoding loop (one frame per iteration)*/
-   while (!eos || total_samples>nb_encoded)
-   {
-      id++;
-      /*Encode current frame*/
-      if (chan==2)
-         speex_encode_stereo_int(input, frame_size, &bits);
-
-      if (preprocess)
-         speex_preprocess(preprocess, input, NULL);
-
-      speex_encode_int(st, input, &bits);
-      
-      nb_encoded += frame_size;
-      if (print_bitrate) {
-         int tmp;
-         char ch=13;
-         speex_encoder_ctl(st, SPEEX_GET_BITRATE, &tmp);
-         fputc (ch, stderr);
-         cumul_bits += tmp;
-         enc_frames += 1;
-         if (!quiet)
-         {
-            if (vad_enabled || vbr_enabled || abr_enabled)
-               fprintf (stderr, "Bitrate is use: %d bps  (average %d bps)   ", tmp, (int)(cumul_bits/enc_frames));
-            else
-               fprintf (stderr, "Bitrate is use: %d bps     ", tmp);
-			if (output_rate)
-				printf ("%d\n", tmp);
-         }
-         
-      }
-
-      if (wave_input)
-      {
-         nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, &size);
-      } else {
-         nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, NULL);
-      }
-      if (nb_samples==0)
-      {
-         eos=1;
-      }
-      if (eos && total_samples<=nb_encoded)
-         op.e_o_s = 1;
-      else
-         op.e_o_s = 0;
-      total_samples += nb_samples;
-
-      if ((id+1)%nframes!=0)
-         continue;
-      speex_bits_insert_terminator(&bits);
-      nbBytes = speex_bits_write(&bits, cbits, MAX_FRAME_BYTES);
-      speex_bits_reset(&bits);
-      op.packet = (unsigned char *)cbits;
-      op.bytes = nbBytes;
-      op.b_o_s = 0;
-      /*Is this redundent?*/
-      if (eos && total_samples<=nb_encoded)
-         op.e_o_s = 1;
-      else
-         op.e_o_s = 0;
-      op.granulepos = (id+1)*frame_size-lookahead;
-      if (op.granulepos>total_samples)
-         op.granulepos = total_samples;
-      /*printf ("granulepos: %d %d %d %d %d %d\n", (int)op.granulepos, id, nframes, lookahead, 5, 6);*/
-      op.packetno = 2+id/nframes;
-      ogg_stream_packetin(&os, &op);
-
-      /*Write all new pages (most likely 0 or 1)*/
-      while (ogg_stream_pageout(&os,&og))
-      {
-         ret = oe_write_page(&og, fout);
-         if(ret != og.header_len + og.body_len)
-         {
-            fprintf (stderr,"Error: failed writing header to output stream\n");
-            exit(1);
-         }
-         else
-            bytes_written += ret;
-      }
-   }
-   if ((id+1)%nframes!=0)
-   {
-      while ((id+1)%nframes!=0)
-      {
-         id++;
-         speex_bits_pack(&bits, 15, 5);
-      }
-      nbBytes = speex_bits_write(&bits, cbits, MAX_FRAME_BYTES);
-      op.packet = (unsigned char *)cbits;
-      op.bytes = nbBytes;
-      op.b_o_s = 0;
-      op.e_o_s = 1;
-      op.granulepos = (id+1)*frame_size-lookahead;
-      if (op.granulepos>total_samples)
-         op.granulepos = total_samples;
-
-      op.packetno = 2+id/nframes;
-      ogg_stream_packetin(&os, &op);
-   }
-   /*Flush all pages left to be written*/
-   while (ogg_stream_flush(&os, &og))
-   {
-      ret = oe_write_page(&og, fout);
-      if(ret != og.header_len + og.body_len)
-      {
-         fprintf (stderr,"Error: failed writing header to output stream\n");
-         exit(1);
-      }
-      else
-         bytes_written += ret;
-   }
-
-   speex_encoder_destroy(st);
-   speex_bits_destroy(&bits);
-   ogg_stream_clear(&os);
-
-   if (close_in)
-      fclose(fin);
-   if (close_out)
-      fclose(fout);
-   return 0;
-}
-
-/*                 
- Comments will be stored in the Vorbis style.            
- It is describled in the "Structure" section of
-    http://www.xiph.org/ogg/vorbis/doc/v-comment.html
-
-The comment header is decoded as follows:
-  1) [vendor_length] = read an unsigned integer of 32 bits
-  2) [vendor_string] = read a UTF-8 vector as [vendor_length] octets
-  3) [user_comment_list_length] = read an unsigned integer of 32 bits
-  4) iterate [user_comment_list_length] times {
-     5) [length] = read an unsigned integer of 32 bits
-     6) this iteration's user comment = read a UTF-8 vector as [length] octets
-     }
-  7) [framing_bit] = read a single bit as boolean
-  8) if ( [framing_bit]  unset or end of packet ) then ERROR
-  9) done.
-
-  If you have troubles, please write to ymnk@jcraft.com.
- */
-
-#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
-                           ((buf[base+2]<<16)&0xff0000)| \
-                           ((buf[base+1]<<8)&0xff00)| \
-  	           	    (buf[base]&0xff))
-#define writeint(buf, base, val) do{ buf[base+3]=((val)>>24)&0xff; \
-                                     buf[base+2]=((val)>>16)&0xff; \
-                                     buf[base+1]=((val)>>8)&0xff; \
-                                     buf[base]=(val)&0xff; \
-                                 }while(0)
-
-void comment_init(char **comments, int* length, char *vendor_string)
-{
-  int vendor_length=strlen(vendor_string);
-  int user_comment_list_length=0;
-  int len=4+vendor_length+4;
-  char *p=(char*)malloc(len);
-  if(p==NULL){
-     fprintf (stderr, "malloc failed in comment_init()\n");
-     exit(1);
-  }
-  writeint(p, 0, vendor_length);
-  memcpy(p+4, vendor_string, vendor_length);
-  writeint(p, 4+vendor_length, user_comment_list_length);
-  *length=len;
-  *comments=p;
-}
-void comment_add(char **comments, int* length, char *tag, char *val)
-{
-  char* p=*comments;
-  int vendor_length=readint(p, 0);
-  int user_comment_list_length=readint(p, 4+vendor_length);
-  int tag_len=(tag?strlen(tag):0);
-  int val_len=strlen(val);
-  int len=(*length)+4+tag_len+val_len;
-
-  p=(char*)realloc(p, len);
-  if(p==NULL){
-     fprintf (stderr, "realloc failed in comment_add()\n");
-     exit(1);
-  }
-
-  writeint(p, *length, tag_len+val_len);      /* length of comment */
-  if(tag) memcpy(p+*length+4, tag, tag_len);  /* comment */
-  memcpy(p+*length+4+tag_len, val, val_len);  /* comment */
-  writeint(p, 4+vendor_length, user_comment_list_length+1);
-
-  *comments=p;
-  *length=len;
-}
-#undef readint
-#undef writeint
diff --git a/src/wav_io.c b/src/wav_io.c
deleted file mode 100644
index c8f466d..0000000
--- a/src/wav_io.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
-   File: wav_io.c
-   Routines to handle wav (RIFF) headers
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include "../include/speex/speex_types.h"
-#include "wav_io.h"
-
-
-int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32_t *size)
-{
-   char ch[5];
-   spx_int32_t itmp;
-   spx_int16_t stmp;
-   spx_int32_t bpersec;
-   spx_int16_t balign;
-   int skip_bytes;
-   int i;
-
-   ch[4]=0;
-#if 0
-   fread(ch, 1, 4, file);
-   if (strcmp(ch, "RIFF")!=0)
-   {
-      fseek(file, 0, SEEK_SET);
-      return 0;
-   }
-
-   fread(&itmp, 4, 1, file);
-   *size = le_int(itmp-36);
-
-   fread(ch, 1, 4, file);
-   if (strcmp(ch, "WAVE")!=0)
-   {
-      fprintf (stderr, "RIFF file is not a WAVE file\n");
-      return -1;
-   }
-#endif
-   fread(ch, 1, 4, file);
-   while (strcmp(ch, "fmt ")!=0)
-   {
-      fread(&itmp, 4, 1, file);
-      itmp = le_int(itmp);
-      /*fprintf (stderr, "skip=%d\n", itmp);*/
-      /*strange way of seeking, but it works even for pipes*/
-      for (i=0;i<itmp;i++)
-         fgetc(file);
-      /*fseek(file, itmp, SEEK_CUR);*/
-      fread(ch, 1, 4, file);
-      if (feof(file))
-      {
-         fprintf (stderr, "Corrupted WAVE file: no \"fmt \"\n");
-         return -1;
-      }
-   }
-   /*if (strcmp(ch, "fmt ")!=0)
-   {
-      fprintf (stderr, "Corrupted WAVE file: no \"fmt \"\n");
-      return -1;
-      }*/
-   
-   fread(&itmp, 4, 1, file);
-   itmp = le_int(itmp);
-   skip_bytes=itmp-16;
-   /*fprintf (stderr, "skip=%d\n", skip_bytes);*/
-   
-   fread(&stmp, 2, 1, file);
-   stmp = le_short(stmp);
-   if (stmp!=1)
-   {
-      fprintf (stderr, "Only PCM encoding is supported\n");
-      return -1;
-   }
-
-   fread(&stmp, 2, 1, file);
-   stmp = le_short(stmp);
-   *channels = stmp;
-   
-   if (stmp>2)
-   {
-      fprintf (stderr, "Only mono and (intensity) stereo supported\n");
-      return -1;
-   }
-
-   fread(&itmp, 4, 1, file);
-   itmp = le_int(itmp);
-   *rate = itmp;
-   if (*rate != 8000 && *rate != 16000 && *rate != 11025 && *rate != 22050 && *rate != 32000 && *rate != 44100 && *rate != 48000)
-   {
-      fprintf (stderr, "Only 8 kHz (narrowband) and 16 kHz (wideband) supported (plus 11.025 kHz and 22.05 kHz, but your mileage may vary)\n");
-      return -1;
-   }
-
-   fread(&itmp, 4, 1, file);
-   bpersec = le_int(itmp);
-
-   fread(&stmp, 2, 1, file);
-   balign = le_short(stmp);
-
-   fread(&stmp, 2, 1, file);
-   stmp = le_short(stmp);
-   if (stmp!=16 && stmp!=8)
-   {
-      fprintf (stderr, "Only 8/16-bit linear supported\n");
-      return -1;
-   }
-   *format=stmp;
-
-   if (bpersec!=*rate**channels*stmp/8)
-   {
-      fprintf (stderr, "Corrupted header: ByteRate mismatch\n");
-      return -1;
-   }
-
-   if (balign!=*channels*stmp/8)
-   {
-      fprintf (stderr, "Corrupted header: BlockAlign mismatch\n");
-      return -1;
-   }
-
-   
-   /*strange way of seeking, but it works even for pipes*/
-   if (skip_bytes>0)
-      for (i=0;i<skip_bytes;i++)
-         fgetc(file);
-
-   /*fseek(file, skip_bytes, SEEK_CUR);*/
-
-   fread(ch, 1, 4, file);
-   while (strcmp(ch, "data")!=0)
-   {
-      fread(&itmp, 4, 1, file);
-      itmp = le_int(itmp);
-      /*strange way of seeking, but it works even for pipes*/
-      for (i=0;i<itmp;i++)
-         fgetc(file);
-      /*fseek(file, itmp, SEEK_CUR);*/
-      fread(ch, 1, 4, file);
-      if (feof(file))
-      {
-         fprintf (stderr, "Corrupted WAVE file: no \"data\"\n");
-         return -1;
-      }
-   }
-
-   /*Ignore this for now*/
-   fread(&itmp, 4, 1, file);
-   itmp = le_int(itmp);
-
-   *size=itmp;
-
-   return 1;
-}
-
-
-
-void write_wav_header(FILE *file, int rate, int channels, int format, int size)
-{
-   char ch[5];
-   spx_int32_t itmp;
-   spx_int16_t stmp;
-
-   ch[4]=0;
-
-   fprintf (file, "RIFF");
-
-   itmp = 0x7fffffff;
-   fwrite(&itmp, 4, 1, file);
-
-   fprintf (file, "WAVEfmt ");
-
-   itmp = le_int(16);
-   fwrite(&itmp, 4, 1, file);
-
-   stmp = le_short(1);
-   fwrite(&stmp, 2, 1, file);
-
-   stmp = le_short(channels);
-   fwrite(&stmp, 2, 1, file);
-
-   itmp = le_int(rate);
-   fwrite(&itmp, 4, 1, file);
-
-   itmp = le_int(rate*channels*2);
-   fwrite(&itmp, 4, 1, file);
-
-   stmp = le_short(2*channels);
-   fwrite(&stmp, 2, 1, file);
-
-   stmp = le_short(16);
-   fwrite(&stmp, 2, 1, file);
-
-   fprintf (file, "data");
-
-   itmp = le_int(0x7fffffff);
-   fwrite(&itmp, 4, 1, file);
-
-
-}
diff --git a/src/wav_io.h b/src/wav_io.h
deleted file mode 100644
index b6570a2..0000000
--- a/src/wav_io.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin 
-   File: wav_io.h
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef WAV_IO_H
-#define WAV_IO_H
-
-#include <stdio.h>
-#include "../include/speex/speex_types.h"
-
-#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
-#define le_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
-#define be_short(s) ((short) (s))
-#else
-#define le_short(s) ((short) (s))
-#define be_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
-#endif 
-
-/** Convert little endian */
-static inline spx_int32_t le_int(spx_int32_t i)
-{
-#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
-   spx_uint32_t ui, ret;
-   ui = i;
-   ret =  ui>>24;
-   ret |= (ui>>8)&0x0000ff00;
-   ret |= (ui<<8)&0x00ff0000;
-   ret |= (ui<<24);
-   return ret;
-#else
-   return i;
-#endif
-}
-
-int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32_t *size);
-
-void write_wav_header(FILE *file, int rate, int channels, int format, int size);
-
-#endif
diff --git a/src/wave_out.c b/src/wave_out.c
deleted file mode 100644
index 64eeb6e..0000000
--- a/src/wave_out.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* Copyright (c) 2002, John Edwards

-

-   Redistribution and use in source and binary forms, with or without

-   modification, are permitted provided that the following conditions

-   are met:

-

-   - Redistributions of source code must retain the above copyright

-   notice, this list of conditions and the following disclaimer.

-

-   - Redistributions in binary form must reproduce the above copyright

-   notice, this list of conditions and the following disclaimer in the

-   documentation and/or other materials provided with the distribution.

-

-   - Neither the name of the Xiph.org Foundation nor the names of its

-   contributors may be used to endorse or promote products derived from

-   this software without specific prior written permission.

-

-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR

-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-*/

-

-#ifdef HAVE_CONFIG_H

-# include "config.h"

-#endif

-

-/* Set TABS = 4 */

-/********************************************************************

-

- function: To provide playback of 16 bit PCM wave data in Win32

-           environments from decoded compressed files.

-

- ********************************************************************/

-

-#if defined WIN32 || defined _WIN32

-

-#include <string.h>

-#include <errno.h>

-#include "wave_out.h"

-

-#define MAXWAVESIZE     4294967040LU

-#define MAX_WAVEBLOCKS    32

-

-// This is modified for USE_WIN_AUDIO - ONLY 2002-02-27

-

-

-static CRITICAL_SECTION  cs;

-static HWAVEOUT          dev                    = NULL;

-static int               ScheduledBlocks        = 0;

-static int               PlayedWaveHeadersCount = 0;          // free index

-static WAVEHDR*          PlayedWaveHeaders [MAX_WAVEBLOCKS];

-

-static int

-Box ( const char* msg )

-{

-	MessageBox ( NULL, msg, " "VERSION_STRING": Error Message . . .", MB_OK | MB_ICONEXCLAMATION );

-	return -1;

-}

-

-

-/*

- *  This function registers already played WAVE chunks. Freeing is done by free_memory(),

- */

-

-static void CALLBACK

-wave_callback ( HWAVE hWave, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 )

-{

-	if ( uMsg == WOM_DONE ) {

-		EnterCriticalSection ( &cs );

-		PlayedWaveHeaders [PlayedWaveHeadersCount++] = (WAVEHDR*) dwParam1;

-		LeaveCriticalSection ( &cs );

-	}

-}

-

-

-static void

-free_memory ( void )

-{

-	WAVEHDR*  wh;

-	HGLOBAL   hg;

-

-	EnterCriticalSection ( &cs );

-	wh = PlayedWaveHeaders [--PlayedWaveHeadersCount];

-	ScheduledBlocks--;                               // decrease the number of USED blocks

-	LeaveCriticalSection ( &cs );

-

-	waveOutUnprepareHeader ( dev, wh, sizeof (WAVEHDR) );

-

-	hg = GlobalHandle ( wh -> lpData );       // Deallocate the buffer memory

-	GlobalUnlock (hg);

-	GlobalFree   (hg);

-

-	hg = GlobalHandle ( wh );                 // Deallocate the header memory

-	GlobalUnlock (hg);

-	GlobalFree   (hg);

-}

-

-

-Int

-Set_WIN_Params ( FILE_T   dummyFile ,

-                 Ldouble  SampleFreq,

-                 Uint     BitsPerSample,

-                 Uint     Channels )

-{

-	WAVEFORMATEX  outFormat;

-	UINT          deviceID = WAVE_MAPPER;

-

-	(void) dummyFile;

-

-	if ( waveOutGetNumDevs () == 0 )

-		return Box ( "No audio device present." );

-

-	outFormat.wFormatTag      = WAVE_FORMAT_PCM;

-	outFormat.wBitsPerSample  = BitsPerSample;

-	outFormat.nChannels       = Channels;

-	outFormat.nSamplesPerSec  = (unsigned long)(SampleFreq + 0.5);

-	outFormat.nBlockAlign     = (outFormat.wBitsPerSample + 7) / 8 * outFormat.nChannels;

-	outFormat.nAvgBytesPerSec = outFormat.nSamplesPerSec * outFormat.nBlockAlign;

-

-	switch ( waveOutOpen ( &dev, deviceID, &outFormat, (DWORD)wave_callback, 0, CALLBACK_FUNCTION ) )

-	{

-		case MMSYSERR_ALLOCATED:   return Box ( "Device is already open." );

-		case MMSYSERR_BADDEVICEID: return Box ( "The specified device is out of range." );

-		case MMSYSERR_NODRIVER:    return Box ( "There is no audio driver in this system." );

-		case MMSYSERR_NOMEM:       return Box ( "Unable to allocate sound memory." );

-		case WAVERR_BADFORMAT:     return Box ( "This audio format is not supported." );

-		case WAVERR_SYNC:          return Box ( "The device is synchronous." );

-		default:                   return Box ( "Unknown media error." );

-		case MMSYSERR_NOERROR:     break;

-	}

-

-	waveOutReset ( dev );

-	InitializeCriticalSection ( &cs );

-	SetPriorityClass ( GetCurrentProcess (), HIGH_PRIORITY_CLASS );

-	return 0;

-}

-

-

-int

-WIN_Play_Samples ( const void* data, size_t len )

-{

-	HGLOBAL    hg;

-	HGLOBAL    hg2;

-	LPWAVEHDR  wh;

-	void*      allocptr;

-

-	do {

-		while ( PlayedWaveHeadersCount > 0 )                // free used blocks ...

-			free_memory ();

-

-		if ( ScheduledBlocks < sizeof(PlayedWaveHeaders)/sizeof(*PlayedWaveHeaders) ) // wait for a free block ...

-			break;

-		Sleep (26);

-	} while (1);

-

-	if ( (hg2 = GlobalAlloc ( GMEM_MOVEABLE, len )) == NULL )   // allocate some memory for a copy of the buffer

-		return Box ( "GlobalAlloc failed." );

-

-	allocptr = GlobalLock (hg2);

-	CopyMemory ( allocptr, data, len );                         // Here we can call any modification output functions we want....

-

-	if ( (hg = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, sizeof (WAVEHDR))) == NULL ) // now make a header and WRITE IT!

-		return -1;

-

-	wh                   = GlobalLock (hg);

-	wh -> dwBufferLength = len;

-	wh -> lpData         = allocptr;

-

-	if ( waveOutPrepareHeader ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {

-		GlobalUnlock (hg);

-		GlobalFree   (hg);

-		return -1;

-	}

-

-	if ( waveOutWrite ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {

-		GlobalUnlock (hg);

-		GlobalFree   (hg);

-		return -1;

-	}

-

-	EnterCriticalSection ( &cs );

-	ScheduledBlocks++;

-	LeaveCriticalSection ( &cs );

-

-	return len;

-}

-

-

-int

-WIN_Audio_close ( void )

-{

-	if ( dev != NULL ) {

-

-		while ( ScheduledBlocks > 0 ) {

-			Sleep (ScheduledBlocks);

-			while ( PlayedWaveHeadersCount > 0 )         // free used blocks ...

-				free_memory ();

-		}

-

-		waveOutReset (dev);      // reset the device

-		waveOutClose (dev);      // close the device

-		dev = NULL;

-	}

-

-	DeleteCriticalSection ( &cs );

-	ScheduledBlocks = 0;

-	return 0;

-}

-

-#endif

-

-/* end of wave_out.c */

diff --git a/src/wave_out.h b/src/wave_out.h
deleted file mode 100644
index 0c467b1..0000000
--- a/src/wave_out.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (c) 2002, John Edwards

-

-   Redistribution and use in source and binary forms, with or without

-   modification, are permitted provided that the following conditions

-   are met:

-

-   - Redistributions of source code must retain the above copyright

-   notice, this list of conditions and the following disclaimer.

-

-   - Redistributions in binary form must reproduce the above copyright

-   notice, this list of conditions and the following disclaimer in the

-   documentation and/or other materials provided with the distribution.

-

-   - Neither the name of the Xiph.org Foundation nor the names of its

-   contributors may be used to endorse or promote products derived from

-   this software without specific prior written permission.

-

-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR

-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-*/

-

-//    WAVE_OUT.H - Necessary stuff for WIN_AUDIO

-

-#ifndef WAVE_OUT_H

-#define WAVE_OUT_H

-

-#include <stdio.h>

-#include <windows.h>

-#ifdef __MINGW32__

-#include <mmsystem.h>

-#endif

-

-#define VERSION_STRING "\n 0.7.0\n"

-

-#define Cdecl               __cdecl

-#define __attribute__(x)

-#define sleep(__sec)        Sleep ((__sec) * 1000)

-#define inline              __inline

-#define restrict

-

-//// constants /////////////////////////////////////////////////////

-

-#define CD_SAMPLE_FREQ         44.1e3

-#define SAMPLE_SIZE            16

-#define SAMPLE_SIZE_STRING     ""

-#define WINAUDIO_FD            ((FILE_T)-128)

-#define FILE_T                 FILE*

-#define INVALID_FILEDESC       NULL

-

-//// Simple types //////////////////////////////////////////////////

-

-typedef signed   int        Int;        // at least -32767...+32767, fast type

-typedef unsigned int        Uint;       // at least 0...65535, fast type

-typedef long double         Ldouble;    // most exact floating point format

-

-//// procedures/functions //////////////////////////////////////////

-// wave_out.c

-Int        Set_WIN_Params             ( FILE_T dummyFile , Ldouble SampleFreq, Uint BitsPerSample, Uint Channels);

-int        WIN_Play_Samples           ( const void* buff, size_t len );

-int        WIN_Audio_close            ( void );

-

-#endif /* WAVE_OUT_H */

diff --git a/win32/Makefile.am b/win32/Makefile.am
index 8cee7fb..0d808c8 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -3,6 +3,6 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake

 #AUTOMAKE_OPTIONS = no-dependencies

 

-SUBDIRS = libspeex speexenc speexdec VS2003 VS2005 VS2008

+SUBDIRS = libspeexdsp VS2003 VS2005 VS2008

 

-EXTRA_DIST = speex.iss config.h libspeex.def libspeexdsp.def

+EXTRA_DIST = speex.iss config.h libspeexdsp.def

diff --git a/win32/VS2003/Makefile.am b/win32/VS2003/Makefile.am
index 15479c3..69e914f 100644
--- a/win32/VS2003/Makefile.am
+++ b/win32/VS2003/Makefile.am
@@ -3,6 +3,6 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake

 #AUTOMAKE_OPTIONS = no-dependencies

 

-SUBDIRS = libspeex libspeexdsp speexenc speexdec tests

+SUBDIRS = libspeexdsp tests

 

-EXTRA_DIST = libspeex.sln

+EXTRA_DIST = libspeexdsp.sln

diff --git a/win32/VS2003/libspeex.sln b/win32/VS2003/libspeex.sln
deleted file mode 100644
index 4693b1a..0000000
--- a/win32/VS2003/libspeex.sln
+++ /dev/null
@@ -1,146 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libspeex\libspeex.vcproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexdec", "speexdec\speexdec.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexenc", "speexenc\speexenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdenoise", "tests\testdenoise.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}"

-	ProjectSection(ProjectDependencies) = postProject

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testecho", "tests\testecho.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}"

-	ProjectSection(ProjectDependencies) = postProject

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc", "tests\testenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_uwb", "tests\testenc_uwb.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_wb", "tests\testenc_wb.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testresample", "tests\testresample.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}"

-	ProjectSection(ProjectDependencies) = postProject

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libspeexdsp\libspeexdsp.vcproj", "{03207781-0D1C-4DB3-A71D-45C608F28DBD}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		Release = Release

-		Release_Dynamic_SSE = Release_Dynamic_SSE

-		Release_Static_SSE = Release_Static_SSE

-	EndGlobalSection

-	GlobalSection(ProjectDependencies) = postSolution

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug.ActiveCfg = Debug|Win32

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug.Build.0 = Debug|Win32

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release.ActiveCfg = Release|Win32

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release.Build.0 = Release|Win32

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE.ActiveCfg = Release_Dynamic_SSE|Win32

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE.Build.0 = Release_Dynamic_SSE|Win32

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE.ActiveCfg = Release_Static_SSE|Win32

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE.Build.0 = Release_Static_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.ActiveCfg = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.Build.0 = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.ActiveCfg = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.Build.0 = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.ActiveCfg = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.Build.0 = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.ActiveCfg = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.Build.0 = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug.ActiveCfg = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug.Build.0 = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release.ActiveCfg = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release.Build.0 = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug.ActiveCfg = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug.Build.0 = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release.ActiveCfg = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release.Build.0 = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug.ActiveCfg = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug.Build.0 = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release.ActiveCfg = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release.Build.0 = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug.ActiveCfg = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug.Build.0 = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release.ActiveCfg = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release.Build.0 = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug.ActiveCfg = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug.Build.0 = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release.ActiveCfg = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release.Build.0 = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug.ActiveCfg = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug.Build.0 = Debug|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release.ActiveCfg = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release.Build.0 = Release|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32

-		{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE.Build.0 = Release_SSE|Win32

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug.ActiveCfg = Debug|Win32

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug.Build.0 = Debug|Win32

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release.ActiveCfg = Release|Win32

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release.Build.0 = Release|Win32

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE.ActiveCfg = Release_Dynamic_SSE|Win32

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE.Build.0 = Release_Dynamic_SSE|Win32

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE.ActiveCfg = Release_Static_SSE|Win32

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE.Build.0 = Release_Static_SSE|Win32

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/win32/VS2003/libspeex/Makefile.am b/win32/VS2003/libspeex/Makefile.am
deleted file mode 100644
index 5de466c..0000000
--- a/win32/VS2003/libspeex/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = libspeex.vcproj

-

-

diff --git a/win32/VS2003/libspeex/libspeex.vcproj b/win32/VS2003/libspeex/libspeex.vcproj
deleted file mode 100644
index 1bf043a..0000000
--- a/win32/VS2003/libspeex/libspeex.vcproj
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="libspeex"

-	ProjectGUID="{E972C52F-9E85-4D65-B19C-031E511E9DB4}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="1"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/libspeex.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

-			ConfigurationType="4"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				GlobalOptimizations="TRUE"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

-				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="TRUE"

-				ExceptionHandling="FALSE"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="FALSE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/libspeex.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release_Static_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				GlobalOptimizations="TRUE"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

-				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="TRUE"

-				ExceptionHandling="FALSE"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="FALSE"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="../../../lib/libspeex.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release_Dynamic_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				GlobalOptimizations="TRUE"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

-				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="3"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

-				StringPooling="TRUE"

-				ExceptionHandling="FALSE"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="FALSE"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="../../../bin/libspeex.dll"

-				ModuleDefinitionFile="..\..\libspeex.def"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				ImportLibrary="../../../lib/libspeex.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\libspeex\bits.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\cb_search.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_10_16_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_10_32_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_20_32_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_5_256_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_5_64_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_8_128_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\gain_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\gain_table_lbr.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\hexc_10_32_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\hexc_table.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\high_lsp_tables.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lpc.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp_tables_nb.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes_wb.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\nb_celp.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\quant_lsp.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\sb_celp.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex_callbacks.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex_header.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\stereo.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vbr.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vq.c">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\window.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<File

-				RelativePath="..\..\..\libspeex\arch.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\cb_search.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\cb_search_sse.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters_sse.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\fixed_debug.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\fixed_generic.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lpc.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp_sse.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\math_approx.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\nb_celp.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\os_support.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\quant_lsp.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\sb_celp.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\stack_alloc.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vbr.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vq.h">

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vq_sse.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Public Header Files"

-			Filter="">

-			<File

-				RelativePath="..\..\..\include\speex\speex.h">

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_bits.h">

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_callbacks.h">

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_header.h">

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_stereo.h">

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_types.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-		<File

-			RelativePath="..\..\config.h">

-		</File>

-		<File

-			RelativePath="..\..\libspeex.def">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/VS2003/speexdec/Makefile.am b/win32/VS2003/speexdec/Makefile.am
deleted file mode 100644
index 93b93c1..0000000
--- a/win32/VS2003/speexdec/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = speexdec.vcproj

-

-

diff --git a/win32/VS2003/speexdec/speexdec.vcproj b/win32/VS2003/speexdec/speexdec.vcproj
deleted file mode 100644
index d950422..0000000
--- a/win32/VS2003/speexdec/speexdec.vcproj
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="speexdec"

-	ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="1"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="../../../bin/speexdec.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\libogg\lib"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/speexenc.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				GlobalOptimizations="TRUE"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

-				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="TRUE"

-				ExceptionHandling="FALSE"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="FALSE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="1"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="../../../bin/speexdec.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\libogg\lib"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				GlobalOptimizations="TRUE"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

-				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="TRUE"

-				ExceptionHandling="FALSE"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="FALSE"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="1"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="../../../bin/speexdec.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\libogg\lib"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\src\getopt.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\getopt1.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\speexdec.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<File

-				RelativePath="..\..\..\src\getopt_win.h">

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.h">

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/VS2003/speexenc/Makefile.am b/win32/VS2003/speexenc/Makefile.am
deleted file mode 100644
index 49e32dc..0000000
--- a/win32/VS2003/speexenc/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = speexenc.vcproj

-

-

diff --git a/win32/VS2003/speexenc/speexenc.vcproj b/win32/VS2003/speexenc/speexenc.vcproj
deleted file mode 100644
index 68ef494..0000000
--- a/win32/VS2003/speexenc/speexenc.vcproj
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="speexenc"

-	ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="Debug"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"

-				CompileAs="1"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="../../../bin/speexenc.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="..\..\..\..\libogg\lib"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/speexenc.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="Release"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				GlobalOptimizations="TRUE"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

-				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="TRUE"

-				ExceptionHandling="FALSE"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="FALSE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="1"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="../../../bin/speexenc.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\libogg\lib"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				GlobalOptimizations="TRUE"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="TRUE"

-				FavorSizeOrSpeed="1"

-				OptimizeForProcessor="2"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="TRUE"

-				ExceptionHandling="FALSE"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="FALSE"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"

-				CompileAs="1"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="../../../bin/speexenc.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="..\..\..\..\libogg\lib"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

-			<File

-				RelativePath="..\..\..\src\getopt.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\getopt1.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\speexenc.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.c">

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.c">

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

-			<File

-				RelativePath="..\..\..\src\getopt_win.h">

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.h">

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.h">

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.h">

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/VS2005/Makefile.am b/win32/VS2005/Makefile.am
index 15479c3..69e914f 100644
--- a/win32/VS2005/Makefile.am
+++ b/win32/VS2005/Makefile.am
@@ -3,6 +3,6 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake

 #AUTOMAKE_OPTIONS = no-dependencies

 

-SUBDIRS = libspeex libspeexdsp speexenc speexdec tests

+SUBDIRS = libspeexdsp tests

 

-EXTRA_DIST = libspeex.sln

+EXTRA_DIST = libspeexdsp.sln

diff --git a/win32/VS2005/libspeex/libspeex.vcproj b/win32/VS2005/libspeex/libspeex.vcproj
deleted file mode 100644
index 79913d0..0000000
--- a/win32/VS2005/libspeex/libspeex.vcproj
+++ /dev/null
@@ -1,1732 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="libspeex"

-	ProjectGUID="{E972C52F-9E85-4D65-B19C-031E511E9DB4}"

-	RootNamespace="libspeex"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Debug"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Release"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE2|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_Dynamic|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				FloatingPointModel="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="..\..\..\bin\libspeex.dll"

-				ModuleDefinitionFile="..\..\libspeex.def"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				ImportLibrary="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug_RTL_dll|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_RTL_dll|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug_WM5_PPC_ARM|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_WM5_PPC_ARM|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_Dynamic_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="1"

-				FloatingPointModel="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="..\..\..\bin\libspeex.dll"

-				ModuleDefinitionFile="..\..\libspeex.def"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				ImportLibrary="..\..\..\lib\libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				ModuleDefinitionFile="libspeex.def"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="0"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;FIXED_POINT;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"

-				MinimalRebuild="true"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="0"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;FIXED_POINT;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="0"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\libspeex\bits.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\cb_search.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_10_16_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_10_32_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_20_32_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_5_256_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_5_64_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_8_128_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\gain_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\gain_table_lbr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\hexc_10_32_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\hexc_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\high_lsp_tables.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lpc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp_tables_nb.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes_wb.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\nb_celp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\quant_lsp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\sb_celp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex_callbacks.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex_header.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\stereo.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vbr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vq.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\window.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\..\libspeex\arch.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\cb_search.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\cb_search_sse.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters_sse.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\fixed_debug.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\fixed_generic.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lpc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp_sse.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\math_approx.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\nb_celp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\os_support.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\quant_lsp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\sb_celp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\stack_alloc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vbr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vq.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vq_sse.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-		<Filter

-			Name="Public Header Files"

-			Filter="h"

-			>

-			<File

-				RelativePath="..\..\..\include\speex\speex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_bits.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_callbacks.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_header.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_stereo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_types.h"

-				>

-			</File>

-		</Filter>

-		<File

-			RelativePath="..\..\config.h"

-			>

-		</File>

-		<File

-			RelativePath="..\..\libspeex.def"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/VS2005/libspeex.sln b/win32/VS2005/libspeexdsp.sln
index 0fc8b63..b0468b7 100644
--- a/win32/VS2005/libspeex.sln
+++ b/win32/VS2005/libspeexdsp.sln
@@ -1,21 +1,8 @@
 

 Microsoft Visual Studio Solution File, Format Version 9.00

 # Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libspeex\libspeex.vcproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libspeexdsp\libspeexdsp.vcproj", "{E42FDC95-7243-4219-9EA4-ACCE4AB97197}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexdec", "speexdec\speexdec.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexenc", "speexenc\speexenc.vcproj", "{CD6043D1-D5E7-46D0-854F-00BB1BC308FC}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-		{E42FDC95-7243-4219-9EA4-ACCE4AB97197} = {E42FDC95-7243-4219-9EA4-ACCE4AB97197}

-	EndProjectSection

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdenoise", "tests\testdenoise.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}"

 	ProjectSection(ProjectDependencies) = postProject

 		{E42FDC95-7243-4219-9EA4-ACCE4AB97197} = {E42FDC95-7243-4219-9EA4-ACCE4AB97197}

@@ -26,21 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testecho", "tests\testecho.
 		{E42FDC95-7243-4219-9EA4-ACCE4AB97197} = {E42FDC95-7243-4219-9EA4-ACCE4AB97197}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc", "tests\testenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_uwb", "tests\testenc_uwb.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_wb", "tests\testenc_wb.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testresample", "tests\testresample.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}"

 	ProjectSection(ProjectDependencies) = postProject

 		{E42FDC95-7243-4219-9EA4-ACCE4AB97197} = {E42FDC95-7243-4219-9EA4-ACCE4AB97197}

diff --git a/win32/VS2005/speexdec/Makefile.am b/win32/VS2005/speexdec/Makefile.am
deleted file mode 100644
index 93b93c1..0000000
--- a/win32/VS2005/speexdec/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = speexdec.vcproj

-

-

diff --git a/win32/VS2005/speexdec/speexdec.vcproj b/win32/VS2005/speexdec/speexdec.vcproj
deleted file mode 100644
index e5d4203..0000000
--- a/win32/VS2005/speexdec/speexdec.vcproj
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="speexdec"

-	ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"

-	RootNamespace="speexdec"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="..\..\..\bin\speexdec.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(ConfigurationName)&quot;"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/speexenc.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="..\..\..\bin\speexdec.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(ConfigurationName)&quot;"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="..\..\..\bin\speexdec.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(ConfigurationName)&quot;"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\src\getopt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\getopt1.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\speexdec.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\..\src\getopt_win.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/VS2005/speexenc/Makefile.am b/win32/VS2005/speexenc/Makefile.am
deleted file mode 100644
index 49e32dc..0000000
--- a/win32/VS2005/speexenc/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = speexenc.vcproj

-

-

diff --git a/win32/VS2005/speexenc/speexenc.vcproj b/win32/VS2005/speexenc/speexenc.vcproj
deleted file mode 100644
index b941317..0000000
--- a/win32/VS2005/speexenc/speexenc.vcproj
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="speexenc"

-	ProjectGUID="{CD6043D1-D5E7-46D0-854F-00BB1BC308FC}"

-	RootNamespace="speexenc"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="..\..\..\bin\speexenc.exe"

-				LinkIncremental="2"

-				AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(ConfigurationName)&quot;"

-				IgnoreDefaultLibraryNames="LIBCMTD.lib"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/speexenc.pdb"

-				SubSystem="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="..\..\..\bin\speexenc.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(ConfigurationName)&quot;"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib libogg.lib"

-				OutputFile="..\..\..\bin\speexenc.exe"

-				LinkIncremental="1"

-				AdditionalLibraryDirectories="&quot;..\..\..\..\libogg\win32\VS2005\$(ConfigurationName)&quot;"

-				IgnoreDefaultLibraryNames=""

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\src\getopt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\getopt1.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\speexenc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\..\src\getopt_win.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/VS2008/Makefile.am b/win32/VS2008/Makefile.am
index 15479c3..69e914f 100644
--- a/win32/VS2008/Makefile.am
+++ b/win32/VS2008/Makefile.am
@@ -3,6 +3,6 @@
 # Disable automatic dependency tracking if using other tools than gcc and gmake

 #AUTOMAKE_OPTIONS = no-dependencies

 

-SUBDIRS = libspeex libspeexdsp speexenc speexdec tests

+SUBDIRS = libspeexdsp tests

 

-EXTRA_DIST = libspeex.sln

+EXTRA_DIST = libspeexdsp.sln

diff --git a/win32/VS2008/libspeex/Makefile.am b/win32/VS2008/libspeex/Makefile.am
deleted file mode 100644
index 5de466c..0000000
--- a/win32/VS2008/libspeex/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = libspeex.vcproj

-

-

diff --git a/win32/VS2008/libspeex/libspeex.vcproj b/win32/VS2008/libspeex/libspeex.vcproj
deleted file mode 100644
index ef5a36f..0000000
--- a/win32/VS2008/libspeex/libspeex.vcproj
+++ /dev/null
@@ -1,1704 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="libspeex"

-	ProjectGUID="{E972C52F-9E85-4D65-B19C-031E511E9DB4}"

-	RootNamespace="libspeex"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Debug"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Release"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE2|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_Dynamic|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				ModuleDefinitionFile="libspeex.def"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="2"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				ModuleDefinitionFile="libspeex.def"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="0"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug_RTL_dll|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_RTL_dll|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug_WM5_PPC_ARM|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;FIXED_POINT;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"

-				MinimalRebuild="true"

-				RuntimeLibrary="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="0"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_WM5_PPC_ARM|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="3"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"

-			OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"

-			ConfigurationType="4"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="1"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				ExecutionBucket="7"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;FIXED_POINT;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="2"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="4"

-				DebugInformationFormat="0"

-				CompileAs="1"

-				DisableSpecificWarnings="4244;4305;4311;4100;4127"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/libspeex.lib"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCCodeSignTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-			<DeploymentTool

-				ForceDirty="-1"

-				RemoteDirectory=""

-				RegisterOutput="0"

-				AdditionalFiles=""

-			/>

-			<DebuggerTool

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\libspeex\bits.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\cb_search.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_10_16_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_10_32_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_20_32_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_5_256_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_5_64_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\exc_8_128_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\fftwrap.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filterbank.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\gain_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\gain_table_lbr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\hexc_10_32_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\hexc_table.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\high_lsp_tables.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\jitter.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\kiss_fft.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\kiss_fftr.c"

-				>

-			</File>

-			<File

-				RelativePath=".\libspeex.def"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lpc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp_tables_nb.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\mdf.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes_wb.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\nb_celp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\preprocess.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\quant_lsp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\sb_celp.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\smallft.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex_callbacks.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\speex_header.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\stereo.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vbr.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vq.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\window.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\..\libspeex\cb_search.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\config.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\fftwrap.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\filters_sse.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\kiss_fft.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\kiss_fftr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lpc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\lsp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\ltp_sse.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\math_approx.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\misc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\modes.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\nb_celp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\pseudofloat.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\quant_lsp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\sb_celp.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_bits.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_callbacks.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_echo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_header.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_jitter.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_noglobals.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_preprocess.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_stereo.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\include\speex\speex_types.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\stack_alloc.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vbr.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\libspeex\vq.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-		<File

-			RelativePath=".\ReadMe.txt"

-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/VS2008/libspeex.sln b/win32/VS2008/libspeexdsp.sln
index b46f42c..b345991 100644
--- a/win32/VS2008/libspeex.sln
+++ b/win32/VS2008/libspeexdsp.sln
@@ -1,18 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 10.00

 # Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libspeex\libspeex.vcproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexdec", "speexdec\speexdec.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "speexenc", "speexenc\speexenc.vcproj", "{CD6043D1-D5E7-46D0-854F-00BB1BC308FC}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}

-	EndProjectSection

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdenoise", "tests\testdenoise.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}"

 	ProjectSection(ProjectDependencies) = postProject

 		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}

@@ -23,21 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testecho", "tests\testecho.
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc", "tests\testenc.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_uwb", "tests\testenc_uwb.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testenc_wb", "tests\testenc_wb.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}"

-	ProjectSection(ProjectDependencies) = postProject

-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}

-	EndProjectSection

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testresample", "tests\testresample.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}"

 	ProjectSection(ProjectDependencies) = postProject

 		{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD}

diff --git a/win32/VS2008/speexdec/Makefile.am b/win32/VS2008/speexdec/Makefile.am
deleted file mode 100644
index 93b93c1..0000000
--- a/win32/VS2008/speexdec/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = speexdec.vcproj

-

-

diff --git a/win32/VS2008/speexdec/speexdec.vcproj b/win32/VS2008/speexdec/speexdec.vcproj
deleted file mode 100644
index ead9e7e..0000000
--- a/win32/VS2008/speexdec/speexdec.vcproj
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="speexdec"

-	ProjectGUID="{961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}"

-	RootNamespace="speexdec"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib"

-				OutputFile="$(OutDir)/speexdec.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/speexenc.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib"

-				OutputFile="$(OutDir)/speexdec.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib"

-				OutputFile="$(OutDir)/speexdec.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE2|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib"

-				OutputFile="$(OutDir)/speexdec.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\src\getopt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\getopt1.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\speexdec.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\..\src\getopt_win.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/VS2008/speexenc/Makefile.am b/win32/VS2008/speexenc/Makefile.am
deleted file mode 100644
index 49e32dc..0000000
--- a/win32/VS2008/speexenc/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = speexenc.vcproj

-

-

diff --git a/win32/VS2008/speexenc/speexenc.vcproj b/win32/VS2008/speexenc/speexenc.vcproj
deleted file mode 100644
index 2797bf9..0000000
--- a/win32/VS2008/speexenc/speexenc.vcproj
+++ /dev/null
@@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9.00"

-	Name="speexenc"

-	ProjectGUID="{CD6043D1-D5E7-46D0-854F-00BB1BC308FC}"

-	RootNamespace="speexenc"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Debug"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib"

-				OutputFile="$(OutDir)/speexenc.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="true"

-				ProgramDatabaseFile="$(OutDir)/speexenc.pdb"

-				SubSystem="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

-			IntermediateDirectory="Release"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib"

-				OutputFile="$(OutDir)/speexenc.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib"

-				OutputFile="$(OutDir)/speexenc.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release_SSE2|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="1"

-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

-			CharacterSet="2"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="3"

-				InlineFunctionExpansion="2"

-				EnableIntrinsicFunctions="true"

-				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\..\..\include;..\..\..\..\libogg\include;..\..\..\libspeex;..\.."

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"

-				StringPooling="true"

-				ExceptionHandling="0"

-				RuntimeLibrary="0"

-				BufferSecurityCheck="false"

-				EnableEnhancedInstructionSet="2"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-				CompileAs="1"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLinkerTool"

-				AdditionalDependencies="winmm.lib"

-				OutputFile="$(OutDir)/speexenc.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="true"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				OptimizeForWindows98="1"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="1"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCManifestTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCAppVerifierTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath="..\..\..\src\getopt.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\getopt1.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\speexenc.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.c"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.c"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath="..\..\..\src\getopt_win.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\skeleton.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wav_io.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\src\wave_out.h"

-				>

-			</File>

-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/win32/libspeex.def b/win32/libspeex.def
deleted file mode 100644
index e5f815f..0000000
--- a/win32/libspeex.def
+++ /dev/null
@@ -1,75 +0,0 @@
-LIBRARY libspeex
-EXPORTS
-
-
-;
-;	speex.h
-;
-speex_encoder_init
-speex_encoder_destroy
-speex_encode
-speex_encode_int
-speex_encoder_ctl
-speex_decoder_init
-speex_decoder_destroy
-speex_decode
-speex_decode_int
-speex_decoder_ctl
-speex_mode_query
-speex_lib_ctl
-speex_lib_get_mode
-
-;
-;	speex_bits.h
-;
-speex_bits_init
-speex_bits_init_buffer
-speex_bits_set_bit_buffer
-speex_bits_destroy
-speex_bits_reset
-speex_bits_rewind
-speex_bits_read_from
-speex_bits_read_whole_bytes
-speex_bits_write
-speex_bits_write_whole_bytes
-speex_bits_pack
-speex_bits_unpack_signed
-speex_bits_unpack_unsigned
-speex_bits_nbytes
-speex_bits_peek_unsigned
-speex_bits_peek
-speex_bits_advance
-speex_bits_remaining
-speex_bits_insert_terminator
-
-;
-;	speex_callbacks.h
-;
-speex_inband_handler
-speex_std_mode_request_handler
-speex_std_high_mode_request_handler
-speex_std_char_handler
-speex_default_user_handler
-speex_std_low_mode_request_handler
-speex_std_vbr_request_handler
-speex_std_enh_request_handler
-speex_std_vbr_quality_request_handler
-
-;
-;	speex_header.h
-;
-speex_init_header
-speex_header_to_packet
-speex_packet_to_header
-
-;
-;	speex_stereo.h
-;
-speex_stereo_state_init
-speex_stereo_state_reset
-speex_stereo_state_destroy
-speex_encode_stereo
-speex_encode_stereo_int
-speex_decode_stereo
-speex_decode_stereo_int
-speex_std_stereo_request_handler
diff --git a/win32/libspeex/Makefile.am b/win32/libspeex/Makefile.am
deleted file mode 100644
index 9cf4e85..0000000
--- a/win32/libspeex/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-
-
-# Disable automatic dependency tracking if using other tools than gcc and gmake
-#AUTOMAKE_OPTIONS = no-dependencies
-
-EXTRA_DIST = libspeex.dsw libspeex.dsp libspeex_dynamic.dsp libspeexdsp.dsp libspeexdsp_dynamic.dsp
diff --git a/win32/libspeex/libspeex.dsp b/win32/libspeex/libspeex.dsp
deleted file mode 100644
index 9cfa169..0000000
--- a/win32/libspeex/libspeex.dsp
+++ /dev/null
@@ -1,332 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libspeex" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=libspeex - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libspeex.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libspeex.mak" CFG="libspeex - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libspeex - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "libspeex - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "Perforce Project"

-# PROP Scc_LocalPath "..\.."

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libspeex - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /GX- /O2 /Ob2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_LIB" /D "HAVE_CONFIG_H" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x809 /d "NDEBUG"

-# ADD RSC /l 0x809 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\..\lib\libspeex.lib"

-

-!ELSEIF  "$(CFG)" == "libspeex - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-F90=df.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /GX- /Zi /Od /Ob2 /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_LIB" /D "HAVE_CONFIG_H" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x809 /d "_DEBUG"

-# ADD RSC /l 0x809 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\..\lib\libspeex.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libspeex - Win32 Release"

-# Name "libspeex - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\..\libspeex\bits.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\cb_search.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_10_16_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_10_32_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_20_32_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_5_256_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_5_64_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_8_128_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\filters.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\gain_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\gain_table_lbr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\hexc_10_32_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\hexc_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\high_lsp_tables.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lpc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lsp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lsp_tables_nb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\ltp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\modes.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\modes_wb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\nb_celp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\quant_lsp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\sb_celp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\speex.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\speex_callbacks.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\speex_header.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\stereo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vbr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vq.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\window.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\..\libspeex\arch.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\cb_search.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\cb_search_sse.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\filters.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\filters_sse.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\fixed_debug.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\fixed_generic.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lpc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lsp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\ltp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\ltp_sse.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\math_approx.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\modes.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\nb_celp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\os_support.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\quant_lsp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\sb_celp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\stack_alloc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vbr.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vq.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vq_sse.h

-# End Source File

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter "*.h"

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_bits.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_callbacks.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_header.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_stereo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_types.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=..\config.h

-# End Source File

-# End Target

-# End Project

diff --git a/win32/libspeex/libspeex_dynamic.dsp b/win32/libspeex/libspeex_dynamic.dsp
deleted file mode 100644
index cd1945c..0000000
--- a/win32/libspeex/libspeex_dynamic.dsp
+++ /dev/null
@@ -1,341 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libspeex_dynamic" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=libspeex_dynamic - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libspeex_dynamic.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libspeex_dynamic.mak" CFG="libspeex_dynamic - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libspeex_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libspeex_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libspeex_dynamic - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "libspeex_dynamic___Win32_Release"

-# PROP BASE Intermediate_Dir "libspeex_dynamic___Win32_Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Dynamic_Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSPEEX_DYNAMIC_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\bin\libspeex.dll" /implib:"..\..\lib\libspeex.lib"

-

-!ELSEIF  "$(CFG)" == "libspeex_dynamic - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "libspeex_dynamic___Win32_Debug"

-# PROP BASE Intermediate_Dir "libspeex_dynamic___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Dynamic_Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSPEEX_DYNAMIC_EXPORTS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /FD /GZ /c

-# SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\bin\libspeex.dll" /implib:"..\..\lib\libspeex.lib" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libspeex_dynamic - Win32 Release"

-# Name "libspeex_dynamic - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\..\libspeex\bits.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\cb_search.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_10_16_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_10_32_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_20_32_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_5_256_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_5_64_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\exc_8_128_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\filters.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\gain_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\gain_table_lbr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\hexc_10_32_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\hexc_table.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\high_lsp_tables.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lpc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lsp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lsp_tables_nb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\ltp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\modes.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\modes_wb.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\nb_celp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\quant_lsp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\sb_celp.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\speex.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\speex_callbacks.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\speex_header.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\stereo.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vbr.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vq.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\window.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\..\libspeex\arch.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\cb_search.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\cb_search_sse.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\filters.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\filters_sse.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\fixed_debug.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\fixed_generic.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lpc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\lsp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\ltp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\ltp_sse.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\math_approx.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\modes.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\nb_celp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\os_support.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\quant_lsp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\sb_celp.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\stack_alloc.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vbr.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vq.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\libspeex\vq_sse.h

-# End Source File

-# End Group

-# Begin Group "Public Header Files"

-

-# PROP Default_Filter "*.h"

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_bits.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_callbacks.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_header.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_stereo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\speex\speex_types.h

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=..\config.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\libspeex.def

-# End Source File

-# End Target

-# End Project

diff --git a/win32/VS2005/libspeex/Makefile.am b/win32/libspeexdsp/Makefile.am
index 5de466c..b35b468 100644
--- a/win32/VS2005/libspeex/Makefile.am
+++ b/win32/libspeexdsp/Makefile.am
@@ -1,8 +1,6 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-

-

-# Disable automatic dependency tracking if using other tools than gcc and gmake

-#AUTOMAKE_OPTIONS = no-dependencies

-

-EXTRA_DIST = libspeex.vcproj

-

-

+## Process this file with automake to produce Makefile.in. -*-Makefile-*-
+
+# Disable automatic dependency tracking if using other tools than gcc and gmake
+#AUTOMAKE_OPTIONS = no-dependencies
+
+EXTRA_DIST = libspeexdsp.dsw libspeexdsp.dsp libspeexdsp_dynamic.dsp
diff --git a/win32/libspeex/libspeexdsp.dsp b/win32/libspeexdsp/libspeexdsp.dsp
index 6accbd8..6accbd8 100755
--- a/win32/libspeex/libspeexdsp.dsp
+++ b/win32/libspeexdsp/libspeexdsp.dsp
diff --git a/win32/libspeex/libspeex.dsw b/win32/libspeexdsp/libspeexdsp.dsw
index ff24f2a..33b1d57 100644
--- a/win32/libspeex/libspeex.dsw
+++ b/win32/libspeexdsp/libspeexdsp.dsw
@@ -3,30 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "libspeex"=.\libspeex.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "libspeex_dynamic"=.\libspeex_dynamic.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "libspeexdsp"=.\libspeexdsp.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/win32/libspeex/libspeexdsp_dynamic.dsp b/win32/libspeexdsp/libspeexdsp_dynamic.dsp
index ac40b38..ac40b38 100755
--- a/win32/libspeex/libspeexdsp_dynamic.dsp
+++ b/win32/libspeexdsp/libspeexdsp_dynamic.dsp
diff --git a/win32/speexdec/Makefile.am b/win32/speexdec/Makefile.am
deleted file mode 100644
index 7c47922..0000000
--- a/win32/speexdec/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-
-
-# Disable automatic dependency tracking if using other tools than gcc and gmake
-#AUTOMAKE_OPTIONS = no-dependencies
-
-EXTRA_DIST = speexdec.dsp  speexdec.dsw
diff --git a/win32/speexdec/speexdec.dsp b/win32/speexdec/speexdec.dsp
deleted file mode 100644
index 10b732d..0000000
--- a/win32/speexdec/speexdec.dsp
+++ /dev/null
@@ -1,130 +0,0 @@
-# Microsoft Developer Studio Project File - Name="speexdec" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=speexdec - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "speexdec.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "speexdec.mak" CFG="speexdec - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "speexdec - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "speexdec - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "speexdec - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /GX /O2 /I "../../../libogg/include" /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c

-# ADD BASE RSC /l 0x809 /d "NDEBUG"

-# ADD RSC /l 0x809 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMT.lib" /out:"../../bin/speexdec.exe"

-

-!ELSEIF  "$(CFG)" == "speexdec - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../libogg/include" /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c

-# ADD BASE RSC /l 0x809 /d "_DEBUG"

-# ADD RSC /l 0x809 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/speexdec.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "speexdec - Win32 Release"

-# Name "speexdec - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\..\src\getopt.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\getopt1.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\speexdec.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\wav_io.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\wave_out.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\..\src\getopt_win.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\wav_io.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\wave_out.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/win32/speexdec/speexdec.dsw b/win32/speexdec/speexdec.dsw
deleted file mode 100644
index a7de362..0000000
--- a/win32/speexdec/speexdec.dsw
+++ /dev/null
@@ -1,59 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "libspeex"=..\libspeex\libspeex.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ogg_static"="..\..\..\libogg\win32\ogg_static.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "speexdec"=.\speexdec.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libspeex

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ogg_static

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/win32/speexenc/Makefile.am b/win32/speexenc/Makefile.am
deleted file mode 100644
index c15584f..0000000
--- a/win32/speexenc/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-
-
-# Disable automatic dependency tracking if using other tools than gcc and gmake
-#AUTOMAKE_OPTIONS = no-dependencies
-
-EXTRA_DIST = speexenc.dsp  speexenc.dsw
diff --git a/win32/speexenc/speexenc.dsp b/win32/speexenc/speexenc.dsp
deleted file mode 100644
index eeae18e..0000000
--- a/win32/speexenc/speexenc.dsp
+++ /dev/null
@@ -1,130 +0,0 @@
-# Microsoft Developer Studio Project File - Name="speexenc" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=speexenc - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "speexenc.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "speexenc.mak" CFG="speexenc - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "speexenc - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "speexenc - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "speexenc - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /GX /Ox /Ot /Og /Oi /Ob2 /I "../" /I "../../include" /I "../../../libogg/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x809 /d "NDEBUG"

-# ADD RSC /l 0x809 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"LIBCMT.lib"  /out:"../../bin/speexenc.exe"

-

-!ELSEIF  "$(CFG)" == "speexenc - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../include" /I "../../../libogg/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD BASE RSC /l 0x809 /d "_DEBUG"

-# ADD RSC /l 0x809 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/speexenc.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "speexenc - Win32 Release"

-# Name "speexenc - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\..\src\getopt.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\getopt1.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\skeleton.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\speexenc.c

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\wav_io.c

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=..\..\src\getopt_win.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\skeleton.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\src\wav_io.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/win32/speexenc/speexenc.dsw b/win32/speexenc/speexenc.dsw
deleted file mode 100644
index d1e77b8..0000000
--- a/win32/speexenc/speexenc.dsw
+++ /dev/null
@@ -1,74 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "libspeex"=..\libspeex\libspeex.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "libspeexdsp"=..\libspeex\libspeexdsp.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ogg_static"=..\..\..\libogg\win32\ogg_static.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "speexenc"=.\speexenc.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name libspeex

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ogg_static

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name libspeexdsp

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-