March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12491 - in freeswitch/trunk/src/mod/applications: mod_commands mod_dptools
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Fri Mar 6 14:16:48 2009 New Revision: 12491 Log: add heartbeat apps Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Mar 6 14:16:48 2009 @@ -2743,7 +2743,7 @@ return SWITCH_STATUS_SUCCESS; } -#define HEARTBEAT_SYNTAX "<uuid> [sched] <on|off|<seconds>>" +#define HEARTBEAT_SYNTAX "<uuid> [sched] [0|<seconds>]" SWITCH_STANDARD_API(uuid_session_heartbeat_function) { char *mycmd = NULL, *argv[3] = { 0 }; Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Fri Mar 6 14:16:48 2009 @@ -111,6 +111,42 @@ } } + +#define SCHED_HEARTBEAT_SYNTAX "[0|<seconds>]" +SWITCH_STANDARD_APP(sched_heartbeat_function) +{ + int seconds = 0; + + if (data) { + seconds = atoi(data); + if (seconds >= 0) { + switch_core_session_sched_heartbeat(session, seconds); + return; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SCHED_HEARTBEAT_SYNTAX); + +} + + +#define HEARTBEAT_SYNTAX "[0|<seconds>]" +SWITCH_STANDARD_APP(heartbeat_function) +{ + int seconds = 0; + + if (data) { + seconds = atoi(data); + if (seconds >= 0) { + switch_core_session_enable_heartbeat(session, seconds); + return; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", HEARTBEAT_SYNTAX); + +} + #define EXE_SYNTAX "<extension> <dialplan> <context>" SWITCH_STANDARD_APP(exe_function) { @@ -2605,6 +2641,10 @@ SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function, "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "sched_heartbeat", "Enable Scheduled Heartbeat", "Enable Scheduled Heartbeat", + sched_heartbeat_function, SCHED_HEARTBEAT_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "enable_heartbeat", "Enable Media Heartbeat", "Enable Media Heartbeat", + heartbeat_function, HEARTBEAT_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "mkdir", "Create a directory", "Create a directory", mkdir_function, MKDIR_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "soft_hold", "Put a bridged channel on hold", "Put a bridged channel on hold", soft_hold_function, SOFT_HOLD_SYNTAX, SAF_NONE);

1 0

06 Mar '09

