You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(68) |
Jul
(27) |
Aug
(1) |
Sep
(9) |
Oct
(16) |
Nov
(64) |
Dec
(18) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(11) |
Feb
(5) |
Mar
(20) |
Apr
(9) |
May
(8) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
(11) |
Oct
(34) |
Nov
(23) |
Dec
(34) |
2005 |
Jan
(41) |
Feb
(25) |
Mar
(25) |
Apr
(32) |
May
(27) |
Jun
(9) |
Jul
(36) |
Aug
(6) |
Sep
(3) |
Oct
(11) |
Nov
(2) |
Dec
(21) |
2006 |
Jan
(14) |
Feb
(8) |
Mar
(18) |
Apr
(6) |
May
|
Jun
(17) |
Jul
(14) |
Aug
(26) |
Sep
(34) |
Oct
(24) |
Nov
(48) |
Dec
(64) |
2007 |
Jan
(72) |
Feb
(21) |
Mar
(50) |
Apr
(41) |
May
(35) |
Jun
(50) |
Jul
(33) |
Aug
(32) |
Sep
(50) |
Oct
(85) |
Nov
(43) |
Dec
(33) |
2008 |
Jan
(10) |
Feb
(29) |
Mar
(15) |
Apr
(45) |
May
(5) |
Jun
(2) |
Jul
(14) |
Aug
(3) |
Sep
|
Oct
|
Nov
(3) |
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
(9) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <jpg...@us...> - 2008-02-29 18:19:41
|
Revision: 1366 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1366&view=rev Author: jpgrayson Date: 2008-02-29 10:19:47 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Merge configure changes from iaxclient trunk revisions 1357:1365 into 2.1 branch. This changes the --with-video configure option to --enable-video (or --disable-video). Also, --disable-vidcap is implied by --disable-video. Modified Paths: -------------- branches/2.1/configure.ac branches/2.1/contrib/macosx/Prefixes.h branches/2.1/contrib/tcl/Prefixes.h branches/2.1/contrib/win/vs2003/iaxclient_dll.vcproj branches/2.1/contrib/win/vs2003/iaxclient_lib.vcproj branches/2.1/simpleclient/vtestcall/vtestcall.vcproj Modified: branches/2.1/configure.ac =================================================================== --- branches/2.1/configure.ac 2008-02-29 18:16:07 UTC (rev 1365) +++ branches/2.1/configure.ac 2008-02-29 18:19:47 UTC (rev 1366) @@ -5,7 +5,7 @@ dnl Package version m4_define(IAXC_VERSION, [2.1-svn]) -AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...]) +AC_INIT(iaxclient, IAXC_VERSION, [iax...@li...]) AC_CONFIG_SRCDIR([lib/iaxclient.h]) AC_CONFIG_HEADERS([config.h]) @@ -66,7 +66,6 @@ CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"} CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"} -# AC_ARG_ENABLE saves the option's argument in enable_FEATURE AC_ARG_ENABLE(local-gsm, [AS_HELP_STRING([--enable-local-gsm], [Use local gsm library [default=auto]])],, @@ -83,14 +82,14 @@ 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_ENABLE(video, + [AS_HELP_STRING([--enable-video], + [Enable video support [default=yes]])],, + [enable_video="yes"]) AC_ARG_WITH(echo-can, [AS_HELP_STRING([--with-echo-can], - [use echo can (span, speex or mec2) [default=speex]])], + [use echo can (span or speex) [default=speex]])], use_echo_can=$withval, use_echo_can="speex") @@ -104,35 +103,12 @@ [Enable iLBC support (You need to place the iLBC reference sources in lib/iLBC) [default=auto]])],, with_ilbc="auto") -case "$with_ilbc" in - yes) - enable_local_ilbc=yes ;; - no) - enable_local_ilbc=no ;; - auto) - AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC]) - if test -r lib/iLBC/iLBC_encode.c; then - enable_local_ilbc=yes - else - enable_local_ilbc=no - fi - AC_MSG_RESULT([$enable_local_ilbc]) ;; - - *) - AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;; -esac - AC_ARG_WITH(wish, [AS_HELP_STRING([--with-wish], [Path to Tcl command language interpreter])], WISH="${with_wish}", with_wish="auto") -AC_ARG_WITH(video, - [AS_HELP_STRING([--without-video], - [Video support])],, - with_video="yes") - AC_ARG_WITH(ogg, [AS_HELP_STRING([--without-ogg], [OGG support])],, @@ -154,24 +130,23 @@ FFMPEG="${with_ffmpeg}", with_ffmpeg="no") -if test ! "x$enable_clients" = "xauto"; then - for client in ${enable_clients}; do - case "$client" in - iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx) - clients="$clients $client" ;; - all | yes) - clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx" - break ;; - none | no) - clients="" - break ;; - *) - AC_MSG_ERROR(bad value ${client} for --enable-clients) ;; - esac - done -fi +case "$with_ilbc" in + yes) + enable_local_ilbc=yes ;; + no) + enable_local_ilbc=no ;; + auto) + AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC]) + if test -r lib/iLBC/iLBC_encode.c; then + enable_local_ilbc=yes + else + enable_local_ilbc=no + fi + AC_MSG_RESULT([$enable_local_ilbc]) ;; -AM_OPTIONS_WXCONFIG + *) + AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;; +esac case $host_os in *mingw32*|*cygwin* ) @@ -200,35 +175,6 @@ obtain a copy. ])) -has_gsm=no -if test x$enable_local_gsm = xyes; then - has_gsm=yes - GSM_CFLAGS='-I$(top_srcdir)/lib/gsm/inc' -else - AM_PATH_GSM(has_gsm=yes, has_gsm=no) -fi - -if test x$with_video = xyes; then - AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable Video support]) -fi -AM_CONDITIONAL(VIDEO, test x$with_video = xyes) - -has_ogg=no -if test ! x$with_ogg = xno; then -PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3],has_ogg=yes) -if test x$has_ogg = xyes; then - AC_DEFINE(USE_OGG, 1, [OGG]) - PKG_REQUIRES="$PKG_REQUIRES ogg" -elif test ! x$with_ogg = xauto ; then - AC_MSG_ERROR([ - libogg is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) -fi -fi -AM_CONDITIONAL(OGG, test x$has_ogg = xyes) - PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([ speex is required to build this package! please see http://www.xiph.org/ for how to @@ -241,66 +187,85 @@ obtain a copy. ])) -has_theora=no -if test ! x$with_theora = xno; then -PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes) -if test x$has_theora = xyes; then - AC_DEFINE(USE_THEORA, 1, [THEORA]) - PKG_REQUIRES="$PKG_REQUIRES theora" -elif test ! x$with_theora = xauto ; then - AC_MSG_ERROR([ - libtheora is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) -fi -fi -AM_CONDITIONAL(THEORA, test x$has_theora = xyes) - -has_vidcap=no -if test ! x$with_vidcap = xno; then - PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1],has_vidcap=yes) - if test x$has_vidcap = xyes; then - AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) - PKG_REQUIRES="$PKG_REQUIRES vidcap" - elif test ! x$with_vidcap = xauto ; then - AC_MSG_ERROR([ - libvidcap is required to build this package! - please see http://libvidcap.sourceforge.net/ for how to - obtain a copy. - ]) - fi -fi -AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes) - -has_ffmpeg=no -if test ! x$with_ffmpeg = xno; then -PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3],has_ffmpeg=yes) -if test x$has_ffmpeg = xyes; then - AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) - PKG_REQUIRES="$PKG_REQUIRES ffmpeg" -elif test ! x$with_ffmpeg = xauto ; then - AC_MSG_ERROR([ - FFmpeg is required to build this package! - please see http://ffmpeg.mplayerhq.hu/ for how to - obtain a copy. - ]) -fi -fi -AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes) - PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no) PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no) PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no) PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no) +PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no) PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no) +PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7], has_theora=yes, has_theora=no) +PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1], has_vidcap=yes, has_vidcap=no) +PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3], has_ffmpeg=yes, has_ffmpeg=no) +has_gsm=no +if test x$enable_local_gsm = xyes; then + has_gsm=yes + GSM_CFLAGS='-I$(top_srcdir)/lib/gsm/inc' +else + AM_PATH_GSM(has_gsm=yes, has_gsm=no) +fi + +if test x$enable_video = xyes; then + + if test x$with_ogg != xno; then + if test x$has_ogg = xyes; then + AC_DEFINE(USE_OGG, 1, [OGG]) + PKG_REQUIRES="$PKG_REQUIRES ogg" + elif test x$with_ogg != xauto ; then + AC_MSG_ERROR([ + libogg is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi + fi + + if test x$with_theora != xno; then + if test x$has_theora = xyes; then + AC_DEFINE(USE_THEORA, 1, [THEORA]) + PKG_REQUIRES="$PKG_REQUIRES theora" + elif test x$with_theora != xauto ; then + AC_MSG_ERROR([ + libtheora is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi + fi + + if test x$with_vidcap != xno; then + if test x$has_vidcap = xyes; then + AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) + PKG_REQUIRES="$PKG_REQUIRES vidcap" + elif test x$with_vidcap != xauto ; then + AC_MSG_ERROR([ + libvidcap is required to build this package! + please see http://libvidcap.sourceforge.net/ for how to + obtain a copy. + ]) + fi + fi + + if test x$with_ffmpeg != xno; then + if test x$has_ffmpeg = xyes; then + AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) + PKG_REQUIRES="$PKG_REQUIRES ffmpeg" + elif test x$with_ffmpeg != xauto ; then + AC_MSG_ERROR([ + FFmpeg is required to build this package! + please see http://ffmpeg.mplayerhq.hu/ for how to + obtain a copy. + ]) + fi + fi +fi + has_iax2=no -if test ! x$enable_local_iax = xyes; then +if test x$enable_local_iax != xyes; then AM_PATH_IAX2(0.2.3,has_iax2=yes,has_iax2=no) fi -if test x$has_iax2 = xno && test ! x$enable_local_iax = xno; then +if test x$has_iax2 = xno && test x$enable_local_iax != xno; then has_iax2=yes enable_local_iax2=yes IAX2_CFLAGS='-I$(top_srcdir)/lib/libiax2/src -DLIBIAX' @@ -308,6 +273,8 @@ IAX2_CONFIG="" fi +AM_OPTIONS_WXCONFIG + has_wx="no" AM_PATH_WXCONFIG(2.6.0, [has_wx="2.6"], [AM_PATH_WXCONFIG(2.4.0, [has_wx="2.4"])]) @@ -322,7 +289,7 @@ CXXFLAGS="$WX_CXXFLAGS_ONLY" AC_LANG_PUSH(C++) -if test ! x$has_wx = xno; then +if test x$has_wx != xno; then AC_CHECK_HEADER(wx/xrc/xmlres.h,has_wx_xrc=yes, [AC_MSG_WARN([Can't find wx/xrc/xml.h]) has_wx_xrc=no]) @@ -364,32 +331,33 @@ CXXFLAGS="$save_CXXFLAGS" dnl End wx xrc check -if test x$enable_speex_preprocess = xyes; then - AC_DEFINE(SPEEX_PREPROCESS, 1, [Speex preprocess]) +if test x$enable_video = xyes; then + AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable video support]) 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]) + AC_DEFINE(SPAN_EC, 1, [Define to 1 to enable span echo cancellation]) fi if test x$use_echo_can = xspeex; then - AC_DEFINE(SPEEX_EC, 1, [Speex echo can]) + AC_DEFINE(SPEEX_EC, 1, [Define to 1 to enable speex echo cancellation]) fi -if test x$use_echo_can = xmec2; then - AC_DEFINE(MEC2_EC, 1, [Mec echo can]) -fi - if test x$enable_local_ilbc = xyes; then - AC_DEFINE(CODEC_ILBC,,[Enable ILBC support]) + AC_DEFINE(CODEC_ILBC,,[Define to 1 to enable ILBC support]) fi -if test x$has_gsm = xyes && test ! x$with_gsm = xno; then - AC_DEFINE(CODEC_GSM,,[Enable GSM support]) +if test x$has_gsm = xyes && test x$with_gsm != xno; then + AC_DEFINE(CODEC_GSM,,[Define to 1 to enable GSM support]) fi -AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test ! x$with_gsm = xno) +AM_CONDITIONAL(VIDEO, test x$enable_video = xyes) +AM_CONDITIONAL(OGG, test x$has_ogg = xyes) +AM_CONDITIONAL(THEORA, test x$has_theora = xyes) +AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes) +AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes) +AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan) +AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test x$with_gsm != xno) AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes) AM_CONDITIONAL(USE_LOCAL_IAX2, test x$enable_local_iax2 = xyes) AM_CONDITIONAL(USE_DEBUG_IAX2, test x$enable_debug_iax2 = xyes) @@ -399,14 +367,29 @@ AM_CONDITIONAL(MACOSX, test x$OSTYPE = xMACOSX) # Autodetect clients -if test "x$enable_clients" = "xauto"; then +if test "x$enable_clients" != "xauto"; then + for client in ${enable_clients}; do + case "$client" in + iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx) + clients="$clients $client" ;; + all | yes) + clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx" + break ;; + none | no) + clients="" + break ;; + *) + AC_MSG_ERROR(bad value ${client} for --enable-clients) ;; + esac + done +else clients="$clients testcall" - if test x$has_oggz = xyes && test x$has_theora = xyes; then + if test x$enable_video = xyes && test x$has_oggz = xyes && test x$has_theora = xyes; then clients="$clients stresstest" fi - if test ! x$has_wx = xno; then + if test x$has_wx != xno; then clients="$clients iaxphone" if test "x$has_gdk2" = xyes; then clients="$clients wx" @@ -417,7 +400,7 @@ fi fi - if test x$has_sdl = xyes && test x$with_video = xyes; then + if test x$has_sdl = xyes && test x$enable_video = xyes; then clients="$clients vtestcall" fi @@ -425,7 +408,7 @@ clients="$clients WinIAX" fi - if test ! x$WISH = x && test "x$has_gdk2" = "xyes"; then + if test x$WISH != x && test "x$has_gdk2" = "xyes"; then clients="$clients tkphone" fi fi @@ -440,7 +423,7 @@ CLIENTS="$CLIENTS $client";; vtestcall) - if test ! x$has_sdl = xyes || test ! x$with_video = xyes ; then + if test x$has_sdl != xyes || test x$enable_video != xyes ; then AC_MSG_ERROR([vtestcall requires SDL and video]) fi CLIENTS="$CLIENTS $client";; Modified: branches/2.1/contrib/macosx/Prefixes.h =================================================================== --- branches/2.1/contrib/macosx/Prefixes.h 2008-02-29 18:16:07 UTC (rev 1365) +++ branches/2.1/contrib/macosx/Prefixes.h 2008-02-29 18:19:47 UTC (rev 1366) @@ -3,10 +3,8 @@ #define LIBIAX //#define CODEC_ILBC 0 -#define SPEEX_PREPROCESS 1 //#define SPAN_EC 0 #define SPEEX_EC 1 -//#define MEC2_EC 0 Modified: branches/2.1/contrib/tcl/Prefixes.h =================================================================== --- branches/2.1/contrib/tcl/Prefixes.h 2008-02-29 18:16:07 UTC (rev 1365) +++ branches/2.1/contrib/tcl/Prefixes.h 2008-02-29 18:19:47 UTC (rev 1366) @@ -5,10 +5,8 @@ //#define CODEC_ILBC 0 -#define SPEEX_PREPROCESS 1 //#define SPAN_EC 0 #define SPEEX_EC 1 -//#define MEC2_EC 0 #define USE_NEWJB 1 //#define USE_VIDEO 0 Modified: branches/2.1/contrib/win/vs2003/iaxclient_dll.vcproj =================================================================== --- branches/2.1/contrib/win/vs2003/iaxclient_dll.vcproj 2008-02-29 18:16:07 UTC (rev 1365) +++ branches/2.1/contrib/win/vs2003/iaxclient_dll.vcproj 2008-02-29 18:19:47 UTC (rev 1366) @@ -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: branches/2.1/contrib/win/vs2003/iaxclient_lib.vcproj =================================================================== --- branches/2.1/contrib/win/vs2003/iaxclient_lib.vcproj 2008-02-29 18:16:07 UTC (rev 1365) +++ branches/2.1/contrib/win/vs2003/iaxclient_lib.vcproj 2008-02-29 18:19:47 UTC (rev 1366) @@ -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: branches/2.1/simpleclient/vtestcall/vtestcall.vcproj =================================================================== --- branches/2.1/simpleclient/vtestcall/vtestcall.vcproj 2008-02-29 18:16:07 UTC (rev 1365) +++ branches/2.1/simpleclient/vtestcall/vtestcall.vcproj 2008-02-29 18:19:47 UTC (rev 1366) @@ -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. |
From: <jpg...@us...> - 2008-02-29 18:16:02
|
Revision: 1365 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1365&view=rev Author: jpgrayson Date: 2008-02-29 10:16:07 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Only demand vidcap, theora, ogg, and ffmpeg if video is enabled. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 18:06:18 UTC (rev 1364) +++ trunk/configure.ac 2008-02-29 18:16:07 UTC (rev 1365) @@ -205,55 +205,58 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test x$with_ogg != xno; then - if test x$has_ogg = xyes; then - AC_DEFINE(USE_OGG, 1, [OGG]) - PKG_REQUIRES="$PKG_REQUIRES ogg" - elif test x$with_ogg != xauto ; then - AC_MSG_ERROR([ - libogg is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) +if test x$enable_video = xyes; then + + if test x$with_ogg != xno; then + if test x$has_ogg = xyes; then + AC_DEFINE(USE_OGG, 1, [OGG]) + PKG_REQUIRES="$PKG_REQUIRES ogg" + elif test x$with_ogg != xauto ; then + AC_MSG_ERROR([ + libogg is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_theora != xno; then - if test x$has_theora = xyes; then - AC_DEFINE(USE_THEORA, 1, [THEORA]) - PKG_REQUIRES="$PKG_REQUIRES theora" - elif test x$with_theora != xauto ; then - AC_MSG_ERROR([ - libtheora is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) + + if test x$with_theora != xno; then + if test x$has_theora = xyes; then + AC_DEFINE(USE_THEORA, 1, [THEORA]) + PKG_REQUIRES="$PKG_REQUIRES theora" + elif test x$with_theora != xauto ; then + AC_MSG_ERROR([ + libtheora is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_vidcap != xno; then - if test x$has_vidcap = xyes; then - AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) - PKG_REQUIRES="$PKG_REQUIRES vidcap" - elif test x$with_vidcap != xauto ; then - AC_MSG_ERROR([ - libvidcap is required to build this package! - please see http://libvidcap.sourceforge.net/ for how to - obtain a copy. - ]) + + if test x$with_vidcap != xno; then + if test x$has_vidcap = xyes; then + AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) + PKG_REQUIRES="$PKG_REQUIRES vidcap" + elif test x$with_vidcap != xauto ; then + AC_MSG_ERROR([ + libvidcap is required to build this package! + please see http://libvidcap.sourceforge.net/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_ffmpeg != xno; then - if test x$has_ffmpeg = xyes; then - AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) - PKG_REQUIRES="$PKG_REQUIRES ffmpeg" - elif test x$with_ffmpeg != xauto ; then - AC_MSG_ERROR([ - FFmpeg is required to build this package! - please see http://ffmpeg.mplayerhq.hu/ for how to - obtain a copy. - ]) + + if test x$with_ffmpeg != xno; then + if test x$has_ffmpeg = xyes; then + AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) + PKG_REQUIRES="$PKG_REQUIRES ffmpeg" + elif test x$with_ffmpeg != xauto ; then + AC_MSG_ERROR([ + FFmpeg is required to build this package! + please see http://ffmpeg.mplayerhq.hu/ for how to + obtain a copy. + ]) + fi fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 18:06:14
|
Revision: 1364 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1364&view=rev Author: jpgrayson Date: 2008-02-29 10:06:18 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Change instances of "test ! xxx = yyy" to "test xxx != yyy". Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 18:02:41 UTC (rev 1363) +++ trunk/configure.ac 2008-02-29 18:06:18 UTC (rev 1364) @@ -205,11 +205,11 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test ! x$with_ogg = xno; then +if test x$with_ogg != xno; then if test x$has_ogg = xyes; then AC_DEFINE(USE_OGG, 1, [OGG]) PKG_REQUIRES="$PKG_REQUIRES ogg" - elif test ! x$with_ogg = xauto ; then + elif test x$with_ogg != xauto ; then AC_MSG_ERROR([ libogg is required to build this package! please see http://www.xiph.org/ for how to @@ -218,11 +218,11 @@ fi fi -if test ! x$with_theora = xno; then +if test x$with_theora != xno; then if test x$has_theora = xyes; then AC_DEFINE(USE_THEORA, 1, [THEORA]) PKG_REQUIRES="$PKG_REQUIRES theora" - elif test ! x$with_theora = xauto ; then + elif test x$with_theora != xauto ; then AC_MSG_ERROR([ libtheora is required to build this package! please see http://www.xiph.org/ for how to @@ -231,11 +231,11 @@ fi fi -if test ! x$with_vidcap = xno; then +if test x$with_vidcap != xno; then if test x$has_vidcap = xyes; then AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) PKG_REQUIRES="$PKG_REQUIRES vidcap" - elif test ! x$with_vidcap = xauto ; then + elif test x$with_vidcap != xauto ; then AC_MSG_ERROR([ libvidcap is required to build this package! please see http://libvidcap.sourceforge.net/ for how to @@ -244,11 +244,11 @@ fi fi -if test ! x$with_ffmpeg = xno; then +if test x$with_ffmpeg != xno; then if test x$has_ffmpeg = xyes; then AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) PKG_REQUIRES="$PKG_REQUIRES ffmpeg" - elif test ! x$with_ffmpeg = xauto ; then + elif test x$with_ffmpeg != xauto ; then AC_MSG_ERROR([ FFmpeg is required to build this package! please see http://ffmpeg.mplayerhq.hu/ for how to @@ -258,11 +258,11 @@ fi has_iax2=no -if test ! x$enable_local_iax = xyes; then +if test x$enable_local_iax != xyes; then AM_PATH_IAX2(0.2.3,has_iax2=yes,has_iax2=no) fi -if test x$has_iax2 = xno && test ! x$enable_local_iax = xno; then +if test x$has_iax2 = xno && test x$enable_local_iax != xno; then has_iax2=yes enable_local_iax2=yes IAX2_CFLAGS='-I$(top_srcdir)/lib/libiax2/src -DLIBIAX' @@ -286,7 +286,7 @@ CXXFLAGS="$WX_CXXFLAGS_ONLY" AC_LANG_PUSH(C++) -if test ! x$has_wx = xno; then +if test x$has_wx != xno; then AC_CHECK_HEADER(wx/xrc/xmlres.h,has_wx_xrc=yes, [AC_MSG_WARN([Can't find wx/xrc/xml.h]) has_wx_xrc=no]) @@ -344,7 +344,7 @@ AC_DEFINE(CODEC_ILBC,,[Define to 1 to enable ILBC support]) fi -if test x$has_gsm = xyes && test ! x$with_gsm = xno; then +if test x$has_gsm = xyes && test x$with_gsm != xno; then AC_DEFINE(CODEC_GSM,,[Define to 1 to enable GSM support]) fi @@ -354,7 +354,7 @@ AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes) AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes) AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan) -AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test ! x$with_gsm = xno) +AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test x$with_gsm != xno) AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes) AM_CONDITIONAL(USE_LOCAL_IAX2, test x$enable_local_iax2 = xyes) AM_CONDITIONAL(USE_DEBUG_IAX2, test x$enable_debug_iax2 = xyes) @@ -386,7 +386,7 @@ clients="$clients stresstest" fi - if test ! x$has_wx = xno; then + if test x$has_wx != xno; then clients="$clients iaxphone" if test "x$has_gdk2" = xyes; then clients="$clients wx" @@ -405,7 +405,7 @@ clients="$clients WinIAX" fi - if test ! x$WISH = x && test "x$has_gdk2" = "xyes"; then + if test x$WISH != x && test "x$has_gdk2" = "xyes"; then clients="$clients tkphone" fi fi @@ -420,7 +420,7 @@ CLIENTS="$CLIENTS $client";; vtestcall) - if test ! x$has_sdl = xyes || test ! x$enable_video = xyes ; then + if test x$has_sdl != xyes || test x$enable_video != xyes ; then AC_MSG_ERROR([vtestcall requires SDL and video]) fi CLIENTS="$CLIENTS $client";; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 18:02:38
|
Revision: 1363 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1363&view=rev Author: jpgrayson Date: 2008-02-29 10:02:41 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Group PKG_CHECK_MODULES() invocations together. Use PKG_CHECK_MODULES() unconditionally for ogg, theora, etc. Fix related indentation. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:54:33 UTC (rev 1362) +++ trunk/configure.ac 2008-02-29 18:02:41 UTC (rev 1363) @@ -187,6 +187,16 @@ obtain a copy. ])) +PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no) +PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no) +PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no) +PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no) +PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3], has_ogg=yes, has_ogg=no) +PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no) +PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7], has_theora=yes, has_theora=no) +PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1], has_vidcap=yes, has_vidcap=no) +PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3], has_ffmpeg=yes, has_ffmpeg=no) + has_gsm=no if test x$enable_local_gsm = xyes; then has_gsm=yes @@ -195,39 +205,33 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -has_ogg=no if test ! x$with_ogg = xno; then -PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3],has_ogg=yes) -if test x$has_ogg = xyes; then - AC_DEFINE(USE_OGG, 1, [OGG]) - PKG_REQUIRES="$PKG_REQUIRES ogg" -elif test ! x$with_ogg = xauto ; then - AC_MSG_ERROR([ - libogg is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) + if test x$has_ogg = xyes; then + AC_DEFINE(USE_OGG, 1, [OGG]) + PKG_REQUIRES="$PKG_REQUIRES ogg" + elif test ! x$with_ogg = xauto ; then + AC_MSG_ERROR([ + libogg is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi -has_theora=no if test ! x$with_theora = xno; then -PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes) -if test x$has_theora = xyes; then - AC_DEFINE(USE_THEORA, 1, [THEORA]) - PKG_REQUIRES="$PKG_REQUIRES theora" -elif test ! x$with_theora = xauto ; then - AC_MSG_ERROR([ - libtheora is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) + if test x$has_theora = xyes; then + AC_DEFINE(USE_THEORA, 1, [THEORA]) + PKG_REQUIRES="$PKG_REQUIRES theora" + elif test ! x$with_theora = xauto ; then + AC_MSG_ERROR([ + libtheora is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi -has_vidcap=no if test ! x$with_vidcap = xno; then - PKG_CHECK_MODULES(VIDCAP, [vidcap >= 0.1],has_vidcap=yes) if test x$has_vidcap = xyes; then AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) PKG_REQUIRES="$PKG_REQUIRES vidcap" @@ -240,27 +244,19 @@ fi fi -has_ffmpeg=no if test ! x$with_ffmpeg = xno; then -PKG_CHECK_MODULES(FFMPEG, [libavcodec >= 51.40.3],has_ffmpeg=yes) -if test x$has_ffmpeg = xyes; then - AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) - PKG_REQUIRES="$PKG_REQUIRES ffmpeg" -elif test ! x$with_ffmpeg = xauto ; then - AC_MSG_ERROR([ - FFmpeg is required to build this package! - please see http://ffmpeg.mplayerhq.hu/ for how to - obtain a copy. - ]) + if test x$has_ffmpeg = xyes; then + AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) + PKG_REQUIRES="$PKG_REQUIRES ffmpeg" + elif test ! x$with_ffmpeg = xauto ; then + AC_MSG_ERROR([ + FFmpeg is required to build this package! + please see http://ffmpeg.mplayerhq.hu/ for how to + obtain a copy. + ]) + fi fi -fi -PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no) -PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no) -PKG_CHECK_MODULES(GDK2, [gdk-2.0 >= 2.0.0], has_gdk2=yes, has_gdk2=no) -PKG_CHECK_MODULES(ALSA, [alsa >= 1.0], has_alsa=yes, has_alsa=no) -PKG_CHECK_MODULES(OGGZ, [oggz >= 0.9.5], has_oggz=yes, has_oggz=no) - has_iax2=no if test ! x$enable_local_iax = xyes; then AM_PATH_IAX2(0.2.3,has_iax2=yes,has_iax2=no) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 17:54:33
|
Revision: 1362 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1362&view=rev Author: jpgrayson Date: 2008-02-29 09:54:33 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Move all of the client configuration business to the same place. Only build stresstest if video is enabled (since it depends on it). Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:37:47 UTC (rev 1361) +++ trunk/configure.ac 2008-02-29 17:54:33 UTC (rev 1362) @@ -148,23 +148,6 @@ AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;; esac -if test ! "x$enable_clients" = "xauto"; then - for client in ${enable_clients}; do - case "$client" in - iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx) - clients="$clients $client" ;; - all | yes) - clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx" - break ;; - none | no) - clients="" - break ;; - *) - AC_MSG_ERROR(bad value ${client} for --enable-clients) ;; - esac - done -fi - case $host_os in *mingw32*|*cygwin* ) OSTYPE=WIN32 @@ -385,10 +368,25 @@ AM_CONDITIONAL(MACOSX, test x$OSTYPE = xMACOSX) # Autodetect clients -if test "x$enable_clients" = "xauto"; then +if test "x$enable_clients" != "xauto"; then + for client in ${enable_clients}; do + case "$client" in + iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx) + clients="$clients $client" ;; + all | yes) + clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx" + break ;; + none | no) + clients="" + break ;; + *) + AC_MSG_ERROR(bad value ${client} for --enable-clients) ;; + esac + done +else clients="$clients testcall" - if test x$has_oggz = xyes && test x$has_theora = xyes; then + if test x$enable_video = xyes && test x$has_oggz = xyes && test x$has_theora = xyes; then clients="$clients stresstest" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 17:37:45
|
Revision: 1361 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1361&view=rev Author: jpgrayson Date: 2008-02-29 09:37:47 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Cleanup configure.ac by moving related constructs together. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:28:01 UTC (rev 1360) +++ trunk/configure.ac 2008-02-29 17:37:47 UTC (rev 1361) @@ -66,7 +66,6 @@ CFLAGS=${CFLAGS-"-O2 -g -Wall --std=gnu99"} CXXFLAGS=${CXXFLAGS-"-O2 -g -Wall"} -# AC_ARG_ENABLE saves the option's argument in enable_FEATURE AC_ARG_ENABLE(local-gsm, [AS_HELP_STRING([--enable-local-gsm], [Use local gsm library [default=auto]])],, @@ -104,24 +103,6 @@ [Enable iLBC support (You need to place the iLBC reference sources in lib/iLBC) [default=auto]])],, with_ilbc="auto") -case "$with_ilbc" in - yes) - enable_local_ilbc=yes ;; - no) - enable_local_ilbc=no ;; - auto) - AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC]) - if test -r lib/iLBC/iLBC_encode.c; then - enable_local_ilbc=yes - else - enable_local_ilbc=no - fi - AC_MSG_RESULT([$enable_local_ilbc]) ;; - - *) - AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;; -esac - AC_ARG_WITH(wish, [AS_HELP_STRING([--with-wish], [Path to Tcl command language interpreter])], @@ -149,6 +130,24 @@ FFMPEG="${with_ffmpeg}", with_ffmpeg="no") +case "$with_ilbc" in + yes) + enable_local_ilbc=yes ;; + no) + enable_local_ilbc=no ;; + auto) + AC_MSG_CHECKING([for iLBC reference sources in lib/iLBC]) + if test -r lib/iLBC/iLBC_encode.c; then + enable_local_ilbc=yes + else + enable_local_ilbc=no + fi + AC_MSG_RESULT([$enable_local_ilbc]) ;; + + *) + AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;; +esac + if test ! "x$enable_clients" = "xauto"; then for client in ${enable_clients}; do case "$client" in @@ -166,8 +165,6 @@ done fi -AM_OPTIONS_WXCONFIG - case $host_os in *mingw32*|*cygwin* ) OSTYPE=WIN32 @@ -195,6 +192,18 @@ obtain a copy. ])) +PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([ + speex is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. +])) + +PKG_CHECK_MODULES(SPEEXDSP, [speexdsp >= 1.2],,AC_MSG_ERROR([ + speexdsp is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. +])) + has_gsm=no if test x$enable_local_gsm = xyes; then has_gsm=yes @@ -203,11 +212,6 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test x$enable_video = xyes; then - AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable Video support]) -fi -AM_CONDITIONAL(VIDEO, test x$enable_video = xyes) - has_ogg=no if test ! x$with_ogg = xno; then PKG_CHECK_MODULES(OGG, [ogg >= 1.1.3],has_ogg=yes) @@ -222,20 +226,7 @@ ]) fi fi -AM_CONDITIONAL(OGG, test x$has_ogg = xyes) -PKG_CHECK_MODULES(SPEEX, [speex >= 1.2],,AC_MSG_ERROR([ - speex is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. -])) - -PKG_CHECK_MODULES(SPEEXDSP, [speexdsp >= 1.2],,AC_MSG_ERROR([ - speexdsp is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. -])) - has_theora=no if test ! x$with_theora = xno; then PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes) @@ -250,7 +241,6 @@ ]) fi fi -AM_CONDITIONAL(THEORA, test x$has_theora = xyes) has_vidcap=no if test ! x$with_vidcap = xno; then @@ -266,7 +256,6 @@ ]) fi fi -AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes) has_ffmpeg=no if test ! x$with_ffmpeg = xno; then @@ -282,7 +271,6 @@ ]) fi fi -AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes) PKG_CHECK_MODULES(SDL, [sdl >= 1.2], has_sdl=yes, has_sdl=no) PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0], has_gtk2=yes, has_gtk2=no) @@ -303,6 +291,8 @@ IAX2_CONFIG="" fi +AM_OPTIONS_WXCONFIG + has_wx="no" AM_PATH_WXCONFIG(2.6.0, [has_wx="2.6"], [AM_PATH_WXCONFIG(2.4.0, [has_wx="2.4"])]) @@ -359,23 +349,32 @@ CXXFLAGS="$save_CXXFLAGS" dnl End wx xrc check -AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan) +if test x$enable_video = xyes; then + AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable video support]) +fi + if test x$use_echo_can = xspan; then - AC_DEFINE(SPAN_EC, 1, [Span echo can]) + AC_DEFINE(SPAN_EC, 1, [Define to 1 to enable span echo cancellation]) fi if test x$use_echo_can = xspeex; then - AC_DEFINE(SPEEX_EC, 1, [Speex echo can]) + AC_DEFINE(SPEEX_EC, 1, [Define to 1 to enable speex echo cancellation]) fi if test x$enable_local_ilbc = xyes; then - AC_DEFINE(CODEC_ILBC,,[Enable ILBC support]) + AC_DEFINE(CODEC_ILBC,,[Define to 1 to enable ILBC support]) fi if test x$has_gsm = xyes && test ! x$with_gsm = xno; then - AC_DEFINE(CODEC_GSM,,[Enable GSM support]) + AC_DEFINE(CODEC_GSM,,[Define to 1 to enable GSM support]) fi +AM_CONDITIONAL(VIDEO, test x$enable_video = xyes) +AM_CONDITIONAL(OGG, test x$has_ogg = xyes) +AM_CONDITIONAL(THEORA, test x$has_theora = xyes) +AM_CONDITIONAL(VIDCAP, test x$has_vidcap = xyes) +AM_CONDITIONAL(FFMPEG, test x$has_ffmpeg = xyes) +AM_CONDITIONAL(SPAN_EC, test x$use_echo_can = xspan) AM_CONDITIONAL(USE_CODEC_GSM, test x$has_gsm = xyes && test ! x$with_gsm = xno) AM_CONDITIONAL(USE_LOCAL_GSM, test x$enable_local_gsm = xyes) AM_CONDITIONAL(USE_LOCAL_IAX2, test x$enable_local_iax2 = xyes) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 17:27:57
|
Revision: 1360 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1360&view=rev Author: jpgrayson Date: 2008-02-29 09:28:01 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Change configure option "--with-video" to more conventional "--enable-video". Video can now be disabled with either of: --enable-video=no --disable-video Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:24:41 UTC (rev 1359) +++ trunk/configure.ac 2008-02-29 17:28:01 UTC (rev 1360) @@ -83,6 +83,11 @@ enable_debug_iax2=$enableval, enable_debug_iax2="no") +AC_ARG_ENABLE(video, + [AS_HELP_STRING([--enable-video], + [Enable video support [default=yes]])],, + [enable_video="yes"]) + AC_ARG_WITH(echo-can, [AS_HELP_STRING([--with-echo-can], [use echo can (span or speex) [default=speex]])], @@ -123,11 +128,6 @@ WISH="${with_wish}", with_wish="auto") -AC_ARG_WITH(video, - [AS_HELP_STRING([--without-video], - [Video support])],, - with_video="yes") - AC_ARG_WITH(ogg, [AS_HELP_STRING([--without-ogg], [OGG support])],, @@ -203,10 +203,10 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test x$with_video = xyes; then +if test x$enable_video = xyes; then AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable Video support]) fi -AM_CONDITIONAL(VIDEO, test x$with_video = xyes) +AM_CONDITIONAL(VIDEO, test x$enable_video = xyes) has_ogg=no if test ! x$with_ogg = xno; then @@ -404,7 +404,7 @@ fi fi - if test x$has_sdl = xyes && test x$with_video = xyes; then + if test x$has_sdl = xyes && test x$enable_video = xyes; then clients="$clients vtestcall" fi @@ -427,7 +427,7 @@ CLIENTS="$CLIENTS $client";; vtestcall) - if test ! x$has_sdl = xyes || test ! x$with_video = xyes ; then + if test ! x$has_sdl = xyes || test ! x$enable_video = xyes ; then AC_MSG_ERROR([vtestcall requires SDL and video]) fi CLIENTS="$CLIENTS $client";; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 17:24:37
|
Revision: 1359 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1359&view=rev Author: jpgrayson Date: 2008-02-29 09:24:41 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Change email address to something more generic to the project. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:19:56 UTC (rev 1358) +++ trunk/configure.ac 2008-02-29 17:24:41 UTC (rev 1359) @@ -5,7 +5,7 @@ dnl Package version m4_define(IAXC_VERSION, [2.x-trunk]) -AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...]) +AC_INIT(iaxclient, IAXC_VERSION, [iax...@li...]) AC_CONFIG_SRCDIR([lib/iaxclient.h]) AC_CONFIG_HEADERS([config.h]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jpg...@us...> - 2008-02-29 17:19:50
|
Revision: 1358 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1358&view=rev Author: jpgrayson Date: 2008-02-29 09:19:56 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Remove all references to deprecated and meaningless MEC2. Modified Paths: -------------- trunk/configure.ac trunk/contrib/macosx/Prefixes.h trunk/contrib/tcl/Prefixes.h Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:16:50 UTC (rev 1357) +++ trunk/configure.ac 2008-02-29 17:19:56 UTC (rev 1358) @@ -85,7 +85,7 @@ AC_ARG_WITH(echo-can, [AS_HELP_STRING([--with-echo-can], - [use echo can (span, speex or mec2) [default=speex]])], + [use echo can (span or speex) [default=speex]])], use_echo_can=$withval, use_echo_can="speex") @@ -368,10 +368,6 @@ AC_DEFINE(SPEEX_EC, 1, [Speex echo can]) fi -if test x$use_echo_can = xmec2; then - AC_DEFINE(MEC2_EC, 1, [Mec echo can]) -fi - if test x$enable_local_ilbc = xyes; then AC_DEFINE(CODEC_ILBC,,[Enable ILBC support]) fi Modified: trunk/contrib/macosx/Prefixes.h =================================================================== --- trunk/contrib/macosx/Prefixes.h 2008-02-29 17:16:50 UTC (rev 1357) +++ trunk/contrib/macosx/Prefixes.h 2008-02-29 17:19:56 UTC (rev 1358) @@ -5,7 +5,6 @@ //#define CODEC_ILBC 0 //#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-29 17:16:50 UTC (rev 1357) +++ trunk/contrib/tcl/Prefixes.h 2008-02-29 17:19:56 UTC (rev 1358) @@ -7,7 +7,6 @@ //#define CODEC_ILBC 0 //#define SPAN_EC 0 #define SPEEX_EC 1 -//#define MEC2_EC 0 #define USE_NEWJB 1 //#define USE_VIDEO 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <sb...@us...> - 2008-02-26 19:43:03
|
Revision: 1356 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1356&view=rev Author: sbalea Date: 2008-02-26 11:43:03 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Increase libtool and package version in configure.ac Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-26 19:41:09 UTC (rev 1355) +++ trunk/configure.ac 2008-02-26 19:43:03 UTC (rev 1356) @@ -3,7 +3,7 @@ AC_PREREQ(2.59) dnl Package version -m4_define(IAXC_VERSION, [2.1-svn]) +m4_define(IAXC_VERSION, [2.x-trunk]) AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...]) @@ -15,7 +15,7 @@ dnl Libtool library version IAXC_LT_CURRENT=1 -IAXC_LT_REVISION=0 +IAXC_LT_REVISION=2 IAXC_LT_AGE=0 AC_SUBST(IAXC_LT_CURRENT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-26 19:41:04
|
Revision: 1355 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1355&view=rev Author: sbalea Date: 2008-02-26 11:41:09 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Remove incorrect references to videoLib and stresstest.vcproj from Makefile.am Modified Paths: -------------- trunk/lib/Makefile.am trunk/simpleclient/stresstest/Makefile.am Modified: trunk/lib/Makefile.am =================================================================== --- trunk/lib/Makefile.am 2008-02-26 19:40:03 UTC (rev 1354) +++ trunk/lib/Makefile.am 2008-02-26 19:41:09 UTC (rev 1355) @@ -211,6 +211,5 @@ portmixer \ sox \ spandsp \ - videoLib \ wince Modified: trunk/simpleclient/stresstest/Makefile.am =================================================================== --- trunk/simpleclient/stresstest/Makefile.am 2008-02-26 19:40:03 UTC (rev 1354) +++ trunk/simpleclient/stresstest/Makefile.am 2008-02-26 19:41:09 UTC (rev 1355) @@ -14,4 +14,3 @@ -framework QuickTime endif -EXTRA_DIST = stresstest.vcproj This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-26 19:40:00
|
Revision: 1354 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1354&view=rev Author: sbalea Date: 2008-02-26 11:40:03 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Remove incorrect references to videoLib and stresstest.vcproj from Makefile.am Modified Paths: -------------- tags/2.1beta1/lib/Makefile.am tags/2.1beta1/simpleclient/stresstest/Makefile.am Modified: tags/2.1beta1/lib/Makefile.am =================================================================== --- tags/2.1beta1/lib/Makefile.am 2008-02-26 19:39:29 UTC (rev 1353) +++ tags/2.1beta1/lib/Makefile.am 2008-02-26 19:40:03 UTC (rev 1354) @@ -211,6 +211,5 @@ portmixer \ sox \ spandsp \ - videoLib \ wince Modified: tags/2.1beta1/simpleclient/stresstest/Makefile.am =================================================================== --- tags/2.1beta1/simpleclient/stresstest/Makefile.am 2008-02-26 19:39:29 UTC (rev 1353) +++ tags/2.1beta1/simpleclient/stresstest/Makefile.am 2008-02-26 19:40:03 UTC (rev 1354) @@ -14,4 +14,3 @@ -framework QuickTime endif -EXTRA_DIST = stresstest.vcproj This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-26 19:39:26
|
Revision: 1353 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1353&view=rev Author: sbalea Date: 2008-02-26 11:39:29 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Change configure.ac version to 2.1beta1 Modified Paths: -------------- tags/2.1beta1/configure.ac Modified: tags/2.1beta1/configure.ac =================================================================== --- tags/2.1beta1/configure.ac 2008-02-26 19:36:11 UTC (rev 1352) +++ tags/2.1beta1/configure.ac 2008-02-26 19:39:29 UTC (rev 1353) @@ -3,7 +3,7 @@ AC_PREREQ(2.59) dnl Package version -m4_define(IAXC_VERSION, [2.1-svn]) +m4_define(IAXC_VERSION, [2.1beta1]) AC_INIT(iaxclient, IAXC_VERSION, [jpg...@gm...]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-26 19:36:06
|
Revision: 1352 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1352&view=rev Author: sbalea Date: 2008-02-26 11:36:11 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Remove incorrect references to videoLib and stresstest.vcproj from Makefile.am Modified Paths: -------------- branches/2.1/lib/Makefile.am branches/2.1/simpleclient/stresstest/Makefile.am Modified: branches/2.1/lib/Makefile.am =================================================================== --- branches/2.1/lib/Makefile.am 2008-02-26 19:21:04 UTC (rev 1351) +++ branches/2.1/lib/Makefile.am 2008-02-26 19:36:11 UTC (rev 1352) @@ -211,6 +211,5 @@ portmixer \ sox \ spandsp \ - videoLib \ wince Modified: branches/2.1/simpleclient/stresstest/Makefile.am =================================================================== --- branches/2.1/simpleclient/stresstest/Makefile.am 2008-02-26 19:21:04 UTC (rev 1351) +++ branches/2.1/simpleclient/stresstest/Makefile.am 2008-02-26 19:36:11 UTC (rev 1352) @@ -14,4 +14,3 @@ -framework QuickTime endif -EXTRA_DIST = stresstest.vcproj This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-26 19:21:00
|
Revision: 1351 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1351&view=rev Author: sbalea Date: 2008-02-26 11:21:04 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Tag 2.1beta1 release Added Paths: ----------- tags/2.1beta1/ Copied: tags/2.1beta1 (from rev 1350, branches/2.1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-26 19:17:51
|
Revision: 1350 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1350&view=rev Author: sbalea Date: 2008-02-26 11:17:57 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Increase libtool revision number Modified Paths: -------------- branches/2.1/configure.ac Modified: branches/2.1/configure.ac =================================================================== --- branches/2.1/configure.ac 2008-02-26 19:14:38 UTC (rev 1349) +++ branches/2.1/configure.ac 2008-02-26 19:17:57 UTC (rev 1350) @@ -15,7 +15,7 @@ dnl Libtool library version IAXC_LT_CURRENT=1 -IAXC_LT_REVISION=0 +IAXC_LT_REVISION=1 IAXC_LT_AGE=0 AC_SUBST(IAXC_LT_CURRENT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-26 19:14:39
|
Revision: 1349 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1349&view=rev Author: sbalea Date: 2008-02-26 11:14:38 -0800 (Tue, 26 Feb 2008) Log Message: ----------- Create new stable branch 2.1 Added Paths: ----------- branches/2.1/ Copied: branches/2.1 (from rev 1348, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-25 20:01:26
|
Revision: 1348 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1348&view=rev Author: sbalea Date: 2008-02-25 12:01:32 -0800 (Mon, 25 Feb 2008) Log Message: ----------- Make sure all win32 targets build with the new theora Modified Paths: -------------- trunk/contrib/win/vs2005/libtheora.vcproj Modified: trunk/contrib/win/vs2005/libtheora.vcproj =================================================================== --- trunk/contrib/win/vs2005/libtheora.vcproj 2008-02-25 17:26:04 UTC (rev 1347) +++ trunk/contrib/win/vs2005/libtheora.vcproj 2008-02-25 20:01:32 UTC (rev 1348) @@ -38,8 +38,8 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\..\..\libtheora\include\;..\..\..\..\libogg\include\" - PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500" + AdditionalIncludeDirectories="..\..\..\..\libtheora\include\;..\..\..\..\libogg\include\;..\..\..\..\libtheora\lib\enc" + PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500;TH_REALLY_NO_ASSEMBLY" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-25 17:26:03
|
Revision: 1347 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1347&view=rev Author: sbalea Date: 2008-02-25 09:26:04 -0800 (Mon, 25 Feb 2008) Log Message: ----------- Adapt the visual studioubprojects to work with speex-1.2beta3 and libtheora-1.0beta2. Note that Theora does not make use of Assembly code on Windows Modified Paths: -------------- trunk/contrib/win/vs2005/libspeex.vcproj trunk/contrib/win/vs2005/libtheora.vcproj Modified: trunk/contrib/win/vs2005/libspeex.vcproj =================================================================== --- trunk/contrib/win/vs2005/libspeex.vcproj 2008-02-07 16:52:48 UTC (rev 1346) +++ trunk/contrib/win/vs2005/libspeex.vcproj 2008-02-25 17:26:04 UTC (rev 1347) @@ -190,6 +190,10 @@ > </File> <File + RelativePath="..\..\..\..\speex\libspeex\filterbank.c" + > + </File> + <File RelativePath="..\..\..\..\speex\libspeex\filters.c" > </File> @@ -246,19 +250,15 @@ > </File> <File - RelativePath="..\..\..\..\speex\libspeex\math_approx.c" - > - </File> - <File RelativePath="..\..\..\..\speex\libspeex\mdf.c" > </File> <File - RelativePath="..\..\..\..\speex\libspeex\misc.c" + RelativePath="..\..\..\..\speex\libspeex\modes.c" > </File> <File - RelativePath="..\..\..\..\speex\libspeex\modes.c" + RelativePath="..\..\..\..\speex\libspeex\modes_wb.c" > </File> <File @@ -364,10 +364,6 @@ > </File> <File - RelativePath="..\..\..\..\speex\libspeex\misc.h" - > - </File> - <File RelativePath="..\..\..\..\speex\libspeex\modes.h" > </File> Modified: trunk/contrib/win/vs2005/libtheora.vcproj =================================================================== --- trunk/contrib/win/vs2005/libtheora.vcproj 2008-02-07 16:52:48 UTC (rev 1346) +++ trunk/contrib/win/vs2005/libtheora.vcproj 2008-02-25 17:26:04 UTC (rev 1347) @@ -101,8 +101,8 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\..\..\libtheora\include;..\..\..\..\libogg\include" - PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;_WIN32_WINNT=0x0500;WINVER=0x0500" + AdditionalIncludeDirectories="..\..\..\..\libtheora\lib\enc;..\..\..\..\libtheora\include;..\..\..\..\libogg\include" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_LIB;NTDDI_VERSION=NTDDI_WIN2KSP4;TH_REALLY_NO_ASSEMBLY;_WIN32_WINNT=0x0500;WINVER=0x0500" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -147,93 +147,165 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File - RelativePath="..\..\..\..\libtheora\lib\blockmap.c" + RelativePath="..\..\..\..\libtheora\lib\dec\apiwrapper.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\comment.c" + RelativePath="..\..\..\..\libtheora\lib\enc\blockmap.c" > </File> <File + RelativePath="..\..\..\..\libtheora\lib\enc\common.c" + > + </File> + <File RelativePath="..\..\..\..\libtheora\lib\cpu.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\dct.c" + RelativePath="..\..\..\..\libtheora\lib\enc\dct.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\dct_decode.c" + RelativePath="..\..\..\..\libtheora\lib\enc\dct_decode.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\dct_encode.c" + RelativePath="..\..\..\..\libtheora\lib\enc\dct_encode.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\decode.c" + RelativePath="..\..\..\..\libtheora\lib\dec\decapiwrapper.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\dsp.c" + RelativePath="..\..\..\..\libtheora\lib\dec\decinfo.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\encode.c" + RelativePath="..\..\..\..\libtheora\lib\dec\decode.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\encoder_toplevel.c" + RelativePath="..\..\..\..\libtheora\lib\dec\dequant.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\frarray.c" + RelativePath="..\..\..\..\libtheora\lib\enc\dsp.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\frinit.c" + RelativePath="..\..\..\..\libtheora\lib\enc\x86_32_vs\dsp_mmx.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\huffman.c" + RelativePath="..\..\..\..\libtheora\lib\enc\encode.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\idct.c" + RelativePath="..\..\..\..\libtheora\lib\enc\encoder_huffman.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\mcomp.c" + RelativePath="..\..\..\..\libtheora\lib\enc\encoder_idct.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\misc_common.c" + RelativePath="..\..\..\..\libtheora\lib\enc\encoder_quant.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\pb.c" + RelativePath="..\..\..\..\libtheora\lib\enc\encoder_toplevel.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\pp.c" + RelativePath="..\..\..\..\libtheora\lib\enc\x86_32_vs\fdct_mmx.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\quant.c" + RelativePath="..\..\..\..\libtheora\lib\dec\fragment.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\reconstruct.c" + RelativePath="..\..\..\..\libtheora\lib\enc\frarray.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\scan.c" + RelativePath="..\..\..\..\libtheora\lib\enc\frinit.c" > </File> <File - RelativePath="..\..\..\..\libtheora\lib\toplevel.c" + RelativePath="..\..\..\..\libtheora\lib\dec\huffdec.c" > </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\idct.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\info.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\internal.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\enc\mcomp.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\enc\misc_common.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\x86\mmxfrag.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\x86\mmxidct.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\x86\mmxstate.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\enc\pb.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\enc\pp.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\quant.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\enc\x86_32_vs\recon_mmx.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\enc\reconstruct.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\enc\scan.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\state.c" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\x86\x86int.h" + > + </File> + <File + RelativePath="..\..\..\..\libtheora\lib\dec\x86\x86state.c" + > + </File> </Filter> <Filter Name="Header Files" @@ -244,6 +316,10 @@ > </File> <File + RelativePath="..\..\..\..\libtheora\lib\enc\codec_internal.h" + > + </File> + <File RelativePath="..\..\..\..\libtheora\lib\encoder_internal.h" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-07 16:52:43
|
Revision: 1346 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1346&view=rev Author: sbalea Date: 2008-02-07 08:52:48 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Update README.speex Modified Paths: -------------- branches/team/mihai/echocan/README.speex Modified: branches/team/mihai/echocan/README.speex =================================================================== --- branches/team/mihai/echocan/README.speex 2008-02-07 16:51:50 UTC (rev 1345) +++ branches/team/mihai/echocan/README.speex 2008-02-07 16:52:48 UTC (rev 1346) @@ -1,5 +1,2 @@ Echo cancellation features depend on the very latest version of the speex codec. -To build this version of iaxclient you need one of the following: -- a patched version of speex-1.2beta2. There are two patches included with -iaxclient that need to be applied (in any order). -- the latest development code, available via git from http://git.xiph.org/speex.git +Currently, this is speex-1.2beta3. \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-07 16:51:50
|
Revision: 1345 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1345&view=rev Author: sbalea Date: 2008-02-07 08:51:50 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Remove speex-1.2beta2 patches; they're no longer needed since we require speex-1.2beta3 anyways Removed Paths: ------------- branches/team/mihai/echocan/speex-1.2beta2-loudness.patch branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch Deleted: branches/team/mihai/echocan/speex-1.2beta2-loudness.patch =================================================================== --- branches/team/mihai/echocan/speex-1.2beta2-loudness.patch 2008-02-07 16:50:56 UTC (rev 1344) +++ branches/team/mihai/echocan/speex-1.2beta2-loudness.patch 2008-02-07 16:51:50 UTC (rev 1345) @@ -1,26 +0,0 @@ -diff -urN speex-1.2beta2.orig/include/speex/speex_preprocess.h speex-1.2beta2/include/speex/speex_preprocess.h ---- speex-1.2beta2.orig/include/speex/speex_preprocess.h 2007-01-23 06:59:04.000000000 -0500 -+++ speex-1.2beta2/include/speex/speex_preprocess.h 2007-10-29 12:06:48.000000000 -0400 -@@ -178,6 +178,9 @@ - /** Get maximal gain in dB (int32) */ - #define SPEEX_PREPROCESS_GET_AGC_MAX_GAIN 31 - -+/** Get loudness */ -+#define SPEEX_PREPROCESS_GET_AGC_LOUDNESS 32 -+ - #ifdef __cplusplus - } - #endif -diff -urN speex-1.2beta2.orig/libspeex/preprocess.c speex-1.2beta2/libspeex/preprocess.c ---- speex-1.2beta2.orig/libspeex/preprocess.c 2007-05-03 05:22:04.000000000 -0400 -+++ speex-1.2beta2/libspeex/preprocess.c 2007-10-29 13:35:53.000000000 -0400 -@@ -1163,6 +1163,9 @@ - case SPEEX_PREPROCESS_GET_ECHO_STATE: - ptr = (void*)st->echo_state; - break; -+ case SPEEX_PREPROCESS_GET_AGC_LOUDNESS: -+ (*(spx_int32_t*)ptr) = pow(st->loudness, 1.0/LOUDNESS_EXP); -+ break; - - default: - speex_warning_int("Unknown speex_preprocess_ctl request: ", request); Deleted: branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch =================================================================== --- branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch 2008-02-07 16:50:56 UTC (rev 1344) +++ branches/team/mihai/echocan/speex-1.2beta2-vad-probs.patch 2008-02-07 16:51:50 UTC (rev 1345) @@ -1,24 +0,0 @@ -diff -urN speex-1.2beta2.orig/libspeex/preprocess.c speex-1.2beta2/libspeex/preprocess.c ---- speex-1.2beta2.orig/libspeex/preprocess.c 2007-05-03 05:22:04.000000000 -0400 -+++ speex-1.2beta2/libspeex/preprocess.c 2007-11-05 14:34:37.000000000 -0500 -@@ -1124,16 +1124,16 @@ - break; - - case SPEEX_PREPROCESS_SET_PROB_START: -- *(spx_int32_t*)ptr = MIN32(Q15_ONE,MAX32(0, *(spx_int32_t*)ptr)); -- st->speech_prob_start = DIV32_16(MULT16_16(32767,*(spx_int32_t*)ptr), 100); -+ *(spx_int32_t*)ptr = MIN32(100,MAX32(0, *(spx_int32_t*)ptr)); -+ st->speech_prob_start = DIV32_16(MULT16_16(Q15ONE,*(spx_int32_t*)ptr), 100); - break; - case SPEEX_PREPROCESS_GET_PROB_START: - (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob_start, 100); - break; - - case SPEEX_PREPROCESS_SET_PROB_CONTINUE: -- *(spx_int32_t*)ptr = MIN32(Q15_ONE,MAX32(0, *(spx_int32_t*)ptr)); -- st->speech_prob_continue = DIV32_16(MULT16_16(32767,*(spx_int32_t*)ptr), 100); -+ *(spx_int32_t*)ptr = MIN32(100,MAX32(0, *(spx_int32_t*)ptr)); -+ st->speech_prob_continue = DIV32_16(MULT16_16(Q15ONE,*(spx_int32_t*)ptr), 100); - break; - case SPEEX_PREPROCESS_GET_PROB_CONTINUE: - (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob_continue, 100); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-07 16:51:02
|
Revision: 1344 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1344&view=rev Author: sbalea Date: 2008-02-07 08:50:56 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Merge speex-1.2beta3 changes from trunk. Modified Paths: -------------- branches/team/mihai/echocan/configure.ac branches/team/mihai/echocan/lib/Makefile.am branches/team/mihai/echocan/lib/audio_encode.c branches/team/mihai/echocan/m4/speex.m4 Modified: branches/team/mihai/echocan/configure.ac =================================================================== --- branches/team/mihai/echocan/configure.ac 2008-02-06 00:09:00 UTC (rev 1343) +++ branches/team/mihai/echocan/configure.ac 2008-02-07 16:50:56 UTC (rev 1344) @@ -227,6 +227,12 @@ obtain a copy. ])) +PKG_CHECK_MODULES(SPEEXDSP, [speexdsp >= 1.2],,AC_MSG_ERROR([ + speexdsp is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. +])) + has_theora=no if test ! x$with_theora = xno; then PKG_CHECK_MODULES(THEORA, [theora >= 1.0alpha7],has_theora=yes) Modified: branches/team/mihai/echocan/lib/Makefile.am =================================================================== --- branches/team/mihai/echocan/lib/Makefile.am 2008-02-06 00:09:00 UTC (rev 1343) +++ branches/team/mihai/echocan/lib/Makefile.am 2008-02-07 16:50:56 UTC (rev 1344) @@ -12,6 +12,7 @@ AM_CFLAGS = \ $(PTHREAD_CFLAGS) \ $(SPEEX_CFLAGS) \ + $(SPEEXDSP_CFLAGS) \ $(IAX2_CFLAGS) \ $(PORTAUDIO_CFLAGS) @@ -25,7 +26,8 @@ $(PTHREAD_LIBS) \ $(IAX2_LIBS) \ $(PORTAUDIO_LIBS) \ - $(SPEEX_LIBS) + $(SPEEX_LIBS) \ + $(SPEEXDSP_LIBS) AM_LDFLAGS = \ -no-undefined \ Modified: branches/team/mihai/echocan/lib/audio_encode.c =================================================================== --- branches/team/mihai/echocan/lib/audio_encode.c 2008-02-06 00:09:00 UTC (rev 1343) +++ branches/team/mihai/echocan/lib/audio_encode.c 2008-02-07 16:50:56 UTC (rev 1344) @@ -197,9 +197,9 @@ if ( (i & 0x3f) == 0 ) { - int loudness; + float loudness; speex_preprocess_ctl(st, SPEEX_PREPROCESS_GET_AGC_LOUDNESS, &loudness); - if ( loudness > AAGC_HOT || loudness < AAGC_COLD ) + if ( loudness > 8000.0f || loudness < 4000.0f ) { const float level = iaxc_input_level_get(); Modified: branches/team/mihai/echocan/m4/speex.m4 =================================================================== --- branches/team/mihai/echocan/m4/speex.m4 2008-02-06 00:09:00 UTC (rev 1343) +++ branches/team/mihai/echocan/m4/speex.m4 2008-02-07 16:50:56 UTC (rev 1344) @@ -41,7 +41,7 @@ SPEEX_LIBS="-L$prefix/lib" fi - SPEEX_LIBS="$SPEEX_LIBS -lspeex" + SPEEX_LIBS="$SPEEX_LIBS -lspeex -lspeexdsp" if test "x$speex_includes" != "x" ; then SPEEX_CFLAGS="-I$speex_includes" @@ -60,7 +60,7 @@ LIBS="$LIBS $SPEEX_LIBS" dnl Check for a working version of speex that is of the right version. -min_speex_version=ifelse([$1], ,1.0.0,$1) +min_speex_version=ifelse([$1], ,1.2.0,$1) AC_MSG_CHECKING(for speex headers version >= $min_speex_version) #no_speex="" speex_min_major_version=`echo $min_speex_version | \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-06 00:08:55
|
Revision: 1343 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1343&view=rev Author: sbalea Date: 2008-02-05 16:09:00 -0800 (Tue, 05 Feb 2008) Log Message: ----------- Do not use const for variables that actually change. Modified Paths: -------------- trunk/lib/audio_encode.c Modified: trunk/lib/audio_encode.c =================================================================== --- trunk/lib/audio_encode.c 2008-02-06 00:00:52 UTC (rev 1342) +++ trunk/lib/audio_encode.c 2008-02-06 00:09:00 UTC (rev 1343) @@ -168,7 +168,7 @@ if ( (i & 0x3f) == 0 ) { - const float loudness; + float loudness; speex_preprocess_ctl(st, SPEEX_PREPROCESS_GET_AGC_LOUDNESS, &loudness); if ( loudness > 8000.0f || loudness < 4000.0f ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sb...@us...> - 2008-02-06 00:00:47
|
Revision: 1342 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1342&view=rev Author: sbalea Date: 2008-02-05 16:00:52 -0800 (Tue, 05 Feb 2008) Log Message: ----------- Fix return values in a couple of functions (eliminate some compile warnings) Modified Paths: -------------- trunk/lib/iaxclient.h trunk/lib/iaxclient_lib.c Modified: trunk/lib/iaxclient.h =================================================================== --- trunk/lib/iaxclient.h 2008-02-05 23:56:33 UTC (rev 1341) +++ trunk/lib/iaxclient.h 2008-02-06 00:00:52 UTC (rev 1342) @@ -1372,7 +1372,7 @@ Sets the IAX debug set to \a enable. \param enable If non-zero enable iax protocol debugging */ -EXPORT int iaxc_debug_iax_set(int enable); +EXPORT void iaxc_debug_iax_set(int enable); #ifdef __cplusplus } Modified: trunk/lib/iaxclient_lib.c =================================================================== --- trunk/lib/iaxclient_lib.c 2008-02-05 23:56:33 UTC (rev 1341) +++ trunk/lib/iaxclient_lib.c 2008-02-06 00:00:52 UTC (rev 1342) @@ -1241,7 +1241,7 @@ EXPORT int iaxc_register(const char * user, const char * pass, const char * host) { - iaxc_register_ex(user, pass, host, 60); + return iaxc_register_ex(user, pass, host, 60); } EXPORT int iaxc_register_ex(const char * user, const char * pass, const char * host, int refresh) @@ -1967,13 +1967,13 @@ return 0; } -int iaxc_debug_iax_set(int enable) +void iaxc_debug_iax_set(int enable) { #ifdef DEBUG_SUPPORT if (enable) iax_enable_debug(); else iax_disable_debug(); -#endif +#endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |