- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3930 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 08 Jan '07

08 Jan '07

Author: anthm Date: Mon Jan 8 12:19:59 2007 New Revision: 3930 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: minor tweaks in conference Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jan 8 12:19:59 2007 @@ -207,7 +207,6 @@ uint32_t id; switch_core_session_t *session; conference_obj_t *conference; - conference_obj_t *last_conference; switch_memory_pool_t *pool; switch_buffer_t *audio_buffer; switch_buffer_t *mux_buffer; @@ -461,7 +460,7 @@ switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->flag_mutex); - member->conference = member->last_conference = conference; + member->conference = conference; member->next = conference->members; member->energy_level = conference->energy_level; conference->members = member; @@ -2548,10 +2547,12 @@ switch_hash_this(hi, NULL, NULL, &val); conference = (conference_obj_t *) val; - stream->write_function(stream, "Conference %s (%u member%s)\n", + stream->write_function(stream, "Conference %s (%u member%s%s)\n", conference->name, conference->count, - conference->count == 1 ? "" : "s"); + conference->count == 1 ? "" : "s", + switch_test_flag(conference, CFLAG_LOCKED) ? " locked" : "" + ); if (pretty) { conference_list_pretty(conference, stream); } else { @@ -2896,7 +2897,7 @@ char *profile_name; switch_xml_t cxml = NULL, cfg = NULL, profiles = NULL; - if (!(member = conference_member_get(conference, id))) { + if (!id || !(member = conference_member_get(conference, id))) { stream->write_function(stream, "No Member %u in conference %s.\n", id, conference->name); continue; } @@ -2919,21 +2920,23 @@ if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + } else { + profile_name = "default"; + } + + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } - - if ((profiles = switch_xml_child(cfg, "profiles"))) { - xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); - } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); + if ((profiles = switch_xml_child(cfg, "profiles"))) { + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); #ifdef OPTION_IVR_MENU_SUPPORT - xml_cfg.menus = switch_xml_child(cfg, "menus"); + xml_cfg.menus = switch_xml_child(cfg, "menus"); #endif - } /* Release the config registry handle */ if (cxml) { @@ -2958,13 +2961,18 @@ /* Indicate the conference is dynamic */ switch_set_flag_locked(new_conference, CFLAG_DYNAMIC); + switch_mutex_lock(new_conference->mutex); + /* Start the conference thread for this conference */ launch_conference_thread(new_conference); + } else { + switch_mutex_lock(new_conference->mutex); } /* move the member from the old conference to the new one */ - conference_del_member(member->last_conference, member); + conference_del_member(conference, member); conference_add_member(new_conference, member); + switch_mutex_unlock(new_conference->mutex); stream->write_function(stream, "OK Members sent to conference %s.\n", argv[2]); @@ -3204,13 +3212,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); goto done; } - + switch_mutex_lock(conference->mutex); if (argc >= 2) { conf_api_dispatch(conference, stream, argc, argv, (const char *)buf, 1); } else { stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n"); } - + switch_mutex_unlock(conference->mutex); switch_thread_rwlock_unlock(conference->rwlock); } else { @@ -3464,22 +3472,24 @@ /* is there profile specification ? */ if ((profile_name = strchr(conf_name, '@'))) { *profile_name++ = '\0'; + } else { + profile_name = "default"; + } - /* Open the config from the xml registry */ - if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); - goto done; - } + /* Open the config from the xml registry */ + if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name); + goto done; + } - if ((profiles = switch_xml_child(cfg, "profiles"))) { - xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); - } + if ((profiles = switch_xml_child(cfg, "profiles"))) { + xml_cfg.profile = switch_xml_find_child(profiles, "profile", "name", profile_name); + } - xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); + xml_cfg.controls = switch_xml_child(cfg, "caller-controls"); #ifdef OPTION_IVR_MENU_SUPPORT - xml_cfg.menus = switch_xml_child(cfg, "menus"); -#endif - } + xml_cfg.menus = switch_xml_child(cfg, "menus"); +#endif /* if this is a bridging call, and it's not a duplicate, build a */ /* conference object, and skip pin handling, and locked checking */ @@ -3730,7 +3740,7 @@ switch_core_session_receive_message(session, &msg); /* Remove the caller from the conference */ - conference_del_member(member.last_conference, &member); + conference_del_member(member.conference, &member); /* Put the original codec back */ switch_core_session_set_read_codec(member.session, read_codec);