Author: mikej Date: Fri Mar 6 13:27:14 2009 New Revision: 12490 Log: build: build path cleanups (FSBUILD-130) Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj freeswitch/trunk/w32/modules.vsprops Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="0" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="0" Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="0" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="0" Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -211,8 +209,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_snom/mod_snom.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -211,8 +209,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_vmd/mod_vmd.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -218,8 +216,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -87,8 +87,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -223,8 +221,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -21,8 +21,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="1" @@ -96,8 +94,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="1" @@ -173,8 +169,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="1" @@ -253,8 +247,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="1" Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -345,8 +345,6 @@ </Configuration> <Configuration Name="Debug Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -476,8 +474,6 @@ </Configuration> <Configuration Name="Release Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -347,8 +347,6 @@ </Configuration> <Configuration Name="Debug Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -478,8 +476,6 @@ </Configuration> <Configuration Name="Release Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -349,8 +349,6 @@ </Configuration> <Configuration Name="Debug Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -480,8 +478,6 @@ </Configuration> <Configuration Name="Release Passthrough|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_h26x/mod_h26x.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_siren/mod_siren.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -212,8 +210,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -212,8 +210,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -359,8 +359,6 @@ </Configuration> <Configuration Name="Debug MS-LDAP|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -497,8 +495,6 @@ </Configuration> <Configuration Name="Release MS-LDAP|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -217,8 +215,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -87,8 +87,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -223,8 +221,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -211,8 +209,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -88,8 +88,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -226,8 +224,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -87,8 +87,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -224,8 +222,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" @@ -213,8 +211,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -212,8 +210,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -211,8 +209,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.vcproj Fri Mar 6 13:27:14 2009 @@ -20,8 +20,6 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -93,8 +91,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -168,8 +164,6 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" @@ -244,8 +238,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -217,8 +215,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj (original) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -86,8 +86,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -220,8 +218,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj Fri Mar 6 13:27:14 2009 @@ -103,8 +103,6 @@ </Configuration> <Configuration Name="Debug_CLR|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -267,8 +265,6 @@ </Configuration> <Configuration Name="Release_CLR|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="1" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -86,8 +86,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -220,8 +218,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -218,8 +216,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -218,8 +216,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -223,8 +221,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="1" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="1" Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" @@ -221,8 +219,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\winlibs.vsprops;..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\spidermonkey.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_de/mod_say_de.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_es/mod_say_es.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_fr/mod_say_fr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_it/mod_say_it.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_nl/mod_say_nl.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -88,8 +88,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -221,8 +219,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj (original) +++ freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -82,8 +82,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" CharacterSet="2" @@ -209,8 +207,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -83,8 +83,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" @@ -213,8 +211,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -84,8 +84,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" @@ -215,8 +213,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.2008.vcproj Fri Mar 6 13:27:14 2009 @@ -85,8 +85,6 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" @@ -218,8 +216,6 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops;..\..\..\..\w32\curl.vsprops" CharacterSet="2" Modified: freeswitch/trunk/w32/modules.vsprops ============================================================================== --- freeswitch/trunk/w32/modules.vsprops (original) +++ freeswitch/trunk/w32/modules.vsprops Fri Mar 6 13:27:14 2009 @@ -3,8 +3,8 @@ ProjectType="Visual C++" Version="8.00" Name="modules" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory="$(PlatformName)\$(ConfigurationName)" + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" InheritedPropertySheets=".\winlibs.vsprops" > <Tool @@ -17,7 +17,7 @@ Name="VCLinkerTool" OutputFile="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" + ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb" ImportLibrary="$(OutDir)/$(InputName).lib" /> </VisualStudioPropertySheet>

1 0

