From: <jpg...@us...> - 2008-02-29 17:16:51
|
Revision: 1357 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1357&view=rev Author: jpgrayson Date: 2008-02-29 09:16:50 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Remove all references to deprecated and meaningless SPEEX_PREPROCESS. Modified Paths: -------------- trunk/configure.ac trunk/contrib/macosx/Prefixes.h trunk/contrib/tcl/Prefixes.h trunk/contrib/win/vs2003/iaxclient_dll.vcproj trunk/contrib/win/vs2003/iaxclient_lib.vcproj trunk/simpleclient/vtestcall/vtestcall.vcproj Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-26 19:43:03 UTC (rev 1356) +++ trunk/configure.ac 2008-02-29 17:16:50 UTC (rev 1357) @@ -83,11 +83,6 @@ enable_debug_iax2=$enableval, enable_debug_iax2="no") -AC_ARG_ENABLE(speex_preprocess, - [AS_HELP_STRING([--disable-speex-preprocess], - [Turn off speex preprocessing])],, - [enable_speex_preprocess="yes"]) - AC_ARG_WITH(echo-can, [AS_HELP_STRING([--with-echo-can], [use echo can (span, speex or mec2) [default=speex]])], @@ -364,10 +359,6 @@ CXXFLAGS="$save_CXXFLAGS" dnl End wx xrc check -if test x$enable_speex_preprocess = xyes; then - AC_DEFINE(SPEEX_PREPROCESS, 1, [Speex preprocess]) -fi - AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan) if test x$use_echo_can = xspan; then AC_DEFINE(SPAN_EC, 1, [Span echo can]) Modified: trunk/contrib/macosx/Prefixes.h =================================================================== --- trunk/contrib/macosx/Prefixes.h 2008-02-26 19:43:03 UTC (rev 1356) +++ trunk/contrib/macosx/Prefixes.h 2008-02-29 17:16:50 UTC (rev 1357) @@ -3,7 +3,6 @@ #define LIBIAX //#define CODEC_ILBC 0 -#define SPEEX_PREPROCESS 1 //#define SPAN_EC 0 #define SPEEX_EC 1 //#define MEC2_EC 0 Modified: trunk/contrib/tcl/Prefixes.h =================================================================== --- trunk/contrib/tcl/Prefixes.h 2008-02-26 19:43:03 UTC (rev 1356) +++ trunk/contrib/tcl/Prefixes.h 2008-02-29 17:16:50 UTC (rev 1357) @@ -5,7 +5,6 @@ //#define CODEC_ILBC 0 -#define SPEEX_PREPROCESS 1 //#define SPAN_EC 0 #define SPEEX_EC 1 //#define MEC2_EC 0 Modified: trunk/contrib/win/vs2003/iaxclient_dll.vcproj =================================================================== --- trunk/contrib/win/vs2003/iaxclient_dll.vcproj 2008-02-26 19:43:03 UTC (rev 1356) +++ trunk/contrib/win/vs2003/iaxclient_dll.vcproj 2008-02-29 17:16:50 UTC (rev 1357) @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..,..\..\gsm\inc,..\..\portaudio\include,..\..\portaudio\src\common,..\..\portaudio\pablio,..\..\portmixer\px_common,..\..\libspeex\include,..\..\libiax2\src,..\..\wince" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_USRDLL;BUILDING_DLL;PA_NO_DS;PA_NO_ASIO;SPEEX_PREPROCESS=1;NEWJB;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;inline=__inline;strncasecmp=_strnicmp;vsnprintf=_vsnprintf" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WINDLL;_USRDLL;BUILDING_DLL;PA_NO_DS;PA_NO_ASIO;NEWJB;LIBIAX;SPEEX_EC=1;_CRT_SECURE_NO_DEPRECATE;inline=__inline;strncasecmp=_strnicmp;vsnprintf=_vsnprintf" MinimalRebuild="FALSE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -99,7 +99,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="..\..,..\..\gsm\inc,..\..\portaudio\include,..\..\portaudio\src\common,..\..\portaudio\pablio,..\..\portmixer\px_common,..\..\libspeex\include,..\..\libiax2\src,..\..\wince" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_USRDLL;BUILDING_DLL;PA_NO_DS;PA_NO_ASIO;SPEEX_PREPROCESS=1;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WINDLL;_USRDLL;BUILDING_DLL;PA_NO_DS;PA_NO_ASIO;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf" StringPooling="TRUE" RuntimeLibrary="2" RuntimeTypeInfo="FALSE" Modified: trunk/contrib/win/vs2003/iaxclient_lib.vcproj =================================================================== --- trunk/contrib/win/vs2003/iaxclient_lib.vcproj 2008-02-26 19:43:03 UTC (rev 1356) +++ trunk/contrib/win/vs2003/iaxclient_lib.vcproj 2008-02-29 17:16:50 UTC (rev 1357) @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..,..\..\gsm\inc,..\..\portaudio\include,..\..\portaudio\src\common,..\..\portaudio\pablio,..\..\portmixer\px_common,..\..\libspeex\include,..\..\libiax2\src,..\..\wince" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;PA_NO_DS;PA_NO_ASIO;SPEEX_PREPROCESS=1;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;PA_NO_DS;PA_NO_ASIO;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf" MinimalRebuild="FALSE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -81,7 +81,7 @@ FavorSizeOrSpeed="2" OmitFramePointers="TRUE" AdditionalIncludeDirectories="..\..,..\..\gsm\inc,..\..\portaudio\include,..\..\portaudio\src\common,..\..\portaudio\pablio,..\..\portmixer\px_common,..\..\libspeex\include,..\..\libiax2\src,..\..\wince" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB;PA_NO_DS;PA_NO_ASIO;SPEEX_PREPROCESS=1;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_LIB;PA_NO_DS;PA_NO_ASIO;NEWJB;LIBIAX;SPEEX_EC=1;inline=__inline;strncasecmp=strnicmp;vsnprintf=_vsnprintf" StringPooling="TRUE" RuntimeLibrary="2" RuntimeTypeInfo="FALSE" Modified: trunk/simpleclient/vtestcall/vtestcall.vcproj =================================================================== --- trunk/simpleclient/vtestcall/vtestcall.vcproj 2008-02-26 19:43:03 UTC (rev 1356) +++ trunk/simpleclient/vtestcall/vtestcall.vcproj 2008-02-29 17:16:50 UTC (rev 1357) @@ -43,7 +43,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;".. \..\lib\portaudio\pablio";..\..\lib;..\..\lib\SDL\include;"$(SDL_DIR)\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;SPEEX_PREPROCESS=1;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -130,7 +130,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\lib\portaudio\pa_common;..\..\lib\speex\libspeex;".. \..\lib\portaudio\pablio";..\..\lib;..\..\lib\SDL\include;"$(SDL_DIR)\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;SPEEX_PREPROCESS=1;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WINDOWS;WITH_THREAD;_USE_MATH_DEFINES;IAXC_VIDEO;IAXC_IAX2;LIBIAX;PORTAUDIO_DIRECTX;USE_WIN_AUDIO=1;HIRES_TIME;NEWJB;PA_USE_TIMER_CALLBACK=1" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="2" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |