[Freeswitch-branches] [commit] r2613 - in freeswitch/branches/james: . libs/codec/lpc10 libs/win32/apr libs/win32/apr-iconv libs/win32/apr-util src src/include src/mod/applications/mod_commands src/mod/applications/mod_conference src/mod/applications/mod_park src/mod/applications/mod_playback src/mod/asr_tts/mod_cepstral src/mod/codecs/mod_g722 src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g729 src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_exosip src/mod/endpoints/mod_sofia src/mod/endpoints/mod_wanpipe src/mod/event_handlers/mod_event_socket src/mod/languages/mod_perl src/mod/languages/mod_php src/mod/languages/mod_spidermonkey
Freeswitch SVN
james at freeswitch.org
Sun Sep 10 07:09:38 EDT 2006
Author: james
Date: Sun Sep 10 07:09:34 2006
New Revision: 2613
Added:
freeswitch/branches/james/src/mod/applications/mod_park/
- copied from r2606, /freeswitch/trunk/src/mod/applications/mod_park/
freeswitch/branches/james/src/mod/applications/mod_park/mod_park.c
- copied unchanged from r2606, /freeswitch/trunk/src/mod/applications/mod_park/mod_park.c
freeswitch/branches/james/src/mod/applications/mod_park/mod_park.vcproj
- copied unchanged from r2606, /freeswitch/trunk/src/mod/applications/mod_park/mod_park.vcproj
freeswitch/branches/james/src/mod/languages/mod_php/
- copied from r2606, /freeswitch/trunk/src/mod/languages/mod_php/
freeswitch/branches/james/src/mod/languages/mod_php/Makefile
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/Makefile
freeswitch/branches/james/src/mod/languages/mod_php/apptest.php
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/apptest.php
freeswitch/branches/james/src/mod/languages/mod_php/fix.diff
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/fix.diff
freeswitch/branches/james/src/mod/languages/mod_php/freeswitch.php
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/freeswitch.php
freeswitch/branches/james/src/mod/languages/mod_php/mod_php.c
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/mod_php.c
freeswitch/branches/james/src/mod/languages/mod_php/php_freeswitch.h
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h
freeswitch/branches/james/src/mod/languages/mod_php/switch_swig.c
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/switch_swig.c
freeswitch/branches/james/src/mod/languages/mod_php/switch_swig.i
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/switch_swig.i
freeswitch/branches/james/src/mod/languages/mod_php/switch_swig_wrap.c
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c
freeswitch/branches/james/src/mod/languages/mod_php/test.php
- copied unchanged from r2606, /freeswitch/trunk/src/mod/languages/mod_php/test.php
Modified:
freeswitch/branches/james/Freeswitch.sln
freeswitch/branches/james/Makefile.in
freeswitch/branches/james/libs/codec/lpc10/Makefile.am
freeswitch/branches/james/libs/win32/apr-iconv/libapriconv.vcproj
freeswitch/branches/james/libs/win32/apr-util/libaprutil.vcproj
freeswitch/branches/james/libs/win32/apr/libapr.vcproj
freeswitch/branches/james/src/include/switch.h
freeswitch/branches/james/src/include/switch_apr.h
freeswitch/branches/james/src/include/switch_bitpack.h
freeswitch/branches/james/src/include/switch_buffer.h
freeswitch/branches/james/src/include/switch_caller.h
freeswitch/branches/james/src/include/switch_channel.h
freeswitch/branches/james/src/include/switch_config.h
freeswitch/branches/james/src/include/switch_console.h
freeswitch/branches/james/src/include/switch_core.h
freeswitch/branches/james/src/include/switch_event.h
freeswitch/branches/james/src/include/switch_frame.h
freeswitch/branches/james/src/include/switch_ivr.h
freeswitch/branches/james/src/include/switch_loadable_module.h
freeswitch/branches/james/src/include/switch_log.h
freeswitch/branches/james/src/include/switch_module_interfaces.h
freeswitch/branches/james/src/include/switch_platform.h
freeswitch/branches/james/src/include/switch_resample.h
freeswitch/branches/james/src/include/switch_rtp.h
freeswitch/branches/james/src/include/switch_sqlite.h
freeswitch/branches/james/src/include/switch_stun.h
freeswitch/branches/james/src/include/switch_types.h
freeswitch/branches/james/src/include/switch_utils.h
freeswitch/branches/james/src/include/switch_xml.h
freeswitch/branches/james/src/mod/applications/mod_commands/mod_commands.c
freeswitch/branches/james/src/mod/applications/mod_conference/mod_conference.c
freeswitch/branches/james/src/mod/applications/mod_playback/mod_playback.c
freeswitch/branches/james/src/mod/asr_tts/mod_cepstral/mod_cepstral.c
freeswitch/branches/james/src/mod/codecs/mod_g722/mod_g722.c
freeswitch/branches/james/src/mod/codecs/mod_g723_1/mod_g723_1.c
freeswitch/branches/james/src/mod/codecs/mod_g729/mod_g729.c
freeswitch/branches/james/src/mod/codecs/mod_g729/mod_g729.vcproj
freeswitch/branches/james/src/mod/endpoints/mod_dingaling/mod_dingaling.c
freeswitch/branches/james/src/mod/endpoints/mod_exosip/mod_exosip.c
freeswitch/branches/james/src/mod/endpoints/mod_sofia/mod_sofia.c
freeswitch/branches/james/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
freeswitch/branches/james/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
freeswitch/branches/james/src/mod/languages/mod_perl/fs_perl.pm
freeswitch/branches/james/src/mod/languages/mod_perl/switch_swig.c
freeswitch/branches/james/src/mod/languages/mod_perl/switch_swig_wrap.c
freeswitch/branches/james/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
freeswitch/branches/james/src/switch_buffer.c
freeswitch/branches/james/src/switch_channel.c
freeswitch/branches/james/src/switch_console.c
freeswitch/branches/james/src/switch_core.c
freeswitch/branches/james/src/switch_event.c
freeswitch/branches/james/src/switch_ivr.c
freeswitch/branches/james/src/switch_loadable_module.c
Log:
Update to trunk.
Modified: freeswitch/branches/james/Freeswitch.sln
==============================================================================
--- freeswitch/branches/james/Freeswitch.sln (original)
+++ freeswitch/branches/james/Freeswitch.sln Sun Sep 10 07:09:34 2006
@@ -3,21 +3,21 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"
ProjectSection(ProjectDependencies) = postProject
- {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
- {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
{50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761}
+ {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}"
@@ -27,54 +27,54 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}"
ProjectSection(ProjectDependencies) = postProject
- {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xmpp_event", "src\mod\event_handlers\mod_xmpp_event\mod_xmpp_event.vcproj", "{F10BE67C-A8FF-4CB2-AF29-D46D2590DC59}"
ProjectSection(ProjectDependencies) = postProject
- {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bridgecall", "src\mod\applications\mod_bridgecall\mod_bridgecall.vcproj", "{E1794405-29D4-466D-9BE3-DD2344C2A663}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_test", "src\mod\event_handlers\mod_event_test\mod_event_test.vcproj", "{3A2A7795-C216-4FFF-B8EF-4D17A84BACCC}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_exosip", "src\mod\endpoints\mod_exosip\mod_exosip.vcproj", "{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552}"
ProjectSection(ProjectDependencies) = postProject
- {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
- {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
- {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
- {4EA67539-9EE9-4065-BD39-87E517FD8262} = {4EA67539-9EE9-4065-BD39-87E517FD8262}
{85255507-5D16-4218-85E2-F683BB2F04DA} = {85255507-5D16-4218-85E2-F683BB2F04DA}
+ {4EA67539-9EE9-4065-BD39-87E517FD8262} = {4EA67539-9EE9-4065-BD39-87E517FD8262}
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"
@@ -84,28 +84,28 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_playback", "src\mod\applications\mod_playback\mod_playback.vcproj", "{78100236-7CEA-4948-96CC-E8ED3160329C}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}"
ProjectSection(ProjectDependencies) = postProject
- {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B} = {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B} = {C30D35E4-7FC6-4E97-9BE5-4BC077BE0D4B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"
@@ -115,24 +115,24 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_softtimer", "src\mod\timers\mod_softtimer\mod_softtimer.vcproj", "{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}"
ProjectSection(ProjectDependencies) = postProject
- {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}"
@@ -155,19 +155,19 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
- {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ivrtest", "src\mod\applications\mod_ivrtest\mod_ivrtest.vcproj", "{419AA391-5F3F-4BFE-A869-9D154D62A792}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}"
@@ -181,28 +181,28 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}"
ProjectSection(ProjectDependencies) = postProject
- {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}"
@@ -211,15 +211,15 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}"
ProjectSection(ProjectDependencies) = postProject
- {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
- {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
- {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
- {76D0A759-9C07-42D4-90A9-82AE15462C95} = {76D0A759-9C07-42D4-90A9-82AE15462C95}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {76D0A759-9C07-42D4-90A9-82AE15462C95} = {76D0A759-9C07-42D4-90A9-82AE15462C95}
+ {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
+ {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}"
@@ -241,35 +241,35 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_echo", "src\mod\applications\mod_echo\mod_echo.vcproj", "{0E2C6395-13B9-46E5-9264-8859D346018D}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}"
ProjectSection(ProjectDependencies) = postProject
- {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}"
ProjectSection(ProjectDependencies) = postProject
- {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
- {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54}
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}"
ProjectSection(ProjectDependencies) = postProject
- {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}"
@@ -283,54 +283,54 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F}
- {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
- {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
- {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94}
+ {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588}
+ {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr", "src\mod\event_handlers\mod_cdr\mod_cdr.vcproj", "{3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}"
@@ -355,8 +355,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "libs\win32\pcre\libpcre.vcproj", "{8D04B550-D240-4A44-8A18-35DA3F7038D9}"
ProjectSection(ProjectDependencies) = postProject
- {1CED5987-A529-46DC-B30F-870D85FF9C94} = {1CED5987-A529-46DC-B30F-870D85FF9C94}
{91695C7C-7AD1-4782-9727-508F82D9C577} = {91695C7C-7AD1-4782-9727-508F82D9C577}
+ {1CED5987-A529-46DC-B30F-870D85FF9C94} = {1CED5987-A529-46DC-B30F-870D85FF9C94}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre Generate pcre_chartables.c", "libs\win32\pcre\pcre_chartables.c.vcproj", "{1CED5987-A529-46DC-B30F-870D85FF9C94}"
@@ -376,18 +376,18 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapriconv", "libs\win32\apr-iconv\libapriconv.vcproj", "{101130D1-3EA6-4ED2-B65D-CEB5243A20ED}"
ProjectSection(ProjectDependencies) = postProject
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
+ {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}"
ProjectSection(ProjectDependencies) = postProject
- {E969F3E0-1043-482A-AD49-787B8356BA92} = {E969F3E0-1043-482A-AD49-787B8356BA92}
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
+ {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ {E969F3E0-1043-482A-AD49-787B8356BA92} = {E969F3E0-1043-482A-AD49-787B8356BA92}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}"
@@ -401,8 +401,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download APR-Util", "libs\win32\Download APR-Util.vcproj", "{E969F3E0-1043-482A-AD49-787B8356BA92}"
ProjectSection(ProjectDependencies) = postProject
- {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
{C4854C1D-5478-4F87-AB62-36CCDDDBA3C7} = {C4854C1D-5478-4F87-AB62-36CCDDDBA3C7}
+ {5786D51D-1C6A-4BE1-8804-29954DB5258F} = {5786D51D-1C6A-4BE1-8804-29954DB5258F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBRESAMPLE", "libs\win32\Download LIBRESAMPLE.vcproj", "{C3B50FF8-E49B-4589-B07A-4D7866980669}"
@@ -436,15 +436,15 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eXosip", "libs\win32\exosip\eXosip.vcproj", "{4EA67539-9EE9-4065-BD39-87E517FD8262}"
ProjectSection(ProjectDependencies) = postProject
- {C038D7B4-B116-4C3E-93E2-45D295429808} = {C038D7B4-B116-4C3E-93E2-45D295429808}
- {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
{85255507-5D16-4218-85E2-F683BB2F04DA} = {85255507-5D16-4218-85E2-F683BB2F04DA}
+ {44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
+ {C038D7B4-B116-4C3E-93E2-45D295429808} = {C038D7B4-B116-4C3E-93E2-45D295429808}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "libs\win32\exosip\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"
ProjectSection(ProjectDependencies) = postProject
- {C038D7B4-B116-4C3E-93E2-45D295429808} = {C038D7B4-B116-4C3E-93E2-45D295429808}
{44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
+ {C038D7B4-B116-4C3E-93E2-45D295429808} = {C038D7B4-B116-4C3E-93E2-45D295429808}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "libs\win32\exosip\osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
@@ -461,8 +461,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}"
ProjectSection(ProjectDependencies) = postProject
- {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
{5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75}
+ {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSNDFILE", "libs\win32\Download LIBSNDFILE.vcproj", "{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}"
@@ -488,8 +488,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Abyss", "libs\win32\xmlrpc\Abyss.vcproj", "{356EC96D-4C9F-47B5-9083-FC328B87BA94}"
ProjectSection(ProjectDependencies) = postProject
- {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}
{A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1}
+ {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.vcproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
@@ -503,27 +503,27 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "libs\win32\js\js.vcproj", "{204FA0DE-305D-4414-AE2E-F195A23F390D}"
ProjectSection(ProjectDependencies) = postProject
- {B0AA13FC-636C-45A7-8EAE-663220679A75} = {B0AA13FC-636C-45A7-8EAE-663220679A75}
{76D0A759-9C07-42D4-90A9-82AE15462C95} = {76D0A759-9C07-42D4-90A9-82AE15462C95}
+ {B0AA13FC-636C-45A7-8EAE-663220679A75} = {B0AA13FC-636C-45A7-8EAE-663220679A75}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg726", "libs\codec\g726\libg726.vcproj", "{5A6A281A-AA50-470A-8305-202BDA1CD1BF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}"
ProjectSection(ProjectDependencies) = postProject
- {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
- {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
- {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
- {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
{5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF}
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}"
@@ -537,6 +537,14 @@
{101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_park", "src\mod\applications\mod_park\mod_park.vcproj", "{2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}"
+ ProjectSection(ProjectDependencies) = postProject
+ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
+ {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3}
+ {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF}
+ {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -551,8 +559,10 @@
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Debug|Win32.Build.0 = Debug|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.ActiveCfg = Release|Win32
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}.Release|Win32.Build.0 = Release|Win32
- {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.ActiveCfg = Debug|Win32
- {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.ActiveCfg = Release|Win32
+ {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.ActiveCfg = Debug Passthrough|Win32
+ {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Debug|Win32.Build.0 = Debug Passthrough|Win32
+ {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.ActiveCfg = Release Passthrough|Win32
+ {1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}.Release|Win32.Build.0 = Release Passthrough|Win32
{4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.ActiveCfg = Debug|Win32
{4926323F-4EA8-4B7D-A3D3-65488725988F}.Debug|Win32.Build.0 = Debug|Win32
{4926323F-4EA8-4B7D-A3D3-65488725988F}.Release|Win32.ActiveCfg = Release|Win32
@@ -881,6 +891,10 @@
{D42518CC-7475-454D-B392-0E132C07D761}.Debug|Win32.Build.0 = Debug|Win32
{D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.ActiveCfg = Release|Win32
{D42518CC-7475-454D-B392-0E132C07D761}.Release|Win32.Build.0 = Release|Win32
+ {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Debug|Win32.Build.0 = Debug|Win32
+ {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Release|Win32.ActiveCfg = Release|Win32
+ {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -909,6 +923,7 @@
{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
+ {2740F45C-475A-4DE0-BCED-6E2E5F6C4B8B} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
{5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
{FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
Modified: freeswitch/branches/james/Makefile.in
==============================================================================
--- freeswitch/branches/james/Makefile.in (original)
+++ freeswitch/branches/james/Makefile.in Sun Sep 10 07:09:34 2006
@@ -1136,6 +1136,8 @@
installall: install install_mod
+sure: clean modclean modwipe uninstall installall
+
wayclean: clean modclean
modwipe:
Modified: freeswitch/branches/james/libs/codec/lpc10/Makefile.am
==============================================================================
--- freeswitch/branches/james/libs/codec/lpc10/Makefile.am (original)
+++ freeswitch/branches/james/libs/codec/lpc10/Makefile.am Sun Sep 10 07:09:34 2006
@@ -2,24 +2,20 @@
SUBDIRS =
AUTOMAKE_OPTS= gnu
MAKE=gmake
-NAME=liblpc10
+NAME=libg7xx
AM_CC=gcc
AM_CFLAGS = -Wall -O3 -funroll-loops
AM_CPPFLAGS = $(AM_CFLAGS)
-lib_LTLIBRARIES = liblpc10.la
-liblpc10_la_SOURCES = analys.c dcbias.c difmag.c energy.c hp100.c ivfilt.c lpcini.c mload.c placea.c prepro.c synths.c vparms.c \
-bsynz.c decode.c dyptrk.c f2clib.c invert.c lpcdec.c lpfilt.c onset.c placev.c random.c tbdm.c \
-chanwr.c deemp.c encode.c ham84.c irc2pc.c lpcenc.c median.c pitsyn.c preemp.c rcchk.c voicin.c
+lib_LTLIBRARIES = libg7xx.la
+libg7xx_la_SOURCES = g711.c g722_deode.c g722_encode.c g726.c
+libg7xx_la_CFLAGS = $(AM_CFLAGS)
+libg7xx_la_LDFLAGS =
-
-liblpc10_la_CFLAGS = $(AM_CFLAGS)
-liblpc10_la_LDFLAGS =
-
-library_includedir = $(prefix)/include/lpc10
-library_include_HEADERS = f2c.h lpc10.h
+library_includedir = $(prefix)/include/g7xx
+library_include_HEADERS = g726.h g711.h g722.h
Modified: freeswitch/branches/james/libs/win32/apr-iconv/libapriconv.vcproj
==============================================================================
--- freeswitch/branches/james/libs/win32/apr-iconv/libapriconv.vcproj (original)
+++ freeswitch/branches/james/libs/win32/apr-iconv/libapriconv.vcproj Sun Sep 10 07:09:34 2006
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist $(ProjectDir)..\..\include\ md $(ProjectDir)..\..\include\
xcopy "$(ProjectDir)..\..\apr-iconv-1.1.1\include\*.h" $(ProjectDir)..\..\include\ /C /D /Y
"
+ CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\apr-iconv-1.1.1\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -123,7 +123,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist $(ProjectDir)..\..\include\ md $(ProjectDir)..\..\include\
xcopy "$(ProjectDir)..\..\apr-iconv-1.1.1\include\*.h" $(ProjectDir)..\..\include\ /C /D /Y
"
+ CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
xcopy "$(ProjectDir)..\..\apr-iconv-1.1.1\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
"
/>
<Tool
Name="VCCustomBuildTool"
Modified: freeswitch/branches/james/libs/win32/apr-util/libaprutil.vcproj
==============================================================================
--- freeswitch/branches/james/libs/win32/apr-util/libaprutil.vcproj (original)
+++ freeswitch/branches/james/libs/win32/apr-util/libaprutil.vcproj Sun Sep 10 07:09:34 2006
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist $(ProjectDir)..\..\include\ md $(ProjectDir)..\..\include\
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apu.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apu.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apu.h
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h
xcopy "$(ProjectDir)..\..\apr-util-1.2.7\include\*.h" $(ProjectDir)..\..\include\ /C /D /Y
"
+ CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h"
xcopy "$(ProjectDir)..\..\apr-util-1.2.7\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -125,7 +125,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist $(ProjectDir)..\..\include\ md $(ProjectDir)..\..\include\
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apu.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apu.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apu.h
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h
if not exist $(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h type $(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.hw > $(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h
xcopy "$(ProjectDir)..\..\apr-util-1.2.7\include\*.h" $(ProjectDir)..\..\include\ /C /D /Y
"
+ CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apr_ldap.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_config.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_select_dbm.h"
if not exist "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h" type "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.hw" > "$(ProjectDir)..\..\apr-util-1.2.7\include\apu_want.h"
xcopy "$(ProjectDir)..\..\apr-util-1.2.7\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
"
/>
<Tool
Name="VCCustomBuildTool"
Modified: freeswitch/branches/james/libs/win32/apr/libapr.vcproj
==============================================================================
--- freeswitch/branches/james/libs/win32/apr/libapr.vcproj (original)
+++ freeswitch/branches/james/libs/win32/apr/libapr.vcproj Sun Sep 10 07:09:34 2006
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist $(ProjectDir)..\..\include\ md $(ProjectDir)..\..\include\
if not exist $(ProjectDir)..\..\apr-1.2.7\include\apr.h type $(ProjectDir)apr.hw > $(ProjectDir)..\..\apr-1.2.7\include\apr.h
xcopy "$(ProjectDir)..\..\apr-1.2.7\include\*.h" $(ProjectDir)..\..\include\ /C /D /Y
"
+ CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-1.2.7\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr-1.2.7\include\apr.h"
xcopy "$(ProjectDir)..\..\apr-1.2.7\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -124,7 +124,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="if not exist $(ProjectDir)..\..\include\ md $(ProjectDir)..\..\include\
if not exist $(ProjectDir)..\..\apr-1.2.7\include\apr.h type $(ProjectDir)apr.hw > $(ProjectDir)..\..\apr-1.2.7\include\apr.h
xcopy "$(ProjectDir)..\..\apr-1.2.7\include\*.h" $(ProjectDir)..\..\include\ /C /D /Y
"
+ CommandLine="if not exist "$(ProjectDir)..\..\include\" md "$(ProjectDir)..\..\include\"
if not exist "$(ProjectDir)..\..\apr-1.2.7\include\apr.h" type "$(ProjectDir)apr.hw" > "$(ProjectDir)..\..\apr-1.2.7\include\apr.h"
xcopy "$(ProjectDir)..\..\apr-1.2.7\include\*.h" "$(ProjectDir)..\..\include\" /C /D /Y
"
/>
<Tool
Name="VCCustomBuildTool"
Modified: freeswitch/branches/james/src/include/switch.h
==============================================================================
--- freeswitch/branches/james/src/include/switch.h (original)
+++ freeswitch/branches/james/src/include/switch.h Sun Sep 10 07:09:34 2006
@@ -36,11 +36,11 @@
#define SWITCH_H
#ifdef __cplusplus
-#define BEGIN_EXTERN_C extern "C" {
-#define END_EXTERN_C }
+#define SWITCH_BEGIN_EXTERN_C extern "C" {
+#define SWITCH_END_EXTERN_C }
#else
-#define BEGIN_EXTERN_C
-#define END_EXTERN_C
+#define SWITCH_BEGIN_EXTERN_C
+#define SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_apr.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_apr.h (original)
+++ freeswitch/branches/james/src/include/switch_apr.h Sun Sep 10 07:09:34 2006
@@ -63,7 +63,7 @@
#include <apr_want.h>
#include <apr_env.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
/*
The pieces of apr we allow ppl to pass around between modules we typedef into our namespace and wrap all the functions
@@ -1433,6 +1433,6 @@
/** @} */
/** @} */
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_bitpack.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_bitpack.h (original)
+++ freeswitch/branches/james/src/include/switch_bitpack.h Sun Sep 10 07:09:34 2006
@@ -35,7 +35,7 @@
*/
#ifndef SWITCH_BITPACK_H
#define SWITCH_BITPACK_H
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#include <switch.h>
@@ -278,5 +278,5 @@
}
///\}
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_buffer.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_buffer.h (original)
+++ freeswitch/branches/james/src/include/switch_buffer.h Sun Sep 10 07:09:34 2006
@@ -40,7 +40,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
/**
* @defgroup switch_buffer Buffer Routines
@@ -62,6 +62,18 @@
*/
SWITCH_DECLARE(switch_status_t) switch_buffer_create(switch_memory_pool_t *pool, switch_buffer_t **buffer, switch_size_t max_len);
+/*! \brief Allocate a new dynamic switch_buffer
+ * \param buffer returned pointer to the new buffer
+ * \param blocksize length to realloc by as data is added
+ * \param start_len ammount of memory to reserve initially
+ * \param max_len length the buffer is allowed to grow to
+ * \return status
+ */
+SWITCH_DECLARE(switch_status_t) switch_buffer_create_dynamic(switch_buffer_t **buffer,
+ switch_size_t blocksize,
+ switch_size_t start_len,
+ switch_size_t max_len);
+
/*! \brief Get the length of a switch_buffer_t
* \param buffer any buffer of type switch_buffer_t
* \return int size of the buffer.
@@ -107,8 +119,15 @@
* \param buffer any buffer of type switch_buffer_t
*/
SWITCH_DECLARE(void) switch_buffer_zero(switch_buffer_t *buffer);
+
+/*! \brief Destroy the buffer
+ * \param buffer buffer to destroy
+ * \note only neccessary on dynamic buffers (noop on pooled ones)
+ */
+SWITCH_DECLARE(void) switch_buffer_destroy(switch_buffer_t **buffer);
+
/** @} */
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_caller.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_caller.h (original)
+++ freeswitch/branches/james/src/include/switch_caller.h Sun Sep 10 07:09:34 2006
@@ -55,7 +55,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
/*! \brief Call Specific Data
*/
@@ -195,7 +195,7 @@
SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event);
-END_EXTERN_C
+SWITCH_END_EXTERN_C
/** @} */
Modified: freeswitch/branches/james/src/include/switch_channel.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_channel.h (original)
+++ freeswitch/branches/james/src/include/switch_channel.h Sun Sep 10 07:09:34 2006
@@ -40,7 +40,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
struct switch_channel_timetable {
switch_time_t created;
@@ -137,6 +137,12 @@
uint32_t flags);
/*!
+ \brief Uninitalize a channel
+ \param channel the channel to uninit
+*/
+SWITCH_DECLARE(void) switch_channel_uninit(switch_channel_t *channel);
+
+/*!
\brief Set the given channel's caller profile
\param channel channel to assign the profile to
\param caller_profile the profile to assign
@@ -298,17 +304,19 @@
/*!
\brief Set private data on channel
\param channel channel on which to set data
+ \param key unique keyname to associate your private data to
\param private_info void pointer to private data
\return SWITCH_STATUS_SUCCESS if data was set
*/
-SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, void *private_info);
+SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, char *key, void *private_info);
/*!
\brief Retrieve private from a given channel
\param channel channel to retrieve data from
+ \param key unique keyname to retrieve your private data
\return void pointer to channel's private data
*/
-SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel);
+SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, char *key);
/*!
\brief Assign a name to a given channel
@@ -391,6 +399,6 @@
SWITCH_DECLARE(switch_status_t) switch_channel_get_raw_mode (switch_channel_t *channel, int *freq, int *bits, int *channels, int *ms, int *kbps);
/** @} */
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_config.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_config.h (original)
+++ freeswitch/branches/james/src/include/switch_config.h Sun Sep 10 07:09:34 2006
@@ -58,7 +58,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
/*! \brief A simple file handle representing an open configuration file **/
struct switch_config {
@@ -104,7 +104,7 @@
*/
SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t *cfg, char **var, char **val);
-END_EXTERN_C
+SWITCH_END_EXTERN_C
/** @} */
Modified: freeswitch/branches/james/src/include/switch_console.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_console.h (original)
+++ freeswitch/branches/james/src/include/switch_console.h Sun Sep 10 07:09:34 2006
@@ -41,8 +41,19 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
+#define SWITCH_CMD_CHUNK_LEN 1024
+#define SWITCH_STANDARD_STREAM(s) if ((s.data = (char *)malloc(SWITCH_CMD_CHUNK_LEN))) { \
+ memset(s.data, 0, SWITCH_CMD_CHUNK_LEN); \
+ s.end = s.data;\
+ s.data_size = SWITCH_CMD_CHUNK_LEN;\
+ s.write_function = switch_console_stream_write;\
+ s.alloc_len = SWITCH_CMD_CHUNK_LEN;\
+ s.alloc_chunk = SWITCH_CMD_CHUNK_LEN;\
+ }
+
+
/*!
\brief A simple comand loop that reads input from the terminal
*/
@@ -57,6 +68,6 @@
\brief A method akin to printf for dealing with api streams
*/
SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, char *fmt, ...);
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_core.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_core.h (original)
+++ freeswitch/branches/james/src/include/switch_core.h Sun Sep 10 07:09:34 2006
@@ -40,7 +40,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#define SWITCH_MAX_CORE_THREAD_SESSION_OBJS 128
#define SWITCH_MAX_STREAMS 128
@@ -99,14 +99,89 @@
struct switch_core_session;
struct switch_core_runtime;
+struct switch_core_port_allocator;
-
/*!
\defgroup core1 Core Library
\ingroup FREESWITCH
\{
*/
+
+///\defgroup mb1 Media Bugs
+///\ingroup core1
+///\{
+
+/*!
+ \brief Add a media bug to the session
+ \param session the session to add the bug to
+ \param callback a callback for events
+ \param user_data arbitrary user data
+ \param new_bug pointer to assign new bug to
+ \return SWITCH_STATUS_SUCCESS if the operation was a success
+*/
+SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t *session,
+ switch_media_bug_callback_t callback,
+ void *user_data,
+ switch_media_bug_t **new_bug);
+
+
+/*!
+ \brief Remove a media bug from the session
+ \param session the session to remove the bug from
+ \param bug bug to remove
+ \return SWITCH_STATUS_SUCCESS if the operation was a success
+*/
+SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(switch_core_session_t *session, switch_media_bug_t **bug);
+
+/*!
+ \brief Remove all media bugs from the session
+ \param session the session to remove the bugs from
+ \return SWITCH_STATUS_SUCCESS if the operation was a success
+*/
+SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all(switch_core_session_t *session);
+
+/*!
+ \brief Read a frame from the bug
+ \param bug the bug to read from
+ \param frame the frame to write the data to
+ \return the amount of data
+*/
+SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame);
+
+///\}
+
+///\defgroup pa1 Port Allocation
+///\ingroup core1
+///\{
+
+/*!
+ \brief Initilize the port allocator
+ \param start the starting port
+ \param end the ending port
+ \param inc the amount to increment each port
+ \param new_allocator new pointer for the return value
+ \return SWITCH_STATUS_SUCCESS if the operation was a success
+*/
+SWITCH_DECLARE(switch_status_t) switch_core_port_allocator_new(switch_port_t start,
+ switch_port_t end,
+ uint8_t inc,
+ switch_core_port_allocator_t **new_allocator);
+
+/*!
+ \brief Get a port from the port allocator
+ \param alloc the allocator object
+ \return the port
+*/
+SWITCH_DECLARE(switch_port_t) switch_core_port_allocator_request_port(switch_core_port_allocator_t *alloc);
+
+/*!
+ \brief destroythe port allocator
+ \param alloc the allocator object
+*/
+SWITCH_DECLARE(void) switch_core_port_allocator_destroy(switch_core_port_allocator_t **alloc);
+///\}
+
///\defgroup ss Startup/Shutdown
///\ingroup core1
///\{
@@ -469,8 +544,32 @@
*/
SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_event(switch_core_session_t *session, switch_event_t **event);
+/*!
+ \brief Queue a private event on a given session
+ \param session the session to queue the message on
+ \param event the event to queue
+ \return the status returned by the message handler
+*/
+SWITCH_DECLARE(switch_status_t) switch_core_session_queue_private_event(switch_core_session_t *session, switch_event_t **event);
+
/*!
+ \brief Indicate the number of waiting private events on a session
+ \param session the session to check
+ \return the number of events
+*/
+SWITCH_DECLARE(int32_t) switch_core_session_private_event_count(switch_core_session_t *session);
+
+/*!
+ \brief DE-Queue a private event on a given session
+ \param session the session to de-queue the message on
+ \param event the de-queued event
+ \return the SWITCH_STATUS_SUCCESS if the event was de-queued
+*/
+SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_private_event(switch_core_session_t *session, switch_event_t **event);
+
+
+/*!
\brief Read a frame from a session
\param session the session to read from
\param frame a NULL pointer to a frame to aim at the newly read frame
@@ -1118,6 +1217,6 @@
\}
*/
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_event.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_event.h (original)
+++ freeswitch/branches/james/src/include/switch_event.h Sun Sep 10 07:09:34 2006
@@ -60,7 +60,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
/*! \brief An event Header */
struct switch_event_header{
@@ -310,6 +310,6 @@
#define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__FUNCTION__, __LINE__, event, data)
///\}
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_frame.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_frame.h (original)
+++ freeswitch/branches/james/src/include/switch_frame.h Sun Sep 10 07:09:34 2006
@@ -38,7 +38,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
/*! \brief An abstraction of a data frame */
struct switch_frame {
@@ -68,6 +68,6 @@
switch_frame_flag_t flags;
};
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_ivr.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_ivr.h (original)
+++ freeswitch/branches/james/src/include/switch_ivr.h Sun Sep 10 07:09:34 2006
@@ -40,8 +40,10 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
+static const switch_state_handler_table_t noop_state_handler = {0};
+
/**
* @defgroup switch_ivr IVR Library
* @ingroup core1
@@ -59,6 +61,8 @@
*/
SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms);
+SWITCH_DECLARE(switch_status_t) switch_ivr_park(switch_core_session_t *session);
+
/*!
\brief Wait for DTMF digits calling a pluggable callback function when digits are collected.
\param session the session to read.
@@ -90,8 +94,25 @@
const char *terminators,
char *terminator,
unsigned int timeout);
-
+
/*!
+ \brief Record a session to disk
+ \param session the session to record
+ \param file the path to the file
+ \param fh file handle to use (NULL for builtin one)
+ \return SWITCH_STATUS_SUCCESS if all is well
+*/
+SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, switch_file_handle_t *fh);
+
+/*!
+ \brief Stop Recording a session
+ \param session the session to stop recording
+ \param file the path to the file
+ \return SWITCH_STATUS_SUCCESS if all is well
+*/
+SWITCH_DECLARE(switch_status_t) switch_ivr_stop_record_session(switch_core_session_t *session, char *file);
+
+/*!
\brief play a file from the disk to the session
\param session the session to play the file too
\param fh file handle to use (NULL for builtin one)
@@ -212,7 +233,7 @@
/** @} */
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_loadable_module.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_loadable_module.h (original)
+++ freeswitch/branches/james/src/include/switch_loadable_module.h Sun Sep 10 07:09:34 2006
@@ -43,7 +43,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
/*!
\defgroup mods Loadable Module Functions
@@ -230,6 +230,6 @@
SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void);
///\}
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_log.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_log.h (original)
+++ freeswitch/branches/james/src/include/switch_log.h Sun Sep 10 07:09:34 2006
@@ -40,7 +40,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
///\defgroup log Logger Routines
///\ingroup core1
@@ -117,6 +117,6 @@
SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(const char *str);
///\}
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_module_interfaces.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_module_interfaces.h (original)
+++ freeswitch/branches/james/src/include/switch_module_interfaces.h Sun Sep 10 07:09:34 2006
@@ -41,7 +41,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
/*! \brief A table of functions to execute at various states
*/
@@ -68,6 +68,8 @@
void *end;
switch_size_t data_size;
switch_size_t data_len;
+ switch_size_t alloc_len;
+ switch_size_t alloc_chunk;
switch_event_t *event;
};
@@ -534,6 +536,6 @@
const struct switch_api_interface *next;
};
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_platform.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_platform.h (original)
+++ freeswitch/branches/james/src/include/switch_platform.h Sun Sep 10 07:09:34 2006
@@ -34,7 +34,7 @@
#ifndef SWITCH_PLATFORM_H
#define SWITCH_PLATFORM_H
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#ifdef __ICC
#pragma warning (disable:810 869 981 279 1469 188)
@@ -141,6 +141,6 @@
#define DoxyDefine(x)
#endif
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_resample.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_resample.h (original)
+++ freeswitch/branches/james/src/include/switch_resample.h Sun Sep 10 07:09:34 2006
@@ -43,7 +43,7 @@
#define SWITCH_RESAMPLE_H
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#include <stdlib.h>
/*!
@@ -156,7 +156,7 @@
///\}
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_rtp.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_rtp.h (original)
+++ freeswitch/branches/james/src/include/switch_rtp.h Sun Sep 10 07:09:34 2006
@@ -38,7 +38,7 @@
#ifndef SWITCH_RTP_H
#define SWITCH_RTP_H
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#define SWITCH_RTP_MAX_BUF_LEN 16384
@@ -373,6 +373,6 @@
\}
*/
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_sqlite.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_sqlite.h (original)
+++ freeswitch/branches/james/src/include/switch_sqlite.h Sun Sep 10 07:09:34 2006
@@ -35,7 +35,7 @@
#ifndef SWITCH_SQLITE_H
#define SWITCH_SQLITE_H
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#include <sqlite3.h>
@@ -1804,6 +1804,6 @@
/** @} */
/** @} */
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_stun.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_stun.h (original)
+++ freeswitch/branches/james/src/include/switch_stun.h Sun Sep 10 07:09:34 2006
@@ -37,7 +37,7 @@
#ifndef _SWITCH_STUN_PARSER_H
#define _SWITCH_STUN_PARSER_H
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#define SWITCH_STUN_DEFAULT_PORT 3478
#define SWITCH_STUN_PACKET_MIN_LEN 20
@@ -240,6 +240,6 @@
#define switch_stun_packet_length(packet) ntohs(packet->header.length) + sizeof(switch_stun_packet_header_t)
///\}
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_types.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_types.h (original)
+++ freeswitch/branches/james/src/include/switch_types.h Sun Sep 10 07:09:34 2006
@@ -36,7 +36,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#ifdef WIN32
#define SWITCH_PATH_SEPARATOR "\\"
@@ -80,6 +80,12 @@
SWITCH_BITPACK_MODE_AAL2
} switch_bitpack_mode_t;
+typedef enum {
+ SWITCH_ABC_TYPE_INIT,
+ SWITCH_ABC_TYPE_READ,
+ SWITCH_ABC_TYPE_WRITE,
+ SWITCH_ABC_TYPE_CLOSE,
+} switch_abc_type_t;
typedef struct {
switch_byte_t *buf;
@@ -382,7 +388,8 @@
CF_HOLD = (1 << 8) - Channel is on hold
CF_SERVICE = (1 << 9) - Channel has a service thread
CF_TAGGED = (1 << 10) - Channel is tagged
-CF_WINNER = (1 << 10) - Channel is the winner
+CF_WINNER = (1 << 11) - Channel is the winner
+CF_CONTROLLED = (1 << 12) - Channel is under control
</pre>
*/
@@ -398,7 +405,8 @@
CF_HOLD = (1 << 8),
CF_SERVICE = (1 << 9),
CF_TAGGED = (1 << 10),
- CF_WINNER = (1 << 11)
+ CF_WINNER = (1 << 11),
+ CF_CONTROLLED = (1 << 12)
} switch_channel_flag_t;
@@ -444,6 +452,7 @@
SWITCH_CODEC_FLAG_SILENCE = (1 << 4) - Silence
SWITCH_CODEC_FLAG_FREE_POOL = (1 << 5) - Free codec's pool on destruction
SWITCH_CODEC_FLAG_AAL2 = (1 << 6) - USE AAL2 Bitpacking
+SWITCH_CODEC_FLAG_PASSTHROUGH = (1 << 7) - Passthrough only
</pre>
*/
typedef enum {
@@ -453,7 +462,8 @@
SWITCH_CODEC_FLAG_SILENCE_STOP = (1 << 3),
SWITCH_CODEC_FLAG_SILENCE = (1 << 4),
SWITCH_CODEC_FLAG_FREE_POOL = (1 << 5),
- SWITCH_CODEC_FLAG_AAL2 = (1 << 6)
+ SWITCH_CODEC_FLAG_AAL2 = (1 << 6),
+ SWITCH_CODEC_FLAG_PASSTHROUGH = (1 << 7)
} switch_codec_flag_t;
@@ -571,6 +581,10 @@
SWITCH_EVENT_CHANNEL_EXECUTE - A channel has executed a module's application
SWITCH_EVENT_CHANNEL_BRIDGE - A channel has bridged to another channel
SWITCH_EVENT_CHANNEL_UNBRIDGE - A channel has unbridged from another channel
+ SWITCH_EVENT_CHANNEL_PROGRESS - A channel has been parked
+ SWITCH_EVENT_CHANNEL_OUTGOING - A channel has been unparked
+ SWITCH_EVENT_CHANNEL_PARK - A channel has been parked
+ SWITCH_EVENT_CHANNEL_UNPARK - A channel has been unparked
SWITCH_EVENT_API - An API call has been executed
SWITCH_EVENT_LOG - A LOG event has been triggered
SWITCH_EVENT_INBOUND_CHAN - A new inbound channel has been created
@@ -586,8 +600,7 @@
SWITCH_EVENT_DTMF - DTMF was sent
SWITCH_EVENT_MESSAGE - A Basic Message
SWITCH_EVENT_CODEC - Codec Change
- SWITCH_EVENT_PROGRESS - Early Media
- SWITCH_EVENT_OUTGOING - Outgoing Channel
+ SWITCH_EVENT_BACKGROUND_JOB - Background Job
SWITCH_EVENT_ALL - All events at once
</pre>
@@ -604,6 +617,8 @@
SWITCH_EVENT_CHANNEL_UNBRIDGE,
SWITCH_EVENT_CHANNEL_PROGRESS,
SWITCH_EVENT_CHANNEL_OUTGOING,
+ SWITCH_EVENT_CHANNEL_PARK,
+ SWITCH_EVENT_CHANNEL_UNPARK,
SWITCH_EVENT_API,
SWITCH_EVENT_LOG,
SWITCH_EVENT_INBOUND_CHAN,
@@ -619,6 +634,7 @@
SWITCH_EVENT_DTMF,
SWITCH_EVENT_MESSAGE,
SWITCH_EVENT_CODEC,
+ SWITCH_EVENT_BACKGROUND_JOB,
SWITCH_EVENT_ALL
} switch_event_types_t;
@@ -728,7 +744,9 @@
typedef struct switch_file_interface switch_file_interface_t;
typedef struct switch_speech_interface switch_speech_interface_t;
typedef struct switch_directory_interface switch_directory_interface_t;
-
+typedef struct switch_core_port_allocator switch_core_port_allocator_t;
+typedef struct switch_media_bug switch_media_bug_t;
+typedef void (*switch_media_bug_callback_t)(switch_media_bug_t *, void *, switch_abc_type_t);
typedef void (*switch_application_function_t)(switch_core_session_t *, char *);
typedef void (*switch_event_callback_t)(switch_event_t *);
typedef switch_caller_extension_t *(*switch_dialplan_hunt_function_t)(switch_core_session_t *);
@@ -773,7 +791,9 @@
struct switch_channel;
/*! \brief A core session representing a call and all of it's resources */
struct switch_core_session;
+/*! \brief An audio bug */
+struct switch_media_bug;
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_utils.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_utils.h (original)
+++ freeswitch/branches/james/src/include/switch_utils.h Sun Sep 10 07:09:34 2006
@@ -40,7 +40,7 @@
#include <switch.h>
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#ifndef snprintf
#define snprintf apr_snprintf
@@ -50,6 +50,12 @@
#endif
+#define SWITCH_SMAX 32767
+#define SWITCH_SMIN -32768
+#define switch_normalize_to_16bit(n) if (n > SWITCH_SMAX) n = SWITCH_SMAX / 2; else if (n < SWITCH_SMIN) n = SWITCH_SMIN / 2;
+
+
+
/*!
\brief Evaluate the truthfullness of a string expression
\param expr a string expression
@@ -210,6 +216,6 @@
#define SWITCH_READ_ACCEPTABLE(status) status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK
SWITCH_DECLARE(size_t) switch_url_encode(char *url, char *buf, size_t len);
SWITCH_DECLARE(char *) switch_url_decode(char *s);
-END_EXTERN_C
+SWITCH_END_EXTERN_C
#endif
Modified: freeswitch/branches/james/src/include/switch_xml.h
==============================================================================
--- freeswitch/branches/james/src/include/switch_xml.h (original)
+++ freeswitch/branches/james/src/include/switch_xml.h Sun Sep 10 07:09:34 2006
@@ -65,7 +65,7 @@
///\defgroup xml1 XML Library Functions
///\ingroup core1
///\{
-BEGIN_EXTERN_C
+SWITCH_BEGIN_EXTERN_C
#define SWITCH_XML_BUFSIZE 1024 // size of internal memory buffers
@@ -331,7 +331,7 @@
///\return the section mask
SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str);
-END_EXTERN_C
+SWITCH_END_EXTERN_C
///\}
Modified: freeswitch/branches/james/src/mod/applications/mod_commands/mod_commands.c
==============================================================================
--- freeswitch/branches/james/src/mod/applications/mod_commands/mod_commands.c (original)
+++ freeswitch/branches/james/src/mod/applications/mod_commands/mod_commands.c Sun Sep 10 07:09:34 2006
@@ -260,7 +260,7 @@
return SWITCH_STATUS_SUCCESS;
}
- if (switch_ivr_originate(NULL, &caller_session, aleg, timeout, NULL, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) {
+ if (switch_ivr_originate(NULL, &caller_session, aleg, timeout, &noop_state_handler, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) {
stream->write_function(stream, "Cannot Create Outgoing Channel! [%s]\n", aleg);
return SWITCH_STATUS_SUCCESS;
}
@@ -268,10 +268,33 @@
caller_channel = switch_core_session_get_channel(caller_session);
assert(caller_channel != NULL);
switch_channel_clear_state_handler(caller_channel, NULL);
- switch_core_session_rwunlock(caller_session);
- switch_ivr_session_transfer(caller_session, exten, dp, context);
+ if (*exten == '&') {
+ switch_caller_extension_t *extension = NULL;
+ char *app_name = switch_core_session_strdup(caller_session, (exten + 1));
+ char *arg, *e;
+
+ if ((e = strchr(app_name, ')'))) {
+ *e = '\0';
+ }
+
+ if ((arg = strchr(app_name, '('))) {
+ *arg++ = '\0';
+ }
+
+ if ((extension = switch_caller_extension_new(caller_session, app_name, arg)) == 0) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n");
+ switch_channel_hangup(caller_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+ return SWITCH_STATUS_MEMERR;
+ }
+ switch_caller_extension_add_application(caller_session, extension, app_name, arg);
+ switch_channel_set_caller_extension(caller_channel, extension);
+ switch_channel_set_state(caller_channel, CS_EXECUTE);
+ } else {
+ switch_ivr_session_transfer(caller_session, exten, dp, context);
+ }
+ stream->write_function(stream, "Created Session: %s\n", switch_core_session_get_uuid(caller_session));
return SWITCH_STATUS_SUCCESS;;
}
Modified: freeswitch/branches/james/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/branches/james/src/mod/applications/mod_conference/mod_conference.c (original)
+++ freeswitch/branches/james/src/mod/applications/mod_conference/mod_conference.c Sun Sep 10 07:09:34 2006
@@ -40,6 +40,10 @@
#define CONF_EVENT_MAINT "conference::maintenence"
#define CONF_DEFAULT_LEADIN 20
+#define CONF_DBLOCK_SIZE CONF_BUFFER_SIZE
+#define CONF_DBUFFER_SIZE CONF_BUFFER_SIZE
+#define CONF_DBUFFER_MAX 0
+
typedef enum {
FILE_STOP_CURRENT,
FILE_STOP_ALL
@@ -197,6 +201,7 @@
switch_core_session_t *session,
char *bridgeto,
uint32_t timeout,
+ char *flags,
char *cid_name,
char *cid_num);
static void conference_function(switch_core_session_t *session, char *data);
@@ -223,10 +228,6 @@
}
-#define SMAX 32767
-#define SMIN -32768
-#define normalize_to_16bit(n) if (n > SMAX) n = SMAX; else if (n < SMIN) n = SMIN;
-
static void switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol)
{
int16_t *p = data;
@@ -244,7 +245,7 @@
for (x = 0; x < samples; x++) {
b = (int32_t)((double)p[x] * mult);
- normalize_to_16bit(b);
+ switch_normalize_to_16bit(b);
p[x] = (int16_t) b;
}
}
@@ -595,7 +596,7 @@
for (x = 0; x < imember->read / 2; x++) {
int32_t z = muxed[x] + bptr[x];
- normalize_to_16bit(z);
+ switch_normalize_to_16bit(z);
muxed[x] = (int16_t)z;
}
@@ -1018,7 +1019,7 @@
}
#ifdef WIN32
- if (file[1] != ':') {
+ if (*(file +1) != ':' && *file != '/') {
#else
if (*file != '/') {
#endif
@@ -1399,7 +1400,7 @@
goto done;
} else if (!strcasecmp(argv[1], "dial")) {
if (argc > 2) {
- conference_outcall(conference, NULL, argv[2], 60, argv[3], argv[4]);
+ conference_outcall(conference, NULL, argv[2], 60, argv[3], argv[4], argv[5]);
stream->write_function(stream, "OK\n");
goto done;
} else {
@@ -1557,7 +1558,6 @@
conference_member_t *member;
if ((member = conference_member_get(conference, id))) {
- switch_clear_flag_locked(member, MFLAG_CAN_SPEAK);
if (argv[3]) {
switch_mutex_lock(member->flag_mutex);
@@ -1595,7 +1595,6 @@
conference_member_t *member;
if ((member = conference_member_get(conference, id))) {
- switch_clear_flag_locked(member, MFLAG_CAN_SPEAK);
if (argv[3]) {
switch_mutex_lock(member->flag_mutex);
@@ -1633,7 +1632,6 @@
conference_member_t *member;
if ((member = conference_member_get(conference, id))) {
- switch_clear_flag_locked(member, MFLAG_CAN_SPEAK);
if (argv[3]) {
switch_mutex_lock(member->flag_mutex);
@@ -2037,6 +2035,7 @@
switch_core_session_t *session,
char *bridgeto,
uint32_t timeout,
+ char *flags,
char *cid_name,
char *cid_num)
{
@@ -2044,6 +2043,7 @@
switch_channel_t *peer_channel;
switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_channel_t *caller_channel = NULL;
+ char appdata[512];
if (switch_ivr_originate(session, &peer_session, bridgeto, timeout, &audio_bridge_peer_state_handlers, cid_name, cid_num, NULL) != SWITCH_STATUS_SUCCESS) {
@@ -2071,7 +2071,13 @@
goto done;
}
/* add them to the conference */
- switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference->name);
+ if (flags) {
+ snprintf(appdata, sizeof(appdata), "%s +flags{%s}", conference->name, flags);
+ switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, appdata);
+ } else {
+ switch_caller_extension_add_application(peer_session, extension, (char *) global_app_name, conference->name);
+ }
+
switch_channel_set_caller_extension(peer_channel, extension);
switch_channel_set_state(peer_channel, CS_EXECUTE);
@@ -2177,23 +2183,19 @@
*dpin++ = '\0';
}
- /* Open the config from the xml registry */
- if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name);
- goto done;
- }
-
if ((profile_name = strchr(conf_name, '@'))) {
*profile_name++ = '\0';
+ /* Open the config from the xml registry */
+ if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, NULL))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", global_cf_name);
+ goto done;
+ }
+
if ((profiles = switch_xml_child(cfg, "profiles"))) {
profile = switch_xml_find_child(profiles, "profile", "name", profile_name);
}
- } else {
- if ((profiles = switch_xml_child(cfg, "profiles"))) {
- profile = switch_xml_find_child(profiles, "profile", "name", "default");
- }
- }
+ }
if (isbr) {
char *uuid = switch_core_session_get_uuid(session);
@@ -2306,7 +2308,7 @@
if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) {
- if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
+ if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
goto done;
}
}
@@ -2349,7 +2351,7 @@
switch_core_session_get_pool(session));
/* Setup an audio buffer for the resampled audio */
- if (switch_buffer_create(pool, &member.resample_buffer, CONF_BUFFER_SIZE) != SWITCH_STATUS_SUCCESS) {
+ if (switch_buffer_create_dynamic(&member.resample_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
goto done;
}
@@ -2375,13 +2377,13 @@
}
/* Setup an audio buffer for the incoming audio */
- if (switch_buffer_create(pool, &member.audio_buffer, CONF_BUFFER_SIZE) != SWITCH_STATUS_SUCCESS) {
+ if (switch_buffer_create_dynamic(&member.audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
goto codec_done1;
}
/* Setup an audio buffer for the outgoing audio */
- if (switch_buffer_create(pool, &member.mux_buffer, CONF_BUFFER_SIZE) != SWITCH_STATUS_SUCCESS) {
+ if (switch_buffer_create_dynamic(&member.mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
goto codec_done1;
}
@@ -2429,6 +2431,10 @@
switch_core_codec_destroy(&member.write_codec);
done:
+ switch_buffer_destroy(&member.resample_buffer);
+ switch_buffer_destroy(&member.audio_buffer);
+ switch_buffer_destroy(&member.mux_buffer);
+
/* Release the config registry handle */
if (cxml) {
switch_xml_free(cxml);
Modified: freeswitch/branches/james/src/mod/applications/mod_playback/mod_playback.c
==============================================================================
--- freeswitch/branches/james/src/mod/applications/mod_playback/mod_playback.c (original)
+++ freeswitch/branches/james/src/mod/applications/mod_playback/mod_playback.c Sun Sep 10 07:09:34 2006
@@ -133,6 +133,26 @@
}
+static void record_session_function(switch_core_session_t *session, char *data)
+{
+ switch_channel_t *channel;
+ channel = switch_core_session_get_channel(session);
+ assert(channel != NULL);
+
+ switch_ivr_record_session(session, data, NULL);
+}
+
+
+static void stop_record_session_function(switch_core_session_t *session, char *data)
+{
+ switch_channel_t *channel;
+ channel = switch_core_session_get_channel(session);
+ assert(channel != NULL);
+
+ switch_ivr_stop_record_session(session, data);
+}
+
+
static const switch_application_interface_t speak_application_interface = {
/*.interface_name */ "speak",
/*.application_function */ speak_function
@@ -145,11 +165,27 @@
&speak_application_interface
};
+
+static const switch_application_interface_t record_session_application_interface = {
+ /*.interface_name */ "record_session",
+ /*.application_function */ record_session_function,
+ NULL,NULL,NULL,
+ &record_application_interface
+};
+
+
+static const switch_application_interface_t stop_record_session_application_interface = {
+ /*.interface_name */ "stop_record_session",
+ /*.application_function */ stop_record_session_function,
+ NULL,NULL,NULL,
+ &record_session_application_interface
+};
+
static const switch_application_interface_t playback_application_interface = {
/*.interface_name */ "playback",
/*.application_function */ playback_function,
NULL,NULL,NULL,
- /*.next*/ &record_application_interface
+ /*.next*/ &stop_record_session_application_interface
};
static const switch_loadable_module_interface_t mod_playback_module_interface = {
Modified: freeswitch/branches/james/src/mod/asr_tts/mod_cepstral/mod_cepstral.c
==============================================================================
--- freeswitch/branches/james/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original)
+++ freeswitch/branches/james/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Sun Sep 10 07:09:34 2006
@@ -42,7 +42,8 @@
#include <swift.h>
#include <switch.h>
-#define MY_BUF_LEN 1024 * 256
+#define MY_BUF_LEN 1024 * 32
+#define MY_BLOCK_SIZE MY_BUF_LEN
static const char modname[] = "mod_cepstral";
@@ -119,7 +120,7 @@
return SWITCH_STATUS_MEMERR;
}
- if (switch_buffer_create(sh->memory_pool, &cepstral->audio_buffer, MY_BUF_LEN) != SWITCH_STATUS_SUCCESS) {
+ if (switch_buffer_create_dynamic(&cepstral->audio_buffer, MY_BLOCK_SIZE, MY_BUF_LEN, 0) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write Buffer Failed!\n");
return SWITCH_STATUS_MEMERR;
}
@@ -195,6 +196,8 @@
cepstral->port = NULL;
//cepstral->engine = NULL;
+ switch_buffer_destroy(&cepstral->audio_buffer);
+
return SWITCH_STATUS_SUCCESS;
}
Modified: freeswitch/branches/james/src/mod/codecs/mod_g722/mod_g722.c
==============================================================================
--- freeswitch/branches/james/src/mod/codecs/mod_g722/mod_g722.c (original)
+++ freeswitch/branches/james/src/mod/codecs/mod_g722/mod_g722.c Sun Sep 10 07:09:34 2006
@@ -53,16 +53,22 @@
if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g722_context))))) {
return SWITCH_STATUS_FALSE;
} else {
- if (!(encoding || decoding)) {
-
- if (encoding) {
+ if (encoding) {
+ if(codec->implementation->samples_per_second == 16000){
g722_encode_init(&context->encoder_object, 64000, G722_PACKED);
+ } else {
+ g722_encode_init(&context->encoder_object, 64000, G722_SAMPLE_RATE_8000);
}
- if (decoding) {
+ }
+ if (decoding) {
+ if(codec->implementation->samples_per_second == 16000){
g722_decode_init(&context->decoder_object, 64000, G722_PACKED);
+ } else {
+ g722_decode_init(&context->decoder_object, 64000, G722_SAMPLE_RATE_8000);
}
}
}
+
codec->private_info = context;
return SWITCH_STATUS_SUCCESS;
}
@@ -115,7 +121,7 @@
/* Registration */
-static const switch_codec_implementation_t g722_implementation = {
+static const switch_codec_implementation_t g722_8k_implementation = {
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
/*.ianacode */ 9,
/*.iananame */ "G722",
@@ -132,12 +138,31 @@
/*.encode */ switch_g722_encode,
/*.decode */ switch_g722_decode,
/*.destroy */ switch_g722_destroy,
- ///*.next */ &g711u_16k_implementation
};
+static const switch_codec_implementation_t g722_16k_implementation = {
+ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
+ /*.ianacode */ 9,
+ /*.iananame */ "G722",
+ /*.samples_per_second */ 16000,
+ /*.bits_per_second */ 64000,
+ /*.microseconds_per_frame */ 20000,
+ /*.samples_per_frame */ 160,
+ /*.bytes_per_frame */ 320,
+ /*.encoded_bytes_per_frame */ 160,
+ /*.number_of_channels */ 1,
+ /*.pref_frames_per_packet */ 1,
+ /*.max_frames_per_packet */ 1,
+ /*.init */ switch_g722_init,
+ /*.encode */ switch_g722_encode,
+ /*.decode */ switch_g722_decode,
+ /*.destroy */ switch_g722_destroy,
+ /*.next */ &g722_8k_implementation
+};
+
static const switch_codec_interface_t g722_codec_interface = {
/*.interface_name */ "g722",
- /*.implementations */ &g722_implementation
+ /*.implementations */ &g722_16k_implementation
};
static switch_loadable_module_interface_t g722_module_interface = {
Modified: freeswitch/branches/james/src/mod/codecs/mod_g723_1/mod_g723_1.c
==============================================================================
--- freeswitch/branches/james/src/mod/codecs/mod_g723_1/mod_g723_1.c (original)
+++ freeswitch/branches/james/src/mod/codecs/mod_g723_1/mod_g723_1.c Sun Sep 10 07:09:34 2006
@@ -32,6 +32,8 @@
*
*/
#include "switch.h"
+
+#ifndef G723_PASSTHROUGH
#include "g723.h"
#define TYPE_HIGH 0x0
@@ -45,19 +47,26 @@
Flag UseVx = True;
enum Crate WrkRate = Rate63;
+#endif
static const char modname[] = "mod_g723_1";
+#ifndef G723_PASSTHROUGH
struct g723_context {
struct cod_state encoder_object;
struct dec_state decoder_object;
float cod_float_buf[Frame];
float dec_float_buf[Frame];
};
+#endif
static switch_status_t switch_g723_init(switch_codec_t *codec, switch_codec_flag_t flags,
const switch_codec_settings_t *codec_settings)
{
+#ifdef G723_PASSTHROUGH
+ codec->flags |= SWITCH_CODEC_FLAG_PASSTHROUGH;
+ return SWITCH_STATUS_FALSE;
+#else
struct g723_context *context = NULL;
int encoding, decoding;
@@ -85,12 +94,15 @@
return SWITCH_STATUS_SUCCESS;
}
+#endif
}
static switch_status_t switch_g723_destroy(switch_codec_t *codec)
{
+#ifndef G723_PASSTHROUGH
codec->private_info = NULL;
+#endif
return SWITCH_STATUS_SUCCESS;
}
@@ -106,6 +118,10 @@
uint32_t *encoded_rate,
unsigned int *flag)
{
+#ifdef G723_PASSTHROUGH
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This codec is only usable in passthrough mode!\n");
+ return SWITCH_STATUS_FALSE;
+#else
struct g723_context *context = codec->private_info;
int16_t *decoded_slin_buf = (int16_t *) decoded_data;
char *ebuf = (char *) encoded_data;
@@ -123,6 +139,7 @@
*encoded_data_len = codec->implementation->encoded_bytes_per_frame;
return SWITCH_STATUS_SUCCESS;
+#endif
}
static switch_status_t switch_g723_decode(switch_codec_t *codec,
@@ -137,6 +154,10 @@
uint32_t *decoded_rate,
unsigned int *flag)
{
+#ifdef G723_PASSTHROUGH
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This codec is only usable in passthrough mode!\n");
+ return SWITCH_STATUS_FALSE;
+#else
struct g723_context *context = codec->private_info;
int x;
int16_t *to_slin_buf = decoded_data;
@@ -153,11 +174,12 @@
*decoded_data_len = codec->implementation->bytes_per_frame;
return SWITCH_STATUS_SUCCESS;
+#endif
}
/* Registration */
-static const switch_codec_implementation_t g723_1_30ms_implementation = {
+static const switch_codec_implementation_t g723_1_implementation = {
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
/*.ianacode */ 4,
/*.iananame */ "G723",
@@ -169,49 +191,24 @@
/*.encoded_bytes_per_frame */ 24,
/*.number_of_channels */ 1,
/*.pref_frames_per_packet */ 1,
- /*.max_frames_per_packet */ 2,
+ /*.max_frames_per_packet */ 4,
/*.init */ switch_g723_init,
/*.encode */ switch_g723_encode,
/*.decode */ switch_g723_decode,
/*.destroy */ switch_g723_destroy,
};
-#if 0
-static const switch_codec_implementation_t g723_1_60ms_implementation = {
- /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
- /*.ianacode */ 4,
- /*.iananame */ "G723",
- /*.samples_per_second */ 8000,
- /*.bits_per_second */ 6300,
- /*.microseconds_per_frame */ 60000,
- /*.samples_per_frame */ 240,
- /*.bytes_per_frame */ 480,
- /*.encoded_bytes_per_frame */ 24,
- /*.number_of_channels */ 1,
- /*.pref_frames_per_packet */ 2,
- /*.max_frames_per_packet */ 2,
- /*.init */ switch_g723_init,
- /*.encode */ switch_g723_encode,
- /*.decode */ switch_g723_decode,
- /*.destroy */ switch_g723_destroy,
-};
-#endif
-static const switch_codec_interface_t g723_1_30ms_codec_interface = {
+
+static const switch_codec_interface_t g723_1_codec_interface = {
/*.interface_name */ "g723.1 6.3k",
- /*.implementations */ &g723_1_30ms_implementation,
+ /*.implementations */ &g723_1_implementation,
};
-#if 0
-static const switch_codec_interface_t g723_1_60ms_codec_interface = {
- /*.interface_name */ "g723.1 6.3k",
- /*.implementations */ &g723_1_60ms_implementation,
- /*.next */ &g723_1_30ms_codec_interface
-};
-#endif
+
static switch_loadable_module_interface_t g723_module_interface = {
/*.module_name */ modname,
/*.endpoint_interface */ NULL,
/*.timer_interface */ NULL,
/*.dialplan_interface */ NULL,
- /*.codec_interface */ &g723_1_30ms_codec_interface,
+ /*.codec_interface */ &g723_1_codec_interface,
/*.application_interface */ NULL
};
Modified: freeswitch/branches/james/src/mod/codecs/mod_g729/mod_g729.c
==============================================================================
--- freeswitch/branches/james/src/mod/codecs/mod_g729/mod_g729.c (original)
+++ freeswitch/branches/james/src/mod/codecs/mod_g729/mod_g729.c Sun Sep 10 07:09:34 2006
@@ -31,20 +31,27 @@
* mod_g729.c -- G729 Codec Module
*
*/
-#include "switch.h"
-#include "g729.h"
static const char modname[] = "mod_g729";
+#include "switch.h"
+
+#ifndef G729_PASSTHROUGH
+#include "g729.h"
+
struct g729_context {
struct dec_state decoder_object;
struct cod_state encoder_object;
};
+#endif
static switch_status_t switch_g729_init(switch_codec_t *codec, switch_codec_flag_t flags,
const switch_codec_settings_t *codec_settings)
{
-
+#ifdef G729_PASSTHROUGH
+ codec->flags |= SWITCH_CODEC_FLAG_PASSTHROUGH;
+ return SWITCH_STATUS_SUCCESS;
+#else
struct g729_context *context = NULL;
int encoding, decoding;
@@ -68,11 +75,14 @@
return SWITCH_STATUS_SUCCESS;
}
+#endif
}
static switch_status_t switch_g729_destroy(switch_codec_t *codec)
{
+#ifndef G729_PASSTHROUGH
codec->private_info = NULL;
+#endif
return SWITCH_STATUS_SUCCESS;
}
@@ -88,6 +98,10 @@
uint32_t *encoded_rate,
unsigned int *flag)
{
+#ifdef G729_PASSTHROUGH
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This codec is only usable in passthrough mode!\n");
+ return SWITCH_STATUS_FALSE;
+#else
struct g729_context *context = codec->private_info;
int cbret = 0;
@@ -117,6 +131,7 @@
}
}
return SWITCH_STATUS_SUCCESS;
+#endif
}
static switch_status_t switch_g729_decode(switch_codec_t *codec,
@@ -131,6 +146,10 @@
uint32_t *decoded_rate,
unsigned int *flag)
{
+#ifdef G729_PASSTHROUGH
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This codec is only usable in passthrough mode!\n");
+ return SWITCH_STATUS_FALSE;
+#else
struct g729_context *context = codec->private_info;
int divisor = 10;
int plen = 10;
@@ -194,6 +213,7 @@
return SWITCH_STATUS_FALSE;
}
return SWITCH_STATUS_SUCCESS;
+#endif
}
/* Registration */
@@ -237,49 +257,9 @@
&g729_10ms_8k_implementation
};
-static const switch_codec_implementation_t g729a_10ms_8k_implementation = {
- /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
- /*.ianacode */ 18,
- /*.iananame */ "G729a",
- /*.samples_per_second */ 8000,
- /*.bits_per_second */ 32000,
- /*.microseconds_per_frame */ 10000,
- /*.samples_per_frame */ 80,
- /*.bytes_per_frame */ 160,
- /*.encoded_bytes_per_frame */ 10,
- /*.number_of_channels */ 1,
- /*.pref_frames_per_packet */ 1,
- /*.max_frames_per_packet */ 1,
- /*.init */ switch_g729_init,
- /*.encode */ switch_g729_encode,
- /*.decode */ switch_g729_decode,
- /*.destroy */ switch_g729_destroy,
- &g729_8k_implementation
-};
-
-static const switch_codec_implementation_t g729a_8k_implementation = {
- /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
- /*.ianacode */ 18,
- /*.iananame */ "G729a",
- /*.samples_per_second */ 8000,
- /*.bits_per_second */ 64000,
- /*.microseconds_per_frame */ 20000,
- /*.samples_per_frame */ 160,
- /*.bytes_per_frame */ 320,
- /*.encoded_bytes_per_frame */ 20,
- /*.number_of_channels */ 1,
- /*.pref_frames_per_packet */ 1,
- /*.max_frames_per_packet */ 1,
- /*.init */ switch_g729_init,
- /*.encode */ switch_g729_encode,
- /*.decode */ switch_g729_decode,
- /*.destroy */ switch_g729_destroy,
- &g729a_10ms_8k_implementation
-};
-
static const switch_codec_interface_t g729_codec_interface = {
/*.interface_name */ "g729",
- /*.implementations */ &g729a_8k_implementation,
+ /*.implementations */ &g729_8k_implementation,
};
static switch_loadable_module_interface_t g729_module_interface = {
Modified: freeswitch/branches/james/src/mod/codecs/mod_g729/mod_g729.vcproj
==============================================================================
--- freeswitch/branches/james/src/mod/codecs/mod_g729/mod_g729.vcproj (original)
+++ freeswitch/branches/james/src/mod/codecs/mod_g729/mod_g729.vcproj Sun Sep 10 07:09:34 2006
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cscript /nologo "$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs" Mod_CodecG729 Debug"
+ CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@@ -109,7 +109,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cscript /nologo "$(InputDir)..\..\..\..\w32\vsnet\getlibs.vbs" Mod_CodecG729 Release"
+ CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@@ -145,6 +145,170 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libg729.lib FreeSwitchCore.lib"
+ OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ ImportLibrary="$(OutDir)/mod_g729.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug Passthrough|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine=""
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg729\src\include""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;G729_PASSTHROUGH"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ WarnAsError="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
+ SubSystem="2"
+ ImportLibrary="$(OutDir)/mod_g729.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release Passthrough|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine=""
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\codec\libg729\src\include""
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;G729_PASSTHROUGH"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="4"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\w32\vsnet\$(OutDir)"
Modified: freeswitch/branches/james/src/mod/endpoints/mod_dingaling/mod_dingaling.c
==============================================================================
--- freeswitch/branches/james/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original)
+++ freeswitch/branches/james/src/mod/endpoints/mod_dingaling/mod_dingaling.c Sun Sep 10 07:09:34 2006
@@ -283,17 +283,13 @@
{
switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session);
const char *err;
- int ms = 20;
+ int ms = 0;
switch_rtp_flag_t flags;
if (switch_rtp_ready(tech_pvt->rtp_session)) {
return 1;
}
- if (!strncasecmp(tech_pvt->codec_name, "ilbc", 4)) {
- ms = 30;
- }
-
if (switch_core_codec_init(&tech_pvt->read_codec,
tech_pvt->codec_name,
tech_pvt->codec_rate,
@@ -1693,6 +1689,7 @@
if (!strncasecmp(name, "ilbc", 4)) {
name = "ilbc";
}
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "compare %s %d to %s %d\n", payloads[x].name, payloads[x].id, name, tech_pvt->codecs[y]->ianacode);
if (tech_pvt->codecs[y]->ianacode > 96) {
match = strcasecmp(name, payloads[x].name) ? 0 : 1;
} else {
Modified: freeswitch/branches/james/src/mod/endpoints/mod_exosip/mod_exosip.c
==============================================================================
--- freeswitch/branches/james/src/mod/endpoints/mod_exosip/mod_exosip.c (original)
+++ freeswitch/branches/james/src/mod/endpoints/mod_exosip/mod_exosip.c Sun Sep 10 07:09:34 2006
@@ -1439,17 +1439,13 @@
{
int rate = atoi(drate);
- int ms = globals.codec_ms;
+ int ms = 0; //globals.codec_ms;
if (imp) {
ms = imp->microseconds_per_frame / 1000;
}
- if (!strcasecmp(dname, "ilbc")) {
- ms = 30;
- }
-
if (switch_core_codec_init(&tech_pvt->read_codec,
dname,
rate,
@@ -1938,12 +1934,8 @@
if (!switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) {
int rate = atoi(drate);
- int ms = globals.codec_ms;
+ int ms = 0; //globals.codec_ms;
- if (!strcasecmp(dname, "ilbc")) {
- ms = 30;
- }
-
if (imp) {
ms = imp->microseconds_per_frame / 1000;
}
@@ -2273,7 +2265,7 @@
}
if (!globals.codec_ms) {
- globals.codec_ms = 20;
+ globals.codec_ms = 0;
}
if (!globals.port) {
Modified: freeswitch/branches/james/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/branches/james/src/mod/endpoints/mod_sofia/mod_sofia.c (original)
+++ freeswitch/branches/james/src/mod/endpoints/mod_sofia/mod_sofia.c Sun Sep 10 07:09:34 2006
@@ -550,7 +550,11 @@
if (tech_pvt->nh) {
if (!switch_test_flag(tech_pvt, TFLAG_BYE)) {
- nua_bye(tech_pvt->nh, TAG_END());
+ if (switch_test_flag(tech_pvt, TFLAG_ANS)) {
+ nua_bye(tech_pvt->nh, TAG_END());
+ } else {
+ nua_cancel(tech_pvt->nh, TAG_END());
+ }
}
nua_handle_bind(tech_pvt->nh, NULL);
nua_handle_destroy(tech_pvt->nh);
@@ -833,8 +837,13 @@
if (tech_pvt->read_frame.datalen > 0) {
tech_pvt->last_read = switch_time_now();
- bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
- frames = (tech_pvt->read_frame.datalen / bytes);
+
+ if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) {
+ bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
+ frames = (tech_pvt->read_frame.datalen / bytes);
+ } else
+ frames = 1;
+
samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame;
tech_pvt->timestamp_recv += (int32_t) samples;
@@ -884,8 +893,12 @@
switch_set_flag_locked(tech_pvt, TFLAG_WRITING);
- bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
- frames = ((int) frame->datalen / bytes);
+ if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) {
+ bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
+ frames = ((int) frame->datalen / bytes);
+ } else
+ frames = 1;
+
samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
#if 0
@@ -1652,6 +1665,8 @@
profile->name = switch_core_strdup(profile->pool, xprofilename);
profile->dtmf_duration = 100;
+ profile->codec_ms = 20;
+
for (param = switch_xml_child(xprofile, "param"); param; param = param->next) {
char *var = (char *) switch_xml_attr_soft(param, "name");
char *val = (char *) switch_xml_attr_soft(param, "value");
@@ -1729,10 +1744,6 @@
profile->rtpip = switch_core_strdup(profile->pool, "127.0.0.1");
}
- if (!profile->codec_ms) {
- profile->codec_ms = 20;
- }
-
if (!profile->sip_port) {
profile->sip_port = 5060;
}
Modified: freeswitch/branches/james/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
==============================================================================
--- freeswitch/branches/james/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original)
+++ freeswitch/branches/james/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Sun Sep 10 07:09:34 2006
@@ -370,6 +370,8 @@
teletone_destroy_session(&tech_pvt->tone_session);
+ switch_buffer_destroy(&tech_pvt->dtmf_buffer);
+
return SWITCH_STATUS_SUCCESS;
}
@@ -623,7 +625,7 @@
if (!tech_pvt->dtmf_buffer) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Allocate DTMF Buffer....");
- if (switch_buffer_create(switch_core_session_get_pool(session), &tech_pvt->dtmf_buffer, 3192) != SWITCH_STATUS_SUCCESS) {
+ if (switch_buffer_create_dynamic(&tech_pvt->dtmf_buffer, 1024, 3192, 0) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Failed to allocate DTMF Buffer!\n");
return SWITCH_STATUS_FALSE;
} else {
Modified: freeswitch/branches/james/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
==============================================================================
--- freeswitch/branches/james/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original)
+++ freeswitch/branches/james/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Sun Sep 10 07:09:34 2006
@@ -56,10 +56,10 @@
switch_mutex_t *flag_mutex;
uint32_t flags;
switch_log_level_t level;
- char *retbuf;
char *ebuf;
uint8_t event_list[SWITCH_EVENT_ALL+1];
switch_hash_t *event_hash;
+ switch_thread_rwlock_t *rwlock;
struct listener *next;
};
@@ -282,17 +282,20 @@
if (count == 1) {
switch_event_create(event, SWITCH_EVENT_MESSAGE);
switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Command", mbuf);
- } else {
+ } else if (cur) {
char *var, *val;
- var = mbuf;
- if ((val = strchr(var, ':'))) {
- *val++ = '\0';
- while(*val == ' ') {
- val++;
+ var = cur;
+ strip_cr(var);
+ if (!switch_strlen_zero(var)) {
+ if ((val = strchr(var, ':'))) {
+ *val++ = '\0';
+ while(*val == ' ') {
+ val++;
+ }
+ }
+ if (var && val) {
+ switch_event_add_header(*event, SWITCH_STACK_BOTTOM, var, val);
}
- }
- if (var && val) {
- switch_event_add_header(*event, SWITCH_STACK_BOTTOM, var, val);
}
}
@@ -385,6 +388,71 @@
}
+struct api_command_struct {
+ char *api_cmd;
+ char *arg;
+