[commit] r12489 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Fri Mar 6 13:25:19 2009 New Revision: 12489 Log: fix broken filter command in event socket Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 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 Fri Mar 6 13:25:19 2009 @@ -254,7 +254,7 @@ send = 0; switch_mutex_lock(l->filter_mutex); - for (hp = l->filters->headers; hp; hp = hp->next) { + for (hp = l->filters->headers; hp; hp = hp->next) { if ((hval = switch_event_get_header(event, hp->name))) { const char *comp_to = hp->value; int pos = 1, cmp = 0; @@ -611,7 +611,8 @@ switch_mutex_lock(listener->filter_mutex); if (!listener->filters) { - switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); + listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; } if (!strcasecmp(action, "delete")) { @@ -622,7 +623,8 @@ if (!strcasecmp(header_val, "all")) { switch_event_destroy(&listener->filters); - switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); + listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; } else { switch_event_del_header(listener->filters, header_val); } @@ -1406,13 +1408,15 @@ switch_mutex_lock(listener->filter_mutex); if (!listener->filters) { - switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); + listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; } if (!strcasecmp(header_name, "delete")) { if (!strcasecmp(header_val, "all")) { switch_event_destroy(&listener->filters); - switch_event_create(&listener->filters, SWITCH_EVENT_CHANNEL_DATA); + switch_event_create(&listener->filters, SWITCH_EVENT_CLONE); + listener->filters->event_id = SWITCH_EVENT_CHANNEL_DATA; } else { switch_event_del_header(listener->filters, header_val); }

1 0

[commit] r12488 - in freeswitch/trunk/libs/esl: lua perl php python ruby src src/include
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Fri Mar 6 13:24:10 2009 New Revision: 12488 Log: change api to return event on filter command Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp freeswitch/trunk/libs/esl/perl/esl_wrap.cpp freeswitch/trunk/libs/esl/perl/server2.pl freeswitch/trunk/libs/esl/php/ESL.php freeswitch/trunk/libs/esl/php/esl_wrap.cpp freeswitch/trunk/libs/esl/python/esl_wrap.cpp freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp freeswitch/trunk/libs/esl/src/esl_oop.cpp freeswitch/trunk/libs/esl/src/include/esl_oop.h Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -2537,7 +2537,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; SWIG_check_num_args("filter",3,3) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("filter",1,"ESLconnection *"); @@ -2550,9 +2550,9 @@ arg2 = (char *)lua_tostring(L, 2); arg3 = (char *)lua_tostring(L, 3); - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); SWIG_arg=0; - lua_pushnumber(L, (lua_Number) result); SWIG_arg++; + SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail; Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -3092,7 +3092,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3122,8 +3122,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); - ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); + ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; Modified: freeswitch/trunk/libs/esl/perl/server2.pl ============================================================================== --- freeswitch/trunk/libs/esl/perl/server2.pl (original) +++ freeswitch/trunk/libs/esl/perl/server2.pl Fri Mar 6 13:24:10 2009 @@ -26,7 +26,17 @@ printf "Connected call %s, from %s\n", $uuid, $info->getHeader("caller-caller-id-number"); - $con->sendRecv("myevents"); + $e = $con->filter("unique-id", $uuid); + if ($e) { + print $e->serialize(); + } else { + printf("WTF?\n"); + } + + $con->events("plain", "all"); + + + #$con->sendRecv("myevents"); $con->execute("answer"); $con->execute("playback", "/ram/swimp.raw"); Modified: freeswitch/trunk/libs/esl/php/ESL.php ============================================================================== --- freeswitch/trunk/libs/esl/php/ESL.php (original) +++ freeswitch/trunk/libs/esl/php/ESL.php Fri Mar 6 13:24:10 2009 @@ -170,7 +170,8 @@ } function filter($header,$value) { - return ESLconnection_filter($this->_cPtr,$header,$value); + $r=ESLconnection_filter($this->_cPtr,$header,$value); + return is_resource($r) ? new ESLevent($r) : $r; } function events($etype,$value) { Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/php/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -2120,7 +2120,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; zval **args[3]; SWIG_ResetError(); @@ -2146,9 +2146,9 @@ arg3 = (char *) Z_STRVAL_PP(args[2]); /*@SWIG@*/; - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); { - ZVAL_LONG(return_value,result); + SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0); } return; fail: Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/python/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -3956,7 +3956,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3985,8 +3985,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ESLconnection_filter" "', argument " "3"" of type '" "char const *""'"); } arg3 = reinterpret_cast< char * >(buf3); - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); - resultobj = SWIG_From_int(static_cast< int >(result)); + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 ); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return resultobj; Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp ============================================================================== --- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (original) +++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp Fri Mar 6 13:24:10 2009 @@ -3087,7 +3087,7 @@ ESLconnection *arg1 = (ESLconnection *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; - int result; + ESLevent *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; int res2 ; @@ -3116,8 +3116,8 @@ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","filter", 3, argv[1] )); } arg3 = reinterpret_cast< char * >(buf3); - result = (int)(arg1)->filter((char const *)arg2,(char const *)arg3); - vresult = SWIG_From_int(static_cast< int >(result)); + result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3); + vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 ); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3; return vresult; Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Fri Mar 6 13:24:10 2009 @@ -189,9 +189,18 @@ return NULL; } -int ESLconnection::filter(const char *header, const char *value) +ESLevent *ESLconnection::filter(const char *header, const char *value) { - return esl_filter(&handle, header, value); + esl_status_t status = esl_filter(&handle, header, value); + + if (status == ESL_SUCCESS && handle.last_sr_event) { + esl_event_t *event; + esl_event_dup(&event, handle.last_sr_event); + return new ESLevent(event, 1); + } + + return NULL; + } int ESLconnection::events(const char *etype, const char *value) Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_oop.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_oop.h Fri Mar 6 13:24:10 2009 @@ -86,7 +86,7 @@ int sendEvent(ESLevent *send_me); ESLevent *recvEvent(); ESLevent *recvEventTimed(int ms); - int filter(const char *header, const char *value); + ESLevent *filter(const char *header, const char *value); int events(const char *etype, const char *value); int execute(const char *app, const char *arg = NULL, const char *uuid = NULL); int setBlockingExecute(const char *val);

