- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12023 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: shaneb Date: Sat Feb 14 21:28:18 2009 New Revision: 12023 Log: Removed libresample Modified: freeswitch/trunk/src/CMakeLists.txt Modified: freeswitch/trunk/src/CMakeLists.txt ============================================================================== --- freeswitch/trunk/src/CMakeLists.txt (original) +++ freeswitch/trunk/src/CMakeLists.txt Sat Feb 14 21:28:18 2009 @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6) -INCLUDE_DIRECTORIES(include/ ../libs/libresample/include/ ../libs/srtp/crypto/include/ ../libs/srtp/include/) +INCLUDE_DIRECTORIES(include/ ../libs/libresample/include/ ../libs/srtp/crypto/include/ ../libs/srtp/include/ ../libs/speex/include/) if( HAVE_NETDB_H) add_definitions( -DHAVE_NETDB_H)

1 0

[commit] r12022 - freeswitch/trunk
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: shaneb Date: Sat Feb 14 21:27:35 2009 New Revision: 12022 Log: Removed libresample Modified: freeswitch/trunk/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt ============================================================================== --- freeswitch/trunk/CMakeLists.txt (original) +++ freeswitch/trunk/CMakeLists.txt Sat Feb 14 21:27:35 2009 @@ -63,6 +63,12 @@ check_include_file (execinfo.h HAVE_EXECINFO_H) check_include_file (memory.h HAVE_MEMORY_H) check_include_file (inttypes.h HAVE_INTTYPES_H) +check_include_file (strings.h HAVE_STRINGS_H) +check_include_file (string.h HAVE_STRING_H) +check_include_file (sys/filio.h HAVE_SYS_FILIO_H) +check_include_file (sys/ndir.h HAVE_SYS_NDIR_H) +CHECK_INCLUDE_FILE(netdb.h HAVE_NETDB_H) + check_include_file (sys/ioctl.h HAVE_SYS_IOCTL_H) check_include_file (sys/utsname.h HAVE_SYS_UTSNAME_H) @@ -110,6 +116,8 @@ OPTION( DEBUG "Debug" OFF ) OPTION( DISABLE_RESAMPLE "Disable RESAMPLE" OFF ) OPTION( HAVE_ODBC "Enable Core ODBC Support" ON ) + OPTION( OPTIMZER "Enable Optimization" OFF ) + CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/src/include/switch_private.h.cmake ${CMAKE_SOURCE_DIR}/src/include/switch_private.h ) @@ -158,22 +166,12 @@ # DO APR -#FIND_PACKAGE (APR) -#FIND_PACKAGE (APRUtil) -#LINK_LIBRARIES (${APR_LIBS} ${APRUTIL_LIBS}) +INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/apr/include/ ${CMAKE_SOURCE_DIR}/libs/apr-util/include/) LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/apr/.libs/libapr-1.a) LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/apr-util/.libs/libaprutil-1.a) - -MESSAGE( STATUS "APR INFO------------------------------------------" ) -MESSAGE( STATUS "APR_LIBS = ${APR_LIBS}" ) -MESSAGE( STATUS "APRUTIL_LIBS = ${APRUTIL_LIBS}" ) -MESSAGE( STATUS "--------------------------------------------------" ) -#INCLUDE_DIRECTORIES (${APR_INCLUDES} ${APRUTIL_INCLUDES}) - - # DO SNDFILE FIND_PACKAGE (Sndfile) @@ -214,6 +212,11 @@ LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/voipcodecs/src/.libs/libvoipcodecs.a) INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/voipcodecs/src/) +# libspeexdsp +LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/speex/libspeex/.libs/libspeexdsp.a) +INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/speex/include/) + + # DO POSTGRES #FIND_PACKAGE(POSTGRES) IF(POSTGRES_FOUND) @@ -230,16 +233,14 @@ -CHECK_INCLUDE_FILE(netdb.h HAVE_NETDB_H) -if( HAVE_NETDB_H) - add_definitions( -DHAVE_NETDB_H) -endif( HAVE_NETDB_H) + + INCLUDE_DIRECTORIES(src/include/ libs/libteletone/src/ libs/stfu/ libs/apr/include/ libs/apr-util/include/) ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(libs/libresample/) +#ADD_SUBDIRECTORY(libs/libresample/) ADD_SUBDIRECTORY(libs/libteletone/) #ADD_SUBDIRECTORY(libs/sqlite/) ADD_SUBDIRECTORY(libs/pcre/) @@ -251,6 +252,6 @@ ADD_EXECUTABLE(freeswitch ${freeswitch_SRCS}) -TARGET_LINK_LIBRARIES(freeswitch teletone pcre resample freeswitch_la stfu ${optionalLibs}) +TARGET_LINK_LIBRARIES(freeswitch teletone pcre freeswitch_la stfu ${optionalLibs})