1 0

[commit] r3929 - in freeswitch/trunk/src/mod: directories/mod_ldap event_handlers/mod_cdr
by Freeswitch SVN 08 Jan '07

08 Jan '07

Author: mikej Date: Mon Jan 8 08:48:41 2007 New Revision: 3929 Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Log: switch all libs and mods to use the dynamic instead of the static runtime so everything in freeswitch runs in a single instance of the runtime. Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj Mon Jan 8 08:48:41 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LDAP_DEPRECATED" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -127,7 +127,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\openldap\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LDAP_DEPRECATED" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj Mon Jan 8 08:48:41 2007 @@ -208,7 +208,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -288,7 +288,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"C:\Program Files\MySQL\MySQL Server 5.0\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true"

1 0

[commit] r3928 - freeswitch/trunk/src
by Freeswitch SVN 08 Jan '07

08 Jan '07

Author: mikej Date: Sun Jan 7 20:55:16 2007 New Revision: 3928 Modified: freeswitch/trunk/src/switch_ivr.c Log: Make sure we pass early media after the pre-answer (thanks Mike Murdock for the report and troubleshooting assistance) Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Jan 7 20:55:16 2007 @@ -1928,11 +1928,14 @@ switch_channel_answer(chan_a); ans_a++; } else if (!pre_b && switch_channel_test_flag(chan_b, CF_EARLY_MEDIA)) { - switch_channel_pre_answer(chan_a); - pre_b++; + if (switch_channel_pre_answer(chan_a) == SWITCH_STATUS_SUCCESS) { + pre_b++; + } + } + if (!pre_b) { + switch_yield(10000); + continue; } - switch_yield(10000); - continue; }

1 0

07 Jan '07