1 0

[commit] r12487 - freeswitch/trunk/libs/speex
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: mikej Date: Fri Mar 6 13:19:56 2009 New Revision: 12487 Log: fix automake 1.7 build Modified: freeswitch/trunk/libs/speex/Makefile.am Modified: freeswitch/trunk/libs/speex/Makefile.am ============================================================================== --- freeswitch/trunk/libs/speex/Makefile.am (original) +++ freeswitch/trunk/libs/speex/Makefile.am Fri Mar 6 13:19:56 2009 @@ -2,7 +2,7 @@ # To disable automatic dependency tracking if using other tools than # gcc and gmake, add the option 'no-dependencies' -AUTOMAKE_OPTIONS = 1.8 +AUTOMAKE_OPTIONS = 1.7 m4datadir = $(datadir)/aclocal m4data_DATA = speex.m4

1 0

[commit] r12486 - freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: brian Date: Fri Mar 6 11:48:14 2009 New Revision: 12486 Log: add missing java files Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_CoreSession.java freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_SWITCH_DECLARE_CLASS.java Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_CoreSession.java ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_CoreSession.java Fri Mar 6 11:48:14 2009 @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.swig; + +public class SWIGTYPE_p_CoreSession { + private long swigCPtr; + + protected SWIGTYPE_p_CoreSession(long cPtr, boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_CoreSession() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_CoreSession obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} + Added: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_SWITCH_DECLARE_CLASS.java ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/SWIGTYPE_p_SWITCH_DECLARE_CLASS.java Fri Mar 6 11:48:14 2009 @@ -0,0 +1,26 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package org.freeswitch.swig; + +public class SWIGTYPE_p_SWITCH_DECLARE_CLASS { + private long swigCPtr; + + protected SWIGTYPE_p_SWITCH_DECLARE_CLASS(long cPtr, boolean futureUse) { + swigCPtr = cPtr; + } + + protected SWIGTYPE_p_SWITCH_DECLARE_CLASS() { + swigCPtr = 0; + } + + protected static long getCPtr(SWIGTYPE_p_SWITCH_DECLARE_CLASS obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } +} +

1 0

[commit] r12485 - in freeswitch/trunk: libs libs/esl libs/iksemel libs/ilbc libs/ilbc/config libs/ilbc/doc libs/ilbc/localtests libs/ilbc/src libs/ilbc/tests libs/libg722_1 libs/libg722_1/doc libs/libg722_1/src libs/libg722_1/test-data libs/libg722_1/test-data/itu libs/libg722_1/test-data/local libs/libg722_1/tests libs/sofia-sip libs/sofia-sip/s2check libs/speex libs/speex/win32/VS2003/libspeexdsp libs/speex/win32/VS2003/tests libs/speex/win32/VS2005/libspeexdsp libs/speex/win32/VS2005/tes
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: brian Date: Fri Mar 6 11:46:45 2009 New Revision: 12485 Log: ignore Modified: freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/esl/ (props changed) freeswitch/trunk/libs/iksemel/ (props changed) freeswitch/trunk/libs/ilbc/ (props changed) freeswitch/trunk/libs/ilbc/config/ (props changed) freeswitch/trunk/libs/ilbc/doc/ (props changed) freeswitch/trunk/libs/ilbc/localtests/ (props changed) freeswitch/trunk/libs/ilbc/src/ (props changed) freeswitch/trunk/libs/ilbc/tests/ (props changed) freeswitch/trunk/libs/libg722_1/ (props changed) freeswitch/trunk/libs/libg722_1/doc/ (props changed) freeswitch/trunk/libs/libg722_1/src/ (props changed) freeswitch/trunk/libs/libg722_1/test-data/ (props changed) freeswitch/trunk/libs/libg722_1/test-data/itu/ (props changed) freeswitch/trunk/libs/libg722_1/test-data/local/ (props changed) freeswitch/trunk/libs/libg722_1/tests/ (props changed) freeswitch/trunk/libs/sofia-sip/ (props changed) freeswitch/trunk/libs/sofia-sip/s2check/ (props changed) freeswitch/trunk/libs/speex/ (props changed) freeswitch/trunk/libs/speex/win32/VS2003/libspeexdsp/ (props changed) freeswitch/trunk/libs/speex/win32/VS2003/tests/ (props changed) freeswitch/trunk/libs/speex/win32/VS2005/libspeexdsp/ (props changed) freeswitch/trunk/libs/speex/win32/VS2005/tests/ (props changed) freeswitch/trunk/libs/speex/win32/VS2008/ (props changed) freeswitch/trunk/libs/speex/win32/VS2008/libspeex/ (props changed) freeswitch/trunk/libs/speex/win32/VS2008/libspeexdsp/ (props changed) freeswitch/trunk/libs/speex/win32/VS2008/speexdec/ (props changed) freeswitch/trunk/libs/speex/win32/VS2008/speexenc/ (props changed) freeswitch/trunk/libs/speex/win32/VS2008/tests/ (props changed) freeswitch/trunk/scripts/ (props changed) freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/ (props changed) freeswitch/trunk/src/mod/endpoints/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/ (props changed)

1 0

[commit] r12484 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: anthm Date: Fri Mar 6 11:45:32 2009 New Revision: 12484 Log: FSCORE-263 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Fri Mar 6 11:45:32 2009 @@ -932,11 +932,19 @@ { private_object_t *tech_pvt; char message[128] = ""; + sofia_dtmf_t dtmf_type; tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - switch (tech_pvt->dtmf_type) { + dtmf_type = tech_pvt->dtmf_type; + + /* We only can send INFO when we have no media */ + if (!tech_pvt->rtp_session || !switch_channel_media_ready(tech_pvt->channel) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE)) { + dtmf_type = DTMF_INFO; + } + + switch (dtmf_type) { case DTMF_2833: return switch_rtp_queue_rfc2833(tech_pvt->rtp_session, dtmf); @@ -947,6 +955,7 @@ switch_mutex_unlock(tech_pvt->sofia_mutex); break; default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unhandled DTMF type!\n"); break; }

1 0

[commit] r12483 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: brian Date: Fri Mar 6 11:44:27 2009 New Revision: 12483 Log: MODASRTTS-13 part 1 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Fri Mar 6 11:44:27 2009 @@ -134,15 +134,20 @@ model = switch_mprintf("%s%smodel%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, globals.model16k); } - dic = switch_mprintf("%s%sdefault.dic", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, grammar); + dic = switch_mprintf("%s%sdefault.dic", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR); if (switch_file_exists(dic, ah->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open dictionary %s.\n", dic); goto end; } + if (switch_file_exists(model, ah->memory_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't open speech model %s.\n", model); + goto end; + } + if (switch_file_exists(jsgf, ah->memory_pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't open language model %s.\n", model); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't open grammar file %s.\n", jsgf); goto end; }

1 0

[commit] r12482 - freeswitch/trunk/libs/win32
by FreeSWITCH SVN 06 Mar '09

06 Mar '09

Author: mikej Date: Fri Mar 6 11:40:04 2009 New Revision: 12482 Log: build: download flite from right tarball location (FSBUILD-135) Modified: freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj Modified: freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj (original) +++ freeswitch/trunk/libs/win32/Download FLITE.2008.vcproj Fri Mar 6 11:40:04 2009 @@ -76,17 +76,17 @@ <Tool Name="VCCustomBuildTool" Description="Downloading Flite." - CommandLine="if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99.tar.gz "$(ProjectDir).."
" + CommandLine="if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\flite-1.3.99" - /> - </FileConfiguration> + /> + </FileConfiguration> <FileConfiguration Name="Release|Win32" > <Tool Name="VCCustomBuildTool" Description="Downloading Flite." - CommandLine="if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99.tar.gz "$(ProjectDir).."
" + CommandLine="if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).."
" Outputs="$(ProjectDir)..\flite-1.3.99" /> </FileConfiguration>

1 0