1 0

[commit] r12021 - in freeswitch/trunk: . libs/libresample src w32/Library
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: mikej Date: Sat Feb 14 21:20:16 2009 New Revision: 12021 Log: remove libresample Removed: freeswitch/trunk/libs/libresample/ Modified: freeswitch/trunk/Freeswitch.2005.unsupported.sln freeswitch/trunk/Freeswitch.2008.express.sln freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/bootstrap.sh freeswitch/trunk/src/switch_resample.c freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Modified: freeswitch/trunk/Freeswitch.2005.unsupported.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2005.unsupported.sln (original) +++ freeswitch/trunk/Freeswitch.2005.unsupported.sln Sat Feb 14 21:20:16 2009 @@ -15,7 +15,6 @@ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} {E42FDC95-7243-4219-9EA4-ACCE4AB97197} = {E42FDC95-7243-4219-9EA4-ACCE4AB97197} EndProjectSection EndProject @@ -205,8 +204,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre Generate pcre_chartables.c", "libs\win32\pcre\pcre_chartables.c.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "libs\win32\libresample\libresample.vcproj", "{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.vcproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" @@ -1003,12 +1000,6 @@ {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.ActiveCfg = Release|Win32 {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.Build.0 = Release|Win32 {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|x64.ActiveCfg = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|Win32.ActiveCfg = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|Win32.Build.0 = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|x64.ActiveCfg = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|Win32.ActiveCfg = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|Win32.Build.0 = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|x64.ActiveCfg = Release|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.ActiveCfg = Debug|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.Build.0 = Debug|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1387,7 +1378,6 @@ {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1CED5987-A529-46DC-B30F-870D85FF9C94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} Modified: freeswitch/trunk/Freeswitch.2008.express.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.express.sln (original) +++ freeswitch/trunk/Freeswitch.2008.express.sln Sat Feb 14 21:20:16 2009 @@ -9,7 +9,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.2008.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} @@ -177,8 +176,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre Generate pcre_chartables.c", "libs\win32\pcre\pcre_chartables.c.2008.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "libs\win32\libresample\libresample.2008.vcproj", "{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.2008.vcproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.2008.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" @@ -788,12 +785,6 @@ {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.ActiveCfg = Release|Win32 {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.Build.0 = Release|Win32 {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|x64.ActiveCfg = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|Win32.ActiveCfg = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|Win32.Build.0 = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|x64.ActiveCfg = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|Win32.ActiveCfg = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|Win32.Build.0 = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|x64.ActiveCfg = Release|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.ActiveCfg = Debug|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.Build.0 = Debug|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|x64.ActiveCfg = Debug|Win32 Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Sat Feb 14 21:20:16 2009 @@ -382,7 +382,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.2008.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} @@ -550,8 +549,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre Generate pcre_chartables.c", "libs\win32\pcre\pcre_chartables.c.2008.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libresample", "libs\win32\libresample\libresample.2008.vcproj", "{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.2008.vcproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.2008.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" @@ -1166,12 +1163,6 @@ {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.ActiveCfg = Release|Win32 {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|Win32.Build.0 = Release|Win32 {1CED5987-A529-46DC-B30F-870D85FF9C94}.Release|x64.ActiveCfg = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|Win32.ActiveCfg = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|Win32.Build.0 = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Debug|x64.ActiveCfg = Debug|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|Win32.ActiveCfg = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|Win32.Build.0 = Release|Win32 - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}.Release|x64.ActiveCfg = Release|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.ActiveCfg = Debug|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|Win32.Build.0 = Debug|Win32 {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1798,7 +1789,6 @@ {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {1CED5987-A529-46DC-B30F-870D85FF9C94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Sat Feb 14 21:20:16 2009 @@ -4,7 +4,7 @@ BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; SUBDIRS="codec/ilbc curl iksemel voipcodecs \ - js js/nsprpub libdingaling libedit libresample libsndfile pcre sofia-sip \ + js js/nsprpub libdingaling libedit libsndfile pcre sofia-sip \ speex sqlite srtp openzap spandsp"; Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Sat Feb 14 21:20:16 2009 @@ -35,9 +35,7 @@ #ifndef WIN32 #include <switch_private.h> #endif -#ifndef DISABLE_RESAMPLE #include <speex/speex_resampler.h> -#endif #define NORMFACT (float)0x8000 #define MAXSAMPLE (float)0x7FFF @@ -60,11 +58,6 @@ int quality, const char *file, const char *func, int line) { - -#ifdef DISABLE_RESAMPLE - *new_resampler = NULL; - return SWITCH_STATUS_NOTIMPL; -#else int err = 0; switch_audio_resampler_t *resampler; double lto_rate, lfrom_rate; @@ -89,32 +82,25 @@ resampler->to = malloc(resampler->to_size * sizeof(int16_t)); return SWITCH_STATUS_SUCCESS; -#endif } SWITCH_DECLARE(uint32_t) switch_resample_process(switch_audio_resampler_t *resampler, int16_t *src, uint32_t srclen) { -#ifdef DISABLE_RESAMPLE - return 0; -#else resampler->to_len = resampler->to_size; speex_resampler_process_int(resampler->resampler, 0, src, &srclen, resampler->to, &resampler->to_len); return resampler->to_len; -#endif } SWITCH_DECLARE(void) switch_resample_destroy(switch_audio_resampler_t **resampler) { if (resampler && *resampler) { -#ifndef DISABLE_RESAMPLE if ((*resampler)->resampler) { speex_resampler_destroy((*resampler)->resampler); } free((*resampler)->to); free(*resampler); -#endif *resampler = NULL; } } Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Sat Feb 14 21:20:16 2009 @@ -44,7 +44,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -136,7 +136,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="2" Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Sat Feb 14 21:20:16 2009 @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -135,7 +135,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libresample\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu" + AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="2" @@ -555,11 +555,11 @@ > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File

1 0

[commit] r12020 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: brian Date: Sat Feb 14 21:12:57 2009 New Revision: 12020 Log: tweak Modified: freeswitch/trunk/src/switch_resample.c Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Sat Feb 14 21:12:57 2009 @@ -36,10 +36,8 @@ #include <switch_private.h> #endif #ifndef DISABLE_RESAMPLE -#include <libresample.h> -#endif - #include <speex/speex_resampler.h> +#endif #define NORMFACT (float)0x8000 #define MAXSAMPLE (float)0x7FFF

1 0

[commit] r12019 - freeswitch/trunk
by FreeSWITCH SVN 15 Feb '09

15 Feb '09

Author: brian Date: Sat Feb 14 20:40:43 2009 New Revision: 12019 Log: removing libresample Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sat Feb 14 20:40:43 2009 @@ -146,11 +146,10 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -CORE_CFLAGS += $(RESAMPLE_CFLAGS) CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la -CORE_LIBS += libs/srtp/libsrtp.la $(RESAMPLE_LIB) +CORE_LIBS += libs/srtp/libsrtp.la lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS) @@ -310,12 +309,6 @@ @cd libs/srtp && $(MAKE) @$(TOUCH_TARGET) -if USE_INTREE_RESAMPLE -libs/libresample/libresample.la: libs/libresample libs/libresample/.update - @cd libs/libresample && $(MAKE) - @$(TOUCH_TARGET) -endif - core: $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sat Feb 14 20:40:43 2009 @@ -88,27 +88,6 @@ AX_CC_MAXOPT fi - -# Optional Features - -AC_ARG_ENABLE(resample, -[AC_HELP_STRING([--disable-resample],[build without embedded resampler])],[enable_resample="$enableval"],[enable_resample="yes"]) - -# We should add checking for out of tree libresample here -RESAMPLE_LIB= -RESAMPLE_CFLAGS= -if test "${enable_resample}" = "yes"; then - RESAMPLE_LIB="libs/libresample/libresample.la" - RESAMPLE_CFLAGS="-I${switch_srcdir}/libs/libresample/include" -else - AC_DEFINE([DISABLE_RESAMPLE],[],[Disable the embedded resampler]) -fi - -AC_SUBST(RESAMPLE_LIB) -AC_SUBST(RESAMPLE_CFLAGS) - -AM_CONDITIONAL([USE_INTREE_RESAMPLE],[test "${enable_resample}" = "yes"]) - # set defaults for use on all platforms SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src"

1 0

[commit] r12018 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua: soa sresolv su
by FreeSWITCH SVN 14 Feb '09

14 Feb '09

Author: mrene Date: Sat Feb 14 17:18:53 2009 New Revision: 12018 Log: Fix sofia build on non-ipv6 hosts Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa.c Sat Feb 14 17:18:53 2009 @@ -2526,9 +2526,9 @@ break; else if (!li6) li6 = li; /* Best IP6 address */ - } + } else #endif - else if (li->li_family == AF_INET) { + if (li->li_family == AF_INET) { if (ip4 >= ip6) break; else if (!li4) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c Sat Feb 14 17:18:53 2009 @@ -1526,7 +1526,6 @@ char const *target = srs->srs_target; su_addrinfo_t ai[1]; su_sockaddr_t su[1]; - char buffer[64]; int i; memset(ai, 0, (sizeof ai)); @@ -1551,6 +1550,7 @@ } } else if (host_is_ip6_reference(target)) { + char buffer[64]; size_t len = strlen(target) - 2; ai->ai_addr = memset(su, 0, (sizeof su->su_sin6)); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c Sat Feb 14 17:18:53 2009 @@ -96,7 +96,10 @@ #endif static int li_scope4(uint32_t ip4); + +#ifdef SU_HAVE_IN6 static int li_scope6(struct in6_addr const *ip6); +#endif #if !SU_LOCALINFO_TEST

1 0

[commit] r12017 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by FreeSWITCH SVN 14 Feb '09

14 Feb '09

Author: mikej Date: Sat Feb 14 16:56:27 2009 New Revision: 12017 Log: only declare var if we need it (SFSIP-122) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c Sat Feb 14 16:56:27 2009 @@ -629,7 +629,6 @@ struct ifreq ifreq[1]; int scope, if_index, flags = 0, gni_flags = 0; char *if_name; - su_sockaddr_t su2[1]; #if SA_LEN if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_addr)) @@ -747,6 +746,7 @@ #if SU_HAVE_IN6 if (su_xtra) { + su_sockaddr_t su2[1]; /* Map IPv4 address to IPv6 address */ memset(su2, 0, sizeof(*su2)); su2->su_family = AF_INET6;

1 0

[commit] r12016 - freeswitch/branches/gmaruzz/mod_skypiax/asterisk
by FreeSWITCH SVN 14 Feb '09

14 Feb '09

Author: gmaruzz Date: Sat Feb 14 16:25:55 2009 New Revision: 12016 Log: skypiax: the 'skypiax_skype' CLI command was mistakenly renamed 'skypiax_' Back to the old name Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile Sat Feb 14 16:25:55 2009 @@ -22,15 +22,15 @@ #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_12/include #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_14/include #AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include -AST_INCLUDE_DIR=/home/user/devel/asterisk-1.6.0.5/include +AST_INCLUDE_DIR=/home/user/devel/asterisk-1.4.23.1/include #ASTERISK CFLAGS+=-DASTERISK #ASTERISK VERSION #Uncomment one of the following lines to match your Asterisk series -#CFLAGS+=-DASTERISK_VERSION_1_4 -CFLAGS+=-DASTERISK_VERSION_1_6 +CFLAGS+=-DASTERISK_VERSION_1_4 +#CFLAGS+=-DASTERISK_VERSION_1_6 #CFLAGS+=-DASTERISK_VERSION_1_2 #LINUX SKYPE SUPPORT (Celliax for Cygwin always supports Skype) Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c Sat Feb 14 16:25:55 2009 @@ -36,7 +36,7 @@ " chan_skypiax adds to Asterisk the following CLI commands:\n" " \n" " CLI COMMANDS:\n" " skypiax_hangup\n" " skypiax_dial\n" " skypiax_console\n" " skypiax_playback_boost\n" - " skypiax_capture_boost\n" " skypiax_\n" + " skypiax_capture_boost\n" " skypiax_skype\n" " skypiax_dir_import\n" "\n" " You can type 'help [command]' to obtain more specific info on usage.\n" " \n"; @@ -67,7 +67,7 @@ " If the parameter is \"show\", the available interfaces are listed\n"; char skypiax_console_skype_usage[] = - "Usage: skypiax_ [command string]\n" + "Usage: skypiax_skype [command string]\n" " Send the 'command string' skype_msg to the Skype client connected to the \"current\" skypiax_console (Skypiax) channel.\n" " Enter 'help skypiax_console' on how to change the \"current\" skypiax_console\n"; @@ -157,7 +157,7 @@ skypiax_console_capture_boost_usage}, {{"skypiax_usage", NULL}, skypiax_console_skypiax, "chan_skypiax commands info", skypiax_console_skypiax_usage}, - {{"skypiax_", NULL}, skypiax_console_skype, "Skype msg", + {{"skypiax_skype", NULL}, skypiax_console_skype, "Skype msg", skypiax_console_skype_usage}, {{"skypiax_dial", NULL}, skypiax_console_dial, "Dial an extension on the skypiax_console",

1 0

[commit] r12015 - freeswitch/branches/gmaruzz/mod_skypiax/asterisk
by FreeSWITCH SVN 14 Feb '09

14 Feb '09

Author: gmaruzz Date: Sat Feb 14 15:46:57 2009 New Revision: 12015 Log: skypiax: * 1.6 changed CLI mechanism, so disable compilation of our CLIs for 1.6 until our CLIs updated. Works for 1.4 and 1.2 Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/Makefile Sat Feb 14 15:46:57 2009 @@ -21,7 +21,8 @@ #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_160/include #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_12/include #AST_INCLUDE_DIR=/home/maruzz/devel/svn_asterisk_branches_14/include -AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include +#AST_INCLUDE_DIR=/home/maruzz/devel/svn_celliax_trunk/asterisk-1.2.rev137401/include +AST_INCLUDE_DIR=/home/user/devel/asterisk-1.6.0.5/include #ASTERISK CFLAGS+=-DASTERISK @@ -29,8 +30,8 @@ #ASTERISK VERSION #Uncomment one of the following lines to match your Asterisk series #CFLAGS+=-DASTERISK_VERSION_1_4 -#CFLAGS+=-DASTERISK_VERSION_1_6 -CFLAGS+=-DASTERISK_VERSION_1_2 +CFLAGS+=-DASTERISK_VERSION_1_6 +#CFLAGS+=-DASTERISK_VERSION_1_2 #LINUX SKYPE SUPPORT (Celliax for Cygwin always supports Skype) SKYPE_LIB=-L/usr/X11R6/lib -lX11 Modified: freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/asterisk/chan_skypiax.c Sat Feb 14 15:46:57 2009 @@ -130,6 +130,23 @@ */ struct skypiax_pvt *skypiax_iflist = NULL; +#ifdef ASTERISK_VERSION_1_6 +struct ast_cli_entry myclis[] = { +/* + * CLI do not works since some time on 1.6, they changed the CLI mechanism + */ +#if 0 + AST_CLI_DEFINE(skypiax_console_hangup, "Hangup a call on the console"), + AST_CLI_DEFINE(skypiax_console_dial, "Dial an extension on the console"), + AST_CLI_DEFINE(skypiax_console_playback_boost, "Sets/displays spk boost in dB"), + AST_CLI_DEFINE(skypiax_console_capture_boost, "Sets/displays mic boost in dB"), + AST_CLI_DEFINE(skypiax_console_set_active, "Sets/displays active console"), + AST_CLI_DEFINE(skypiax_console_skype, "Sends a Skype command"), + AST_CLI_DEFINE(skypiax_console_skypiax_dir_import, "imports entries from cellphone"), + AST_CLI_DEFINE(skypiax_console_skypiax, "all things skypiax"), + #endif +}; +#else struct ast_cli_entry myclis[] = { {{"skypiax_hangup", NULL}, skypiax_console_hangup, "Hangup a call on the skypiax_console", @@ -152,6 +169,7 @@ "Write the directoriax.conf file, used by directoriax app", skypiax_console_skypiax_dir_import_usage}, }; +#endif /* IMPLEMENTATION */

1 0

[commit] r12014 - freeswitch/trunk/src
by FreeSWITCH SVN 14 Feb '09

14 Feb '09

Author: mrene Date: Sat Feb 14 15:26:30 2009 New Revision: 12014 Log: MODLANG-99 Work around broken uClibc Modified: freeswitch/trunk/src/switch_dso.c Modified: freeswitch/trunk/src/switch_dso.c ============================================================================== --- freeswitch/trunk/src/switch_dso.c (original) +++ freeswitch/trunk/src/switch_dso.c Sat Feb 14 15:26:30 2009 @@ -97,7 +97,13 @@ } if (lib == NULL) { - *err = strdup(dlerror()); + const char *dlerr = dlerror(); + /* Work around broken uclibc returning NULL on both dlopen() and dlerror() */ + if (dlerr) { + *err = strdup(dlerr); + } else { + *err = strdup("Unknown error"); + } } return lib; }

1 0