Author: mikej Date: Sat Jan 6 23:35:16 2007 New Revision: 3925 Modified: freeswitch/trunk/libs/win32/howl/libhowl.vcproj freeswitch/trunk/libs/win32/howl/libmDNSResponder.vcproj freeswitch/trunk/libs/win32/pcre/libpcre.vcproj freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj freeswitch/trunk/libs/win32/speex/libspeex.vcproj freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj Log: switch all libs and mods to use the dynamic instead of the static runtime so everything in freeswitch runs in a single instance of the runtime. Modified: freeswitch/trunk/libs/win32/howl/libhowl.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/howl/libhowl.vcproj (original) +++ freeswitch/trunk/libs/win32/howl/libhowl.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="_DEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="0" Detect64BitPortabilityProblems="true" @@ -112,7 +112,7 @@ AdditionalIncludeDirectories=""..\..\howl-1.0.0\include";"..\..\howl-1.0.0\src\lib\howl"" PreprocessorDefinitions="NDEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" StringPooling="true" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="0" Modified: freeswitch/trunk/libs/win32/howl/libmDNSResponder.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/howl/libmDNSResponder.vcproj (original) +++ freeswitch/trunk/libs/win32/howl/libmDNSResponder.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="_DEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="0" Detect64BitPortabilityProblems="true" @@ -112,7 +112,7 @@ AdditionalIncludeDirectories="..\..\howl-1.0.0\include;..\..\howl-1.0.0\src\lib\howl;..\..\howl-1.0.0\src\lib\mDNSResponder" PreprocessorDefinitions="NDEBUG;WINDOWS;WIN32;_WIN32_WINNT=0x0500;HAVE_WSA_ASYNC_SELECT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" StringPooling="true" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="0" Modified: freeswitch/trunk/libs/win32/pcre/libpcre.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/pcre/libpcre.vcproj (original) +++ freeswitch/trunk/libs/win32/pcre/libpcre.vcproj Sat Jan 6 23:35:16 2007 @@ -56,7 +56,7 @@ PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;DEBUG;PCRE_DEFINITION;DLL_EXPORT" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" PrecompiledHeaderFile="$(OutDir)\libpcre.pch" AssemblerListingLocation="" ObjectFile="$(IntDir)\" @@ -142,7 +142,7 @@ AdditionalIncludeDirectories="./" PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPCRE_EXPORTS;SUPPORT_UTF8;SUPPORT_UCP;POSIX_MALLOC_THRESHOLD=10;NO_RECURSE;PCRE_DEFINITION;DLL_EXPORT" StringPooling="true" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" PrecompiledHeaderFile="$(OutDir)\libpcre.pch" AssemblerListingLocation="" Modified: freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj (original) +++ freeswitch/trunk/libs/win32/portaudio/PAStaticWMME.vcproj Sat Jan 6 23:35:16 2007 @@ -46,7 +46,7 @@ AdditionalIncludeDirectories="../../portaudio_v18_1/pa_common" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB" StringPooling="true" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" PrecompiledHeaderFile=".\Release/PAStaticWMME.pch" AssemblerListingLocation=".\Release/" @@ -121,7 +121,7 @@ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/PAStaticWMME.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" Modified: freeswitch/trunk/libs/win32/speex/libspeex.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/speex/libspeex.vcproj (original) +++ freeswitch/trunk/libs/win32/speex/libspeex.vcproj Sat Jan 6 23:35:16 2007 @@ -46,7 +46,7 @@ FavorSizeOrSpeed="1" AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H" - RuntimeLibrary="1" + RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libspeex.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" @@ -120,7 +120,7 @@ FavorSizeOrSpeed="1" AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include" PreprocessorDefinitions="inline=__inline;WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H" - RuntimeLibrary="0" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Release/libspeex.pch" AssemblerListingLocation=".\Release/" ObjectFile=".\Release/" Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true" Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.vcproj Sat Jan 6 23:35:16 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -212,7 +212,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;G723_PASSTHROUGH" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -292,7 +292,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg723\src\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;G723_PASSTHROUGH" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true" Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj Sat Jan 6 23:35:16 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -127,7 +127,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg729\src\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true" @@ -212,7 +212,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;G729_PASSTHROUGH" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -292,7 +292,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg729\src\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;G729_PASSTHROUGH" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true" Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj Sat Jan 6 23:35:16 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -126,7 +126,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\libresample\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true" Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj Sat Jan 6 23:35:16 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -126,7 +126,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true" Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj Sat Jan 6 23:35:16 2007 @@ -213,7 +213,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;MSLDAP" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -294,7 +294,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\openldap\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;MSLDAP" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj Sat Jan 6 23:35:16 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -128,7 +128,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\portaudio_v18_1\pa_common";"$(InputDir)..\..\..\..\libs\portaudio_v18_1\pa_win_wmme"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -125,7 +125,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj Sat Jan 6 23:35:16 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -127,7 +127,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\howl-1.0.0\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj Sat Jan 6 23:35:16 2007 @@ -45,7 +45,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -124,7 +124,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true"

1 0

[commit] r3924 - in freeswitch/trunk/src: . mod/applications/mod_conference
by Freeswitch SVN 07 Jan '07

07 Jan '07

Author: mikej Date: Sat Jan 6 23:34:22 2007 New Revision: 3924 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_ivr.c Log: potentially uninitialized vars Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Jan 6 23:34:22 2007 @@ -3828,7 +3828,7 @@ static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint) { - char name[512] = "", *p, *lbuf; + char name[512] = "", *p, *lbuf = NULL; switch_chat_interface_t *ci; conference_obj_t *conference = NULL; switch_stream_handle_t stream = {0}; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Jan 6 23:34:22 2007 @@ -4492,7 +4492,7 @@ switch_xml_t cfg, xml = NULL, language, macros, macro, input, action; char *lname = NULL, *mname = NULL, hint_data[1024] = "", enc_hint[1024] = ""; switch_status_t status = SWITCH_STATUS_GENERR; - char *old_sound_prefix, *sound_path = NULL, *tts_engine = NULL, *tts_voice = NULL; + char *old_sound_prefix = NULL, *sound_path = NULL, *tts_engine = NULL, *tts_voice = NULL; switch_channel_t *channel; uint8_t done = 0;

1 0

[commit] r3923 - freeswitch/trunk/src/include
by Freeswitch SVN 06 Jan '07

06 Jan '07

Author: mikej Date: Sat Jan 6 17:57:31 2007 New Revision: 3923 Modified: freeswitch/trunk/src/include/switch_apr.h Log: add switch_time_exp_gmt_get for mishehu Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Sat Jan 6 17:57:31 2007 @@ -1085,6 +1085,15 @@ #define switch_time_now apr_time_now /** + * Convert time value from human readable format to a numeric apr_time_t that + * always represents GMT + * @param result the resulting imploded time + * @param input the input exploded time + */ +DoxyDefine(switch_status_t switch_time_exp_gmt_get(switch_time_t *result, switch_time_exp_t *input);) +#define switch_time_exp_gmt_get apr_time_exp_gmt_get + +/** * formats the exploded time according to the format specified * @param s string to write to * @param retsize The length of the returned string

1 0

[commit] r3922 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 06 Jan '07

06 Jan '07

Author: mikej Date: Sat Jan 6 16:56:28 2007 New Revision: 3922 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj Log: the runtime needs to match to core, or the realloc of memory malloc'd from another dll will cause heap corruption. Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj Sat Jan 6 16:56:28 2007 @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="4" WarnAsError="true" @@ -126,7 +126,7 @@ Name="VCCLCompilerTool" AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true"

1 0

[commit] r3921 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 06 Jan '07

06 Jan '07

Author: mikej Date: Sat Jan 6 15:57:30 2007 New Revision: 3921 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix segfault. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sat Jan 6 15:57:30 2007 @@ -2732,7 +2732,7 @@ } break; case nua_callstate_ready: - if (nh == tech_pvt->nh2) { + if (tech_pvt && nh == tech_pvt->nh2) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Cheater Reinvite!\n"); switch_set_flag_locked(tech_pvt, TFLAG_REINVITE); tech_pvt->nh = tech_pvt->nh2;

1 0

[commit] r3920 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 06 Jan '07

06 Jan '07

Author: mikej Date: Sat Jan 6 15:24:37 2007 New Revision: 3920 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: datatype to match usage. Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sat Jan 6 15:24:37 2007 @@ -162,7 +162,7 @@ char *host, *port_name; switch_socket_t *new_sock; switch_sockaddr_t *sa; - int port = 8084; + switch_port_t port = 8084; listener_t *listener; int argc = 0, x = 0; char *argv[80] = {0}; @@ -186,7 +186,7 @@ if ((port_name = strchr(host, ':'))) { *port_name++ = '\0'; - port = atoi(port_name); + port = (switch_port_t)atoi(port_name); } if (switch_sockaddr_info_get(&sa, host, AF_INET, port, 0, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r3919 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 06 Jan '07

06 Jan '07

Author: mmurdock Date: Sat Jan 6 13:41:20 2007 New Revision: 3919 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: Added ability to spell digits too Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Sat Jan 6 13:41:20 2007 @@ -63,11 +63,16 @@ for(p = tosay; p && *p; p++) { int a = tolower((int) *p); - if (type == SST_NAME_SPELLED) { - say_file("ascii/%d.wav", a); - } else if (type == SST_NAME_PHONETIC) { - say_file("phonetic-ascii/%d.wav", a); - } + if (a >= 48 && a <= 57) { + say_file("digits/%d.wav", a-48); + } + else { + if (type == SST_NAME_SPELLED) { + say_file("ascii/%d.wav", a); + } else if (type == SST_NAME_PHONETIC) { + say_file("phonetic-ascii/%d.wav", a); + } + } } return SWITCH_STATUS_SUCCESS;

1 0