diff --git a/.gitignore b/.gitignore index 2d0effae96..1df535d36c 100644 --- a/.gitignore +++ b/.gitignore @@ -145,7 +145,6 @@ Release/ /src/mod/applications/mod_nibblebill/Makefile /src/mod/applications/mod_osp/Makefile /src/mod/applications/mod_osp/Makefile.in -/src/mod/applications/mod_rss/Makefile /src/mod/applications/mod_snipe_hunt/Makefile /src/mod/applications/mod_test/test/Makefile /src/mod/applications/mod_test/test/Makefile.in diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index 230732acfb..c021c7c855 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -79,7 +79,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa conf\vanilla\autoload_configs\logfile.conf.xml = conf\vanilla\autoload_configs\logfile.conf.xml conf\vanilla\autoload_configs\modules.conf.xml = conf\vanilla\autoload_configs\modules.conf.xml conf\vanilla\autoload_configs\openmrcp.conf.xml = conf\vanilla\autoload_configs\openmrcp.conf.xml - conf\vanilla\autoload_configs\rss.conf.xml = conf\vanilla\autoload_configs\rss.conf.xml conf\vanilla\autoload_configs\sofia.conf.xml = conf\vanilla\autoload_configs\sofia.conf.xml conf\vanilla\autoload_configs\switch.conf.xml = conf\vanilla\autoload_configs\switch.conf.xml conf\vanilla\autoload_configs\syslog.conf.xml = conf\vanilla\autoload_configs\syslog.conf.xml @@ -199,8 +198,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_ {BED7539C-0099-4A14-AD5D-30828F15A171} = {BED7539C-0099-4A14-AD5D-30828F15A171} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.2017.vcxproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.2017.vcxproj", "{C24FB505-05D7-4319-8485-7540B44C8603}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.2017.vcxproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}" @@ -219,8 +216,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread", "libs\win32\pthre EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.2017.vcxproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iSAC", "src\mod\codecs\mod_isac\mod_iSAC.2017.vcxproj", "{7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.2017.vcxproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.2017.vcxproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" @@ -293,8 +288,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shout", "src\mod\format EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libs\win32\libogg\libogg.2017.vcxproj", "{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_snom", "src\mod\applications\mod_snom\mod_snom.2017.vcxproj", "{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_zh", "src\mod\say\mod_say_zh\mod_say_zh.2017.vcxproj", "{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_managed", "src\mod\languages\mod_managed\mod_managed.2017.vcxproj", "{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}" @@ -398,8 +391,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spy", "src\mod\applicat EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_httapi", "src\mod\applications\mod_httapi\mod_httapi.2017.vcxproj", "{4748FF56-CA85-4809-97D6-A94C0FAC1D77}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_abstraction", "src\mod\applications\mod_abstraction\mod_abstraction.2017.vcxproj", "{60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sms", "src\mod\applications\mod_sms\mod_sms.2017.vcxproj", "{2469B306-B027-4FF2-8815-C9C1EA2CAE79}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xmlrpc-c", "xmlrpc-c", "{9DE35039-A8F6-4FBF-B1B6-EB527F802411}" @@ -722,17 +713,6 @@ Global {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|Win32.Build.0 = Release|Win32 {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.ActiveCfg = Release|x64 {CBEC7225-0C21-4DA8-978E-1F158F8AD950}.Release|x64.Build.0 = Release|x64 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|Win32.ActiveCfg = Release|x64 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64.ActiveCfg = Release|x64 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.All|x64.Build.0 = Release|x64 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.ActiveCfg = Debug|Win32 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|Win32.Build.0 = Debug|Win32 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.ActiveCfg = Debug|x64 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Debug|x64.Build.0 = Debug|x64 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.ActiveCfg = Release|Win32 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|Win32.Build.0 = Release|Win32 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.ActiveCfg = Release|x64 - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}.Release|x64.Build.0 = Release|x64 {C24FB505-05D7-4319-8485-7540B44C8603}.All|Win32.ActiveCfg = Release|x64 {C24FB505-05D7-4319-8485-7540B44C8603}.All|x64.ActiveCfg = Release|x64 {C24FB505-05D7-4319-8485-7540B44C8603}.All|x64.Build.0 = Release|x64 @@ -832,17 +812,6 @@ Global {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|Win32.Build.0 = Release Passthrough|Win32 {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.ActiveCfg = Release Passthrough|x64 {FEA1EEF7-876F-48DE-88BF-C0E3E606D758}.Release|x64.Build.0 = Release Passthrough|x64 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|Win32.ActiveCfg = Release|x64 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|x64.ActiveCfg = Release|x64 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.All|x64.Build.0 = Release|x64 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|Win32.ActiveCfg = Debug|Win32 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|Win32.Build.0 = Debug|Win32 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|x64.ActiveCfg = Debug|x64 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Debug|x64.Build.0 = Debug|x64 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|Win32.ActiveCfg = Release|Win32 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|Win32.Build.0 = Release|Win32 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|x64.ActiveCfg = Release|x64 - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD}.Release|x64.Build.0 = Release|x64 {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|Win32.ActiveCfg = Release|x64 {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64.ActiveCfg = Release|x64 {9254C4B0-6F60-42B6-BB3A-36D63FC001C7}.All|x64.Build.0 = Release|x64 @@ -1231,17 +1200,6 @@ Global {0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|Win32.Build.0 = Release|Win32 {0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64.ActiveCfg = Release|x64 {0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64.Build.0 = Release|x64 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|Win32.ActiveCfg = Release|x64 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64.ActiveCfg = Release|x64 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64.Build.0 = Release|x64 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|Win32.ActiveCfg = Debug|Win32 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|Win32.Build.0 = Debug|Win32 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64.ActiveCfg = Debug|x64 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64.Build.0 = Debug|x64 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|Win32.ActiveCfg = Release|Win32 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|Win32.Build.0 = Release|Win32 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64.ActiveCfg = Release|x64 - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64.Build.0 = Release|x64 {B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|Win32.ActiveCfg = Release|x64 {B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64.ActiveCfg = Release|x64 {B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64.Build.0 = Release|x64 @@ -1770,17 +1728,6 @@ Global {4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|Win32.Build.0 = Release|Win32 {4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|x64.ActiveCfg = Release|x64 {4748FF56-CA85-4809-97D6-A94C0FAC1D77}.Release|x64.Build.0 = Release|x64 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|Win32.ActiveCfg = Release|x64 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|x64.ActiveCfg = Release|x64 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.All|x64.Build.0 = Release|x64 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|Win32.ActiveCfg = Debug|Win32 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|Win32.Build.0 = Debug|Win32 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|x64.ActiveCfg = Debug|x64 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Debug|x64.Build.0 = Debug|x64 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|Win32.ActiveCfg = Release|Win32 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|Win32.Build.0 = Release|Win32 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|x64.ActiveCfg = Release|x64 - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F}.Release|x64.Build.0 = Release|x64 {2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|Win32.ActiveCfg = Release|x64 {2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|x64.ActiveCfg = Release|x64 {2469B306-B027-4FF2-8815-C9C1EA2CAE79}.All|x64.Build.0 = Release|x64 @@ -2506,7 +2453,6 @@ Global {30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A} {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5} - {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} {05515420-16DE-4E63-BE73-85BE85BA5142} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} @@ -2516,7 +2462,6 @@ Global {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {7F1610F1-DD5A-4CF7-8610-30AB12C60ADD} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {9254C4B0-6F60-42B6-BB3A-36D63FC001C7} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {71A967D5-0E99-4CEF-A587-98836EE6F2EF} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} @@ -2553,7 +2498,6 @@ Global {D3D8B329-20BE-475E-9E83-653CEA0E0EF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D} {0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E} = {6CD61A1D-797C-470A-BE08-8C31B68BB336} {7B42BDA1-72C0-4378-A9B6-5C530F8CD61E} = {0C808854-54D1-4230-BFF5-77B5FD905000} {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0} = {0C808854-54D1-4230-BFF5-77B5FD905000} @@ -2602,7 +2546,6 @@ Global {50AAC2CE-BFC9-4912-87CC-C6381850D735} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {A61D7CB4-75A5-4A55-8CA1-BE5AF615D921} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {4748FF56-CA85-4809-97D6-A94C0FAC1D77} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {2469B306-B027-4FF2-8815-C9C1EA2CAE79} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {9DE35039-A8F6-4FBF-B1B6-EB527F802411} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} diff --git a/LICENSE b/LICENSE index c5d335d312..4465d2d0ca 100644 --- a/LICENSE +++ b/LICENSE @@ -1309,11 +1309,6 @@ Copyright: 2009-2012 10gen Inc. 2001 Unicode, Inc. License: Apache-2.0 -Files: src/mod/applications/mod_stress/FFTReal.h - src/mod/applications/mod_stress/FFTReal.cpp -Copyright: 1999 Laurent de Soras -License: unclear - Files: src/mod/loggers/mod_syslog/mod_syslog.c Copyright: 2005-2010, James Martelletti License: MPL-1.1 @@ -1578,14 +1573,6 @@ Files: src/include/switch_profile.h Copyright: 2009,2010, Sangoma Technologies License: BSD-3-clause -Files: src/mod/codecs/mod_isac/* -Copyright: 2011-2012 The WebRTC project authors -License: BSD-3-clause - -Files: src/mod/codecs/mod_isac/mod_isac.c -Copyright: 2005-2014, Anthony Minessale II -License: MPL-1.1 - Files: libs/srtp/* Copyright: 2001-2006, Cisco Systems, Inc. 2005 Ingate Systems AB diff --git a/build/modules.conf.in b/build/modules.conf.in index de87399e74..da1ae46552 100755 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -1,4 +1,3 @@ -#applications/mod_abstraction applications/mod_av #applications/mod_avmd #applications/mod_bert @@ -35,16 +34,11 @@ applications/mod_httapi #applications/mod_prefix #applications/mod_rad_auth #applications/mod_redis -#applications/mod_rss applications/mod_signalwire applications/mod_sms #applications/mod_snapshot -#applications/mod_snom -#applications/mod_sonar -#applications/mod_soundtouch applications/mod_spandsp #applications/mod_spy -#applications/mod_stress applications/mod_test #applications/mod_translate applications/mod_valet_parking @@ -66,7 +60,6 @@ codecs/mod_g723_1 codecs/mod_g729 codecs/mod_h26x #codecs/mod_ilbc -#codecs/mod_isac codecs/mod_opus #codecs/mod_silk #codecs/mod_siren diff --git a/build/modules.conf.most b/build/modules.conf.most index ad14f0bb7a..18823a0386 100755 --- a/build/modules.conf.most +++ b/build/modules.conf.most @@ -1,4 +1,3 @@ -applications/mod_abstraction applications/mod_av applications/mod_avmd applications/mod_bert @@ -35,16 +34,11 @@ applications/mod_oreka applications/mod_prefix #applications/mod_rad_auth applications/mod_redis -applications/mod_rss applications/mod_signalwire applications/mod_sms applications/mod_snapshot -applications/mod_snom -applications/mod_sonar -applications/mod_soundtouch applications/mod_spandsp applications/mod_spy -applications/mod_stress applications/mod_test applications/mod_translate applications/mod_valet_parking @@ -65,7 +59,6 @@ codecs/mod_g723_1 codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc -codecs/mod_isac codecs/mod_opus codecs/mod_silk codecs/mod_siren diff --git a/ci.sh b/ci.sh index 26947f6a70..f689babd9a 100755 --- a/ci.sh +++ b/ci.sh @@ -92,7 +92,6 @@ configure_freeswitch() # "Disable"/"Comment out" mods sed -i \ -e '/mod_ilbc/s/^/#/g' \ - -e '/mod_isac/s/^/#/g' \ -e '/mod_mongo/s/^/#/g' \ -e '/mod_pocketsphinx/s/^/#/g' \ -e '/mod_siren/s/^/#/g' \ diff --git a/conf/curl/autoload_configs/rss.conf.xml b/conf/curl/autoload_configs/rss.conf.xml deleted file mode 100644 index f8c4f6d2b4..0000000000 --- a/conf/curl/autoload_configs/rss.conf.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml index 0e1f60f77d..9290d072b5 100755 --- a/conf/insideout/autoload_configs/modules.conf.xml +++ b/conf/insideout/autoload_configs/modules.conf.xml @@ -48,9 +48,6 @@ - - - @@ -88,7 +85,6 @@ - diff --git a/conf/insideout/autoload_configs/rss.conf.xml b/conf/insideout/autoload_configs/rss.conf.xml deleted file mode 100644 index f8c4f6d2b4..0000000000 --- a/conf/insideout/autoload_configs/rss.conf.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/conf/insideout/dialplan/default.xml b/conf/insideout/dialplan/default.xml index 6290dd53b0..6d78a7f3b3 100644 --- a/conf/insideout/dialplan/default.xml +++ b/conf/insideout/dialplan/default.xml @@ -116,24 +116,6 @@ --> - - - - - - - - - - - - - - - - diff --git a/conf/sbc/dialplan/default.xml b/conf/sbc/dialplan/default.xml index bcdd5ddf01..aa3d624033 100644 --- a/conf/sbc/dialplan/default.xml +++ b/conf/sbc/dialplan/default.xml @@ -115,24 +115,6 @@ --> - - - - - - - - - - - - - - - - diff --git a/conf/vanilla/autoload_configs/abstraction.conf.xml b/conf/vanilla/autoload_configs/abstraction.conf.xml deleted file mode 100644 index 7244681374..0000000000 --- a/conf/vanilla/autoload_configs/abstraction.conf.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml index 20f7fe1c1f..0c3c99c710 100755 --- a/conf/vanilla/autoload_configs/modules.conf.xml +++ b/conf/vanilla/autoload_configs/modules.conf.xml @@ -41,7 +41,6 @@ - @@ -76,9 +75,6 @@ - - - @@ -93,7 +89,6 @@ - @@ -125,7 +120,6 @@ - diff --git a/conf/vanilla/autoload_configs/rss.conf.xml b/conf/vanilla/autoload_configs/rss.conf.xml deleted file mode 100644 index f8c4f6d2b4..0000000000 --- a/conf/vanilla/autoload_configs/rss.conf.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/conf/vanilla/autoload_configs/unicall.conf.xml b/conf/vanilla/autoload_configs/unicall.conf.xml deleted file mode 100644 index eeaa0782f7..0000000000 --- a/conf/vanilla/autoload_configs/unicall.conf.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/conf/vanilla/dialplan/default.xml b/conf/vanilla/dialplan/default.xml index fb999d54ac..5fd9a079b6 100644 --- a/conf/vanilla/dialplan/default.xml +++ b/conf/vanilla/dialplan/default.xml @@ -179,24 +179,6 @@ --> - - - - - - - - - - - - - - - - diff --git a/configure.ac b/configure.ac index 4b90871540..4b252ce07b 100755 --- a/configure.ac +++ b/configure.ac @@ -1079,7 +1079,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then fi # Tested and fixed lot of modules, but some are untested. Will be added back when the core team decide it ready -# Untested modules : mod_osp mod_soundtouch mod_opal mod_h323 mod_khomp +# Untested modules : mod_osp mod_opal mod_h323 mod_khomp # mod_erlang_event mod_snmp mod_perl mod_java mod_managed # #saved_CFLAGS="$CFLAGS" @@ -1469,10 +1469,6 @@ PKG_CHECK_MODULES([OPUS], [opus >= 1.1],[ AM_CONDITIONAL([HAVE_OPUS],[true])],[ AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPUS],[false])]) -PKG_CHECK_MODULES([SOUNDTOUCH], [soundtouch >= 1.7.0],[ - AM_CONDITIONAL([HAVE_SOUNDTOUCH],[true])],[ - AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SOUNDTOUCH],[false])]) - flite="true" PKG_CHECK_MODULES([FLITE], [flite >= 2],[],[ AC_CHECK_LIB([flite], [flite_init],[ @@ -2088,7 +2084,6 @@ AC_CONFIG_FILES([Makefile tests/unit/Makefile src/Makefile src/mod/Makefile - src/mod/applications/mod_abstraction/Makefile src/mod/applications/mod_avmd/Makefile src/mod/applications/mod_bert/Makefile src/mod/applications/mod_blacklist/Makefile @@ -2126,17 +2121,12 @@ AC_CONFIG_FILES([Makefile src/mod/applications/mod_rad_auth/Makefile src/mod/applications/mod_random/Makefile src/mod/applications/mod_redis/Makefile - src/mod/applications/mod_rss/Makefile src/mod/applications/mod_skel/Makefile src/mod/applications/mod_signalwire/Makefile src/mod/applications/mod_sms/Makefile src/mod/applications/mod_snapshot/Makefile - src/mod/applications/mod_snom/Makefile - src/mod/applications/mod_sonar/Makefile - src/mod/applications/mod_soundtouch/Makefile src/mod/applications/mod_spandsp/Makefile src/mod/applications/mod_spy/Makefile - src/mod/applications/mod_stress/Makefile src/mod/applications/mod_test/Makefile src/mod/applications/mod_translate/Makefile src/mod/applications/mod_valet_parking/Makefile @@ -2157,7 +2147,6 @@ AC_CONFIG_FILES([Makefile src/mod/codecs/mod_g729/Makefile src/mod/codecs/mod_h26x/Makefile src/mod/codecs/mod_ilbc/Makefile - src/mod/codecs/mod_isac/Makefile src/mod/codecs/mod_opus/Makefile src/mod/codecs/mod_openh264/Makefile src/mod/codecs/mod_silk/Makefile @@ -2179,7 +2168,6 @@ AC_CONFIG_FILES([Makefile src/mod/endpoints/mod_rtmp/Makefile src/mod/endpoints/mod_skinny/Makefile src/mod/endpoints/mod_sofia/Makefile - src/mod/endpoints/mod_unicall/Makefile src/mod/endpoints/mod_rtc/Makefile src/mod/endpoints/mod_verto/Makefile src/mod/event_handlers/mod_amqp/Makefile diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index d77ca48d3f..6c0ea0b7b7 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -47,7 +47,6 @@ avoid_mods=( endpoints/mod_khomp endpoints/mod_opal endpoints/mod_reference - endpoints/mod_unicall event_handlers/mod_smpp event_handlers/mod_event_zmq formats/mod_webm @@ -78,8 +77,6 @@ avoid_mods_wheezy=( applications/mod_cv applications/mod_hiredis formats/mod_shout - applications/mod_sonar - applications/mod_soundtouch formats/mod_vlc ) avoid_mods_trusty=( @@ -516,7 +513,6 @@ Recommends: freeswitch-meta-codecs (= \${binary:Version}), freeswitch-music, freeswitch-sounds, - freeswitch-mod-abstraction (= \${binary:Version}), freeswitch-mod-avmd (= \${binary:Version}), freeswitch-mod-blacklist (= \${binary:Version}), freeswitch-mod-callcenter (= \${binary:Version}), @@ -544,15 +540,10 @@ Recommends: freeswitch-mod-oreka (= \${binary:Version}), freeswitch-mod-pgsql (= \${binary:Version}), freeswitch-mod-redis (= \${binary:Version}), - freeswitch-mod-rss (= \${binary:Version}), freeswitch-mod-sms (= \${binary:Version}), freeswitch-mod-snapshot (= \${binary:Version}), - freeswitch-mod-snom (= \${binary:Version}), - freeswitch-mod-sonar (= \${binary:Version}), - freeswitch-mod-soundtouch (= \${binary:Version}), freeswitch-mod-spandsp (= \${binary:Version}), freeswitch-mod-spy (= \${binary:Version}), - freeswitch-mod-stress (= \${binary:Version}), freeswitch-mod-valet-parking (= \${binary:Version}), freeswitch-mod-vmd (= \${binary:Version}), freeswitch-mod-voicemail (= \${binary:Version}), @@ -601,7 +592,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-meta-mod-say (= \${binary:Version}), freeswitch-music, freeswitch-sounds, - freeswitch-mod-abstraction (= \${binary:Version}), freeswitch-mod-avmd (= \${binary:Version}), freeswitch-mod-av (= \${binary:Version}), freeswitch-mod-blacklist (= \${binary:Version}), @@ -633,17 +623,12 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-pgsql (= \${binary:Version}), freeswitch-mod-png (= \${binary:Version}), freeswitch-mod-redis (= \${binary:Version}), - freeswitch-mod-rss (= \${binary:Version}), freeswitch-mod-signalwire (= \${binary:Version}), freeswitch-mod-shout (= \${binary:Version}), freeswitch-mod-sms (= \${binary:Version}), freeswitch-mod-snapshot (= \${binary:Version}), - freeswitch-mod-snom (= \${binary:Version}), - freeswitch-mod-sonar (= \${binary:Version}), - freeswitch-mod-soundtouch (= \${binary:Version}), freeswitch-mod-spandsp (= \${binary:Version}), freeswitch-mod-spy (= \${binary:Version}), - freeswitch-mod-stress (= \${binary:Version}), freeswitch-mod-translate (= \${binary:Version}), freeswitch-mod-valet-parking (= \${binary:Version}), freeswitch-mod-video-filter (= \${binary:Version}), @@ -709,7 +694,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-g723-1 (= \${binary:Version}), freeswitch-mod-g729 (= \${binary:Version}), freeswitch-mod-h26x (= \${binary:Version}), - freeswitch-mod-isac (= \${binary:Version}), freeswitch-mod-opus (= \${binary:Version}), freeswitch-mod-silk (= \${binary:Version}), freeswitch-mod-spandsp (= \${binary:Version}), @@ -734,7 +718,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-g723-1-dbg (= \${binary:Version}), freeswitch-mod-g729-dbg (= \${binary:Version}), freeswitch-mod-h26x-dbg (= \${binary:Version}), - freeswitch-mod-isac-dbg (= \${binary:Version}), freeswitch-mod-opus-dbg (= \${binary:Version}), freeswitch-mod-silk-dbg (= \${binary:Version}), freeswitch-mod-spandsp-dbg (= \${binary:Version}), @@ -833,7 +816,6 @@ Architecture: amd64 armhf arm64 Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-meta-codecs-dbg (= \${binary:Version}), freeswitch-meta-mod-say (= \${binary:Version}), - freeswitch-mod-abstraction-dbg (= \${binary:Version}), freeswitch-mod-avmd-dbg (= \${binary:Version}), freeswitch-mod-av-dbg (= \${binary:Version}), freeswitch-mod-blacklist-dbg (= \${binary:Version}), @@ -865,15 +847,10 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-pgsql-dbg (= \${binary:Version}), freeswitch-mod-png-dbg (= \${binary:Version}), freeswitch-mod-redis-dbg (= \${binary:Version}), - freeswitch-mod-rss-dbg (= \${binary:Version}), freeswitch-mod-sms-dbg (= \${binary:Version}), freeswitch-mod-snapshot-dbg (= \${binary:Version}), - freeswitch-mod-snom-dbg (= \${binary:Version}), - freeswitch-mod-sonar-dbg (= \${binary:Version}), - freeswitch-mod-soundtouch-dbg (= \${binary:Version}), freeswitch-mod-spandsp-dbg (= \${binary:Version}), freeswitch-mod-spy-dbg (= \${binary:Version}), - freeswitch-mod-stress-dbg (= \${binary:Version}), freeswitch-mod-translate-dbg (= \${binary:Version}), freeswitch-mod-valet-parking-dbg (= \${binary:Version}), freeswitch-mod-video-filter-dbg (= \${binary:Version}), diff --git a/debian/control-modules b/debian/control-modules index 2261416c47..d44af60e36 100755 --- a/debian/control-modules +++ b/debian/control-modules @@ -3,11 +3,6 @@ ## mod/applications -Module: applications/mod_abstraction -Description: Abstraction layer for APIs - This module provides a way to create new API functions via regex - rewriting. - Module: applications/mod_av Description: mod_av Adds mod_av. @@ -183,10 +178,6 @@ Description: Redis limit backend This module provides a mechanism to use Redis as a backend data store. -Module: applications/mod_rss -Description: RSS browser - This module provides an RSS browser. - Module: applications/mod_skel Description: Adds mod_skel Adds mod_skel. @@ -206,20 +197,6 @@ Description: Snapshot This module can record a sliding window of audio and take snapshots to disk. -Module: applications/mod_snom -Description: SNOM specific features - This module implements features specific to SNOM phones. - -Module: applications/mod_sonar -Description: Sonar ping timer - This module measures the latency on an audio link by sending audible - audio sonar pings. - -Module: applications/mod_soundtouch -Description: Soundtouch - This module implements example media bugs. -Build-Depends: libsoundtouch-dev - Module: applications/mod_spandsp Description: SpanDSP This module implements spandsp fax, dsp, and codec functionality. @@ -228,10 +205,6 @@ Module: applications/mod_spy Description: UserSpy This module adds the ability to monitor the audio of a channel. -Module: applications/mod_stress -Description: Voice stress detection - This module attempts to detect voice stress on an audio channel. - Module: applications/mod_translate Description: Number translation This module implements number translation. @@ -319,10 +292,6 @@ Description: mod_ilbc Adds mod_ilbc. Build-Depends: libilbc-dev -Module: codecs/mod_isac -Description: mod_isac - Adds mod_isac. - Module: codecs/mod_openh264 Description: Adds mod_openh264 Adds mod_openh264. @@ -433,10 +402,6 @@ Module: endpoints/mod_sofia Description: mod_sofia Adds mod_sofia. -Module: endpoints/mod_unicall -Description: mod_unicall - Adds mod_unicall. - Module: endpoints/mod_verto Description: Adds mod_verto. Adds mod_verto. diff --git a/debian/copyright b/debian/copyright index 0165760810..deedd66566 100755 --- a/debian/copyright +++ b/debian/copyright @@ -1309,11 +1309,6 @@ Copyright: 2009-2012 10gen Inc. 2001 Unicode, Inc. License: Apache-2.0 -Files: src/mod/applications/mod_stress/FFTReal.h - src/mod/applications/mod_stress/FFTReal.cpp -Copyright: 1999 Laurent de Soras -License: unclear - Files: src/mod/loggers/mod_syslog/mod_syslog.c Copyright: 2005-2010, James Martelletti License: MPL-1.1 @@ -1573,14 +1568,6 @@ Files: libs/libcodec2/src/pack.c Copyright: 2010 Perens LLC License: GPL-3+ -Files: src/mod/codecs/mod_isac/* -Copyright: 2011-2012 The WebRTC project authors -License: BSD-3-clause - -Files: src/mod/codecs/mod_isac/mod_isac.c -Copyright: 2005-2014, Anthony Minessale II -License: MPL-1.1 - Files: libs/srtp/* Copyright: 2001-2006, Cisco Systems, Inc. 2005 Ingate Systems AB diff --git a/freeswitch.spec b/freeswitch.spec index 8761ca2365..1844c37ecf 100755 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -227,14 +227,6 @@ FreeSWITCH development files ###################################################################################################################### # FreeSWITCH Application Modules ###################################################################################################################### -%package application-abstraction -Summary: FreeSWITCH mod_abstraction -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description application-abstraction -Provide an abstraction to FreeSWITCH API calls - %package application-avmd Summary: FreeSWITCH voicemail detector Group: System/Libraries @@ -476,15 +468,6 @@ Requires: %{name} = %{version}-%{release} Provides FreeSWITCH mod_redis, access to the redis key value pair db system from FreeSWITCH -%package application-rss -Summary: FreeSWITCH mod_rss -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description application-rss -Provides FreeSWITCH mod_rss, edisrse and read an XML based RSS feed, then read -the entries aloud via a TTS engine - %package application-signalwire Summary: FreeSWITCH mod_signalwire Group: System/Libraries @@ -513,27 +496,6 @@ Requires: %{name} = %{version}-%{release} Provides FreeSWITCH mod_snapshot, allows recording a sliding window of audio and taking snapshots to disk. -%package application-snom -Summary: FreeSWITCH mod_snom -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description application-snom -Provides FreeSWITCH mod_snom, an application for controlling the functionality -and appearance of the programmable softkeys on Snom phones - -%package application-soundtouch -Summary: FreeSWITCH mod_soundtouch -Group: System/Libraries -Requires: %{name} = %{version}-%{release} -BuildRequires: soundtouch-devel >= 1.7.1 - -%description application-soundtouch -Provides FreeSWITCH mod_soundtouch, uses the soundtouch library, which can do -pitch shifting and other audio effects, so you can pipe the audio of a call -(or any other channel audio) through this module and achieve those effects. You -can specifically adjust pitch, rate, and tempo. - %package application-spy Summary: FreeSWITCH mod_spy Group: System/Libraries @@ -543,15 +505,6 @@ Requires: %{name} = %{version}-%{release} Provides FreeSWITCH mod_spy, implements userspy application which provides persistent eavesdrop on all channels bridged to a certain user -%package application-stress -Summary: FreeSWITCH mod_stress -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description application-stress -Provides FreeSWITCH mod_stress. mod_stress attempts to detect stress in a -person's voice and generates FreeSWITCH events based on that data. - %package application-translate Summary: FreeSWITCH mod_translate Group: System/Libraries @@ -706,21 +659,13 @@ BuildRequires: ilbc2-devel %description codec-ilbc iLBC Codec support for FreeSWITCH open source telephony platform -%package codec-isac -Summary: iSAC Codec support for FreeSWITCH open source telephony platform -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description codec-isac -iSAC Codec support for FreeSWITCH open source telephony platform - %package codec-vpx Summary: vp8 Codec support for FreeSWITCH open source telephony platform Group: System/Libraries Requires: %{name} = %{version}-%{release} %description codec-vpx -iSAC Codec support for FreeSWITCH open source telephony platform +VP8 Codec support for FreeSWITCH open source telephony platform %package codec-opus Summary: Opus Codec support for FreeSWITCH open source telephony platform @@ -1213,7 +1158,6 @@ The Python ESL module allows for native interaction with FreeSWITCH over the eve Summary: Basic vanilla config set for the FreeSWITCH Open Source telephone platform. Group: System/Libraries Requires: %{name} = %{version}-%{release} -Requires: freeswitch-application-abstraction Requires: freeswitch-application-avmd Requires: freeswitch-application-blacklist Requires: freeswitch-application-callcenter @@ -1238,14 +1182,10 @@ Requires: freeswitch-application-limit Requires: freeswitch-application-memcache Requires: freeswitch-application-nibblebill Requires: freeswitch-application-redis -Requires: freeswitch-application-rss Requires: freeswitch-application-signalwire Requires: freeswitch-application-sms Requires: freeswitch-application-snapshot -Requires: freeswitch-application-snom -Requires: freeswitch-application-soundtouch Requires: freeswitch-application-spy -Requires: freeswitch-application-stress Requires: freeswitch-application-valet_parking Requires: freeswitch-application-video_filter Requires: freeswitch-application-voicemail @@ -1307,7 +1247,7 @@ export QA_RPATHS=$[ 0x0001|0x0002 ] # Application Modules # ###################################################################################################################### -APPLICATION_MODULES_AC="applications/mod_abstraction applications/mod_avmd applications/mod_blacklist \ +APPLICATION_MODULES_AC="applications/mod_avmd applications/mod_blacklist \ applications/mod_callcenter applications/mod_cidlookup \ applications/mod_commands applications/mod_conference applications/mod_curl" APPLICATION_MODULES_DE="applications/mod_db applications/mod_directory applications/mod_distributor \ @@ -1321,10 +1261,10 @@ APPLICATION_MODULES_DE+="applications/mod_esl" APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/mod_fsv applications/mod_hash \ applications/mod_httapi applications/mod_http_cache applications/mod_lcr applications/mod_limit \ applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_rad_auth \ - applications/mod_redis applications/mod_rss " + applications/mod_redis " -APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot applications/mod_snom applications/mod_soundtouch \ - applications/mod_spandsp applications/mod_spy applications/mod_stress \ +APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot \ + applications/mod_spandsp applications/mod_spy \ applications/mod_valet_parking applications/mod_translate applications/mod_voicemail \ applications/mod_voicemail_ivr applications/mod_video_filter" @@ -1343,7 +1283,7 @@ ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_tts_comm # ###################################################################################################################### CODECS_MODULES="codecs/mod_amr codecs/mod_amrwb codecs/mod_bv codecs/mod_codec2 codecs/mod_g723_1 \ - codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_isac codecs/mod_opus codecs/mod_silk \ + codecs/mod_g729 codecs/mod_h26x codecs/mod_ilbc codecs/mod_opus codecs/mod_silk \ codecs/mod_siren codecs/mod_theora" # @@ -1766,7 +1706,6 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/extensions.conf %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/mime.types -%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/abstraction.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/acl.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amr.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/amrwb.conf.xml @@ -1820,7 +1759,6 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/pre_load_modules.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/presence_map.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/redis.conf.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rss.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rtmp.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/shout.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/signalwire.conf.xml @@ -1834,7 +1772,6 @@ fi %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/timezones.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/translate.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/tts_commandline.conf.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/unicall.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/verto.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/voicemail.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/voicemail_ivr.conf.xml @@ -1893,9 +1830,6 @@ fi # Application Packages # ###################################################################################################################### -%files application-abstraction -%{MODINSTDIR}/mod_abstraction.so* - %files application-avmd %{MODINSTDIR}/mod_avmd.so* @@ -1980,9 +1914,6 @@ fi %files application-redis %{MODINSTDIR}/mod_redis.so* -%files application-rss -%{MODINSTDIR}/mod_rss.so* - %files application-signalwire %{MODINSTDIR}/mod_signalwire.so* @@ -1992,18 +1923,9 @@ fi %files application-snapshot %{MODINSTDIR}/mod_snapshot.so* -%files application-snom -%{MODINSTDIR}/mod_snom.so* - -%files application-soundtouch -%{MODINSTDIR}/mod_soundtouch.so* - %files application-spy %{MODINSTDIR}/mod_spy.so* -%files application-stress -%{MODINSTDIR}/mod_stress.so* - %files application-translate %{MODINSTDIR}/mod_translate.so* @@ -2064,9 +1986,6 @@ fi %files codec-ilbc %{MODINSTDIR}/mod_ilbc.so* -%files codec-isac -%{MODINSTDIR}/mod_isac.so* - %files codec-opus %{MODINSTDIR}/mod_opus.so* %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/opus.conf.xml diff --git a/libs/.gitignore b/libs/.gitignore index d4d419affc..d2cbc6b7df 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -420,8 +420,6 @@ opal /sofia-sip/win32/Makefile /sofia-sip/win32/Makefile.in /sounds/ -/soundtouch/ -/soundtouch-*/ /sphinxbase-*/ /srtp/aes_tables /srtp/config_in.h diff --git a/scripts/freeswitch.pkg_deps.sh b/scripts/freeswitch.pkg_deps.sh index 77e15f3471..64cdc445a0 100755 --- a/scripts/freeswitch.pkg_deps.sh +++ b/scripts/freeswitch.pkg_deps.sh @@ -6,7 +6,6 @@ wget -c http://svn.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz wget -c http://svn.freeswitch.org/downloads/libs/mpg123.tar.gz wget -c http://svn.freeswitch.org/downloads/libs/openldap-2.4.11.tar.gz wget -c http://svn.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-latest.tar.gz -wget -c http://svn.freeswitch.org/downloads/libs/soundtouch-1.3.1.tar.gz wget -c http://svn.freeswitch.org/downloads/libs/sphinxbase-0.4.99-latest.tar.gz wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-8000-1.0.8.tar.gz wget -c http://files.freeswitch.org/releases/sounds/freeswitch-sounds-music-16000-1.0.8.tar.gz diff --git a/src/mod/.gitignore b/src/mod/.gitignore index 47f1a92e0b..e3298c6125 100644 --- a/src/mod/.gitignore +++ b/src/mod/.gitignore @@ -21,9 +21,6 @@ /applications/mod_spandsp/Makefile /applications/mod_spandsp/Makefile.in /applications/mod_spandsp/mod_spandsp.log -/applications/mod_stress/Makefile -/applications/mod_stress/Makefile.in -/applications/mod_stress/mod_stress.log /applications/mod_translate/Makefile /applications/mod_valet_parking/Makefile /applications/mod_voicemail/Makefile @@ -60,7 +57,6 @@ /say/mod_say_ru/Makefile /timers/mod_posix_timer/Makefile /timers/mod_timerfd/Makefile -/endpoints/mod_unicall/Makefile */*/Makefile.in */*/Makefile */*/mod_*.log diff --git a/src/mod/applications/mod_abstraction/Makefile.am b/src/mod/applications/mod_abstraction/Makefile.am deleted file mode 100644 index 8ab961eeb2..0000000000 --- a/src/mod/applications/mod_abstraction/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -include $(top_srcdir)/build/modmake.rulesam -MODNAME=mod_abstraction - -mod_LTLIBRARIES = mod_abstraction.la -mod_abstraction_la_SOURCES = mod_abstraction.c -mod_abstraction_la_CFLAGS = $(AM_CFLAGS) -mod_abstraction_la_LIBADD = $(switch_builddir)/libfreeswitch.la -mod_abstraction_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml b/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml deleted file mode 100644 index d4b1dfd274..0000000000 --- a/src/mod/applications/mod_abstraction/conf/autoload_configs/abstraction.conf.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj b/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj deleted file mode 100644 index e6a7666b80..0000000000 --- a/src/mod/applications/mod_abstraction/mod_abstraction.2017.vcxproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - mod_abstraction - {60C542EE-6882-4EA2-8C21-5AB6DB1BA73F} - mod_abstraction - Win32Proj - - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - - - - - false - - - - - - - X64 - - - - - - - false - - - MachineX64 - - - - - - - - - false - - - - - - - X64 - - - - - - - false - - - MachineX64 - - - - - - - - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} - false - - - - - - \ No newline at end of file diff --git a/src/mod/applications/mod_abstraction/mod_abstraction.c b/src/mod/applications/mod_abstraction/mod_abstraction.c deleted file mode 100644 index 11144462ec..0000000000 --- a/src/mod/applications/mod_abstraction/mod_abstraction.c +++ /dev/null @@ -1,165 +0,0 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2005-2014, Anthony Minessale II - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * Anthony Minessale II - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Marc Olivier Chouinard - * - * - * mod_abstraction.c -- Abstraction - * - */ -#include - -/* Prototypes */ -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_abstraction_shutdown); -SWITCH_MODULE_RUNTIME_FUNCTION(mod_abstraction_runtime); -SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load); - -const char *global_cf = "abstraction.conf"; - -/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) - * Defines a switch_loadable_module_function_table_t and a static const char[] modname - */ -SWITCH_MODULE_DEFINITION(mod_abstraction, mod_abstraction_load, mod_abstraction_shutdown, NULL); - -SWITCH_STANDARD_API(api_abstraction_function) -{ - const char *api_name = switch_event_get_header(stream->param_event, "API-Command"); - switch_xml_t cfg, xml, x_apis, x_api; - - if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf); - goto end; - } - - if (!(x_apis = switch_xml_child(cfg, "apis"))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n"); - goto end; - } - - if ((x_api = switch_xml_find_child_multi(x_apis, "api", "name", api_name , NULL))) { - const char *parse = switch_xml_attr_soft(x_api, "parse"); - const char *destination = switch_xml_attr_soft(x_api, "destination"); - const char *arguments = switch_xml_attr_soft(x_api, "argument"); - - int proceed; - switch_regex_t *re = NULL; - int ovector[30]; - - if ((proceed = switch_regex_perform(cmd, parse, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { - const char *api_args = NULL; - char *substituted = NULL; - - if (cmd && strchr(parse, '(')) { - uint32_t len = (uint32_t) (strlen(cmd) + strlen(arguments) + 10) * proceed; - if (!(substituted = malloc(len))) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n"); - goto end; - } - memset(substituted, 0, len); - switch_perform_substitution(re, proceed, arguments, cmd , substituted, len, ovector); - api_args = substituted; - } else { - api_args = arguments; - } - switch_api_execute(destination, api_args, session, stream); - - switch_safe_free(substituted); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No match for API %s (%s != %s)\n", api_name, parse, cmd); - } - switch_regex_safe_free(re); - - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "API %s doesn't exist inside the xml structure. You might have forgot to reload the module after editing it\n", api_name); - } - -end: - if (xml) - switch_xml_free(xml); - - - return SWITCH_STATUS_SUCCESS; -} - -/* Macro expands to: switch_status_t mod_abstraction_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */ -SWITCH_MODULE_LOAD_FUNCTION(mod_abstraction_load) -{ - switch_status_t status = SWITCH_STATUS_TERM; - switch_api_interface_t *api_interface; - switch_xml_t cfg, xml, x_apis, x_api; - int count = 0; - - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = switch_loadable_module_create_module_interface(pool, modname); - - if (!(xml = switch_xml_open_cfg(global_cf, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf); - goto end; - } - - if (!(x_apis = switch_xml_child(cfg, "apis"))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No apis group\n"); - goto end; - } - - for (x_api = switch_xml_child(x_apis, "api"); x_api; x_api = x_api->next) { - const char *name = switch_xml_attr_soft(x_api, "name"); - const char *description = switch_xml_attr_soft(x_api, "description"); - const char *syntax = switch_xml_attr_soft(x_api, "syntax"); - SWITCH_ADD_API(api_interface, name, description, api_abstraction_function, syntax); - count++; - - } - if (count > 0) { - status = SWITCH_STATUS_SUCCESS; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No API abstraction defined\n"); - } -end: - if (xml) - switch_xml_free(xml); - - return status; -} - -/* - Called when the system shuts down - Macro expands to: switch_status_t mod_abstraction_shutdown() */ -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_abstraction_shutdown) -{ - /* Cleanup dynamically allocated config settings */ - return SWITCH_STATUS_SUCCESS; -} - -/* For Emacs: - * Local Variables: - * mode:c - * indent-tabs-mode:t - * tab-width:4 - * c-basic-offset:4 - * End: - * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet - */ diff --git a/src/mod/applications/mod_rss/Makefile.am b/src/mod/applications/mod_rss/Makefile.am deleted file mode 100644 index 718ea0d0eb..0000000000 --- a/src/mod/applications/mod_rss/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -include $(top_srcdir)/build/modmake.rulesam -MODNAME=mod_rss - -mod_LTLIBRARIES = mod_rss.la -mod_rss_la_SOURCES = mod_rss.c -mod_rss_la_CFLAGS = $(AM_CFLAGS) -mod_rss_la_LIBADD = $(switch_builddir)/libfreeswitch.la -mod_rss_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_rss/conf/autoload_configs/rss.conf.xml b/src/mod/applications/mod_rss/conf/autoload_configs/rss.conf.xml deleted file mode 100644 index f8c4f6d2b4..0000000000 --- a/src/mod/applications/mod_rss/conf/autoload_configs/rss.conf.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/mod/applications/mod_rss/conf/dialplan/rss.xml b/src/mod/applications/mod_rss/conf/dialplan/rss.xml deleted file mode 100644 index 3cd2b17567..0000000000 --- a/src/mod/applications/mod_rss/conf/dialplan/rss.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/mod/applications/mod_rss/mod_rss.2017.vcxproj b/src/mod/applications/mod_rss/mod_rss.2017.vcxproj deleted file mode 100644 index 5e121057c2..0000000000 --- a/src/mod/applications/mod_rss/mod_rss.2017.vcxproj +++ /dev/null @@ -1,141 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - mod_rss - {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} - mod_rss - Win32Proj - - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - - - - - false - - - - - - - X64 - - - WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - - - - - false - - - MachineX64 - - - - - - - - - false - - - - - - - X64 - - - - - - - false - - - MachineX64 - - - - - - - - {f6c55d93-b927-4483-bb69-15aef3dd2dff} - false - - - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} - false - - - - - - \ No newline at end of file diff --git a/src/mod/applications/mod_rss/mod_rss.c b/src/mod/applications/mod_rss/mod_rss.c deleted file mode 100644 index 16cd35412b..0000000000 --- a/src/mod/applications/mod_rss/mod_rss.c +++ /dev/null @@ -1,649 +0,0 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2005-2014, Anthony Minessale II - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * Anthony Minessale II - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Anthony Minessale II - * Bret McDanel - * - * - * mod_rss.c -- RSS Browser - * - */ -#include - -SWITCH_MODULE_LOAD_FUNCTION(mod_rss_load); -SWITCH_MODULE_DEFINITION(mod_rss, mod_rss_load, NULL, NULL); - -typedef enum { - SFLAG_INSTRUCT = (1 << 0), - SFLAG_INFO = (1 << 1), - SFLAG_MAIN = (1 << 2) -} SFLAGS; - -/* helper object */ -struct dtmf_buffer { - int32_t index; - uint32_t flags; - int32_t speed; - char voice[80]; - switch_speech_handle_t *sh; -}; - -#define TTS_MEAN_SPEED 170 -#define TTS_MAX_ENTRIES 99 -#define TTS_DEFAULT_ENGINE "flite" -#define TTS_DEFAULT_VOICE "slt" - -#define MATCH_COUNT - -struct rss_entry { - uint8_t inuse; - char *title_txt; - char *description_txt; - char *subject_txt; - char *dept_txt; -}; - -#ifdef MATCH_COUNT -static uint32_t match_count(char *str, uint32_t max) -{ - char tstr[80] = ""; - uint32_t matches = 0, x = 0; - uint32_t len = (uint32_t) strlen(str); - - for (x = 0; x < max; x++) { - switch_snprintf(tstr, sizeof(tstr), "%u", x); - if (!strncasecmp(str, tstr, len)) { - matches++; - } - } - return matches; -} -#endif - - -/* - dtmf handler function you can hook up to be executed when a digit is dialed during playback - if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. -*/ -static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) -{ - switch (itype) { - case SWITCH_INPUT_TYPE_DTMF:{ - switch_dtmf_t *dtmf = (switch_dtmf_t *) input; - struct dtmf_buffer *dtb; - dtb = (struct dtmf_buffer *) buf; - - switch (dtmf->digit) { - case '#': - switch_set_flag(dtb, SFLAG_MAIN); - return SWITCH_STATUS_BREAK; - case '6': - dtb->index++; - return SWITCH_STATUS_BREAK; - case '4': - dtb->index--; - return SWITCH_STATUS_BREAK; - case '*': - if (switch_test_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE)) { - switch_clear_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE); - } else { - switch_set_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE); - } - break; - case '5': - switch_core_speech_text_param_tts(dtb->sh, "voice", "next"); - switch_set_flag(dtb, SFLAG_INFO); - return SWITCH_STATUS_BREAK; - case '9': - switch_core_speech_text_param_tts(dtb->sh, "voice", dtb->voice); - switch_set_flag(dtb, SFLAG_INFO); - return SWITCH_STATUS_BREAK; - case '2': - if (dtb->speed < 260) { - dtb->speed += 30; - switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed); - switch_set_flag(dtb, SFLAG_INFO); - return SWITCH_STATUS_BREAK; - } - break; - case '7': - dtb->speed = TTS_MEAN_SPEED; - switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed); - switch_set_flag(dtb, SFLAG_INFO); - return SWITCH_STATUS_BREAK; - case '8': - if (dtb->speed > 80) { - dtb->speed -= 30; - switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed); - switch_set_flag(dtb, SFLAG_INFO); - return SWITCH_STATUS_BREAK; - } - break; - case '0': - switch_set_flag(dtb, SFLAG_INSTRUCT); - return SWITCH_STATUS_BREAK; - } - } - break; - default: - break; - } - return SWITCH_STATUS_SUCCESS; -} - -SWITCH_STANDARD_APP(rss_function) -{ - switch_channel_t *channel = switch_core_session_get_channel(session); - switch_status_t status; - const char *err = NULL; - struct dtmf_buffer dtb = { 0 }; - switch_xml_t xml = NULL, item, xchannel = NULL; - struct rss_entry entries[TTS_MAX_ENTRIES] = { {0} }; - uint32_t i = 0; - char *title_txt = "", *description_txt = "", *rights_txt = ""; - switch_codec_t speech_codec; - char *engine = TTS_DEFAULT_ENGINE; - char *voice = TTS_DEFAULT_VOICE; - char *timer_name = NULL; - switch_speech_handle_t sh; - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_timer_t timer = { 0 }, *timerp = NULL; - uint32_t last; - char *mydata = NULL; - char *filename = NULL; - char *argv[3], *feed_list[TTS_MAX_ENTRIES] = { 0 }, *feed_names[TTS_MAX_ENTRIES] = { - 0}; - int feed_index = 0; - const char *cf = "rss.conf"; - switch_xml_t cfg, cxml, feeds, feed; - char buf[1024] = ""; - int32_t jumpto = -1; - uint32_t matches = 0; - switch_input_args_t args = { 0 }; - const char *vcf = NULL; - char *chanvars = switch_channel_build_param_string(channel, NULL, NULL); - switch_codec_implementation_t read_impl = { 0 }; - uint32_t rate, interval, channels; - switch_core_session_get_read_impl(session, &read_impl); - interval = read_impl.microseconds_per_packet / 1000; - - if ((vcf = switch_channel_get_variable(channel, "rss_alt_config"))) { - cf = vcf; - } - - if (!(cxml = switch_xml_open_cfg(cf, &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of %s failed\n", cf); - return; - } - switch_safe_free(chanvars); - - if ((feeds = switch_xml_child(cfg, "feeds"))) { - for (feed = switch_xml_child(feeds, "feed"); feed; feed = feed->next) { - char *name = (char *) switch_xml_attr_soft(feed, "name"); - char *expanded = NULL; - char *idx = feed->txt; - - if ((expanded = switch_channel_expand_variables(channel, idx)) == idx) { - expanded = NULL; - } else { - idx = expanded; - } - - if (!name) { - name = "Error No Name."; - } - - feed_list[feed_index] = switch_core_session_strdup(session, idx); - switch_safe_free(expanded); - - if ((expanded = switch_channel_expand_variables(channel, name)) == name) { - expanded = NULL; - } else { - name = expanded; - } - feed_names[feed_index] = switch_core_session_strdup(session, name); - switch_safe_free(expanded); - feed_index++; - - } - } - - switch_xml_free(cxml); - - switch_channel_answer(channel); - - if (!zstr(data)) { - if ((mydata = switch_core_session_strdup(session, data))) { - switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0])); - - if (argv[0]) { - engine = argv[0]; - if (argv[1]) { - voice = argv[1]; - if (argv[2]) { - jumpto = atoi(argv[2]); - } - } - } - } - } - - if (!feed_index) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "No Feeds Specified!\n"); - return; - } - - if (switch_channel_media_ready(channel)) { - rate = read_impl.actual_samples_per_second; - channels = read_impl.number_of_channels; - } else { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Codec Error!\n"); - return; - } - - memset(&sh, 0, sizeof(sh)); - if (switch_core_speech_open(&sh, engine, voice, rate, interval, channels, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid TTS module!\n"); - return; - } - - if (switch_core_codec_init(&speech_codec, - "L16", - NULL, - NULL, - (int) rate, - interval, - 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, - switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activated\n"); - } else { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", rate, interval); - flags = 0; - switch_core_speech_close(&sh, &flags); - return; - } - - if (timer_name) { - if (switch_core_timer_init(&timer, timer_name, interval, (int) (rate / 50), switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Setup timer failed!\n"); - switch_core_codec_destroy(&speech_codec); - flags = 0; - switch_core_speech_close(&sh, &flags); - return; - } - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", (rate / 50) * 2, interval); - - /* start a thread to absorb incoming audio */ - switch_core_service_session(session); - timerp = &timer; - } - - while (switch_channel_ready(channel)) { - int32_t len = 0, idx = 0; - char cmd[3]; - main_menu: - filename = NULL; - len = 0; - *cmd = '\0'; - title_txt = description_txt = rights_txt = ""; - - if (jumpto > -1) { - switch_snprintf(cmd, sizeof(cmd), "%d", jumpto); - jumpto = -1; - } else { - switch_core_speech_flush_tts(&sh); - switch_ivr_sleep(session, 500, SWITCH_FALSE, NULL); - -#ifdef MATCH_COUNT - switch_snprintf(buf + len, sizeof(buf) - len, "%s", - ", Main Menu." - "Select one of the following news sources, or press 0 to exit. "); -#else - switch_snprintf(buf + len, sizeof(buf) - len, "%s", - ",Main Menu. " - "Select one of the following news sources, followed by the pound key or press 0 to exit. "); -#endif - len = (int32_t) strlen(buf); - - for (idx = 0; idx < feed_index; idx++) { - switch_snprintf(buf + len, sizeof(buf) - len, "%d: %s. />", idx + 1, feed_names[idx]); - len = (int32_t) strlen(buf); - } - - args.input_callback = NULL; - args.buf = cmd; - args.buflen = sizeof(cmd); - status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, buf, &args); - if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - goto finished; - } - } - if (*cmd != '\0') { - int32_t x; - char *p; - - if (strchr(cmd, '0')) { - break; - } - - if ((p = strchr(cmd, '#'))) { - *p = '\0'; -#ifdef MATCH_COUNT - /* Hmmm... I know there are no more matches so I don't *need* them to press pound but - I already told them to press it. Will this confuse people or not? Let's make em press - pound unless this define is enabled for now. - */ - } else if (match_count(cmd, feed_index) > 1) { -#else - } else { -#endif - char term; - char *cp; - switch_size_t blen = sizeof(cmd) - strlen(cmd); - - cp = cmd + blen; - switch_ivr_collect_digits_count(session, cp, blen, blen, "#", &term, 5000, 0, 0); - } - - x = atoi(cmd) - 1; - - if (x > -1 && x < feed_index) { - filename = feed_list[x]; - } else if (matches > 1) { - - } else { - args.input_callback = NULL; - args.buf = NULL; - args.buflen = 0; - status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, "I'm sorry. That is an Invalid Selection. ", &args); - if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - goto finished; - } - } - } - - if (!filename) { - continue; - } - - if (!(xml = switch_xml_parse_file(filename))) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of %s failed\n", filename); - goto finished; - } - - err = switch_xml_error(xml); - - if (!zstr(err)) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Error [%s]\n", err); - goto finished; - } - - if ((xchannel = switch_xml_child(xml, "channel"))) { - switch_xml_t title, description, rights; - - if ((title = switch_xml_child(xchannel, "title"))) { - title_txt = title->txt; - } - - if ((description = switch_xml_child(xchannel, "description"))) { - description_txt = description->txt; - } - - if ((rights = switch_xml_child(xchannel, "dc:rights"))) { - rights_txt = rights->txt; - } - } - - - if (!(item = switch_xml_child(xml, "item"))) { - if (xchannel) { - item = switch_xml_child(xchannel, "item"); - } - } - - memset(entries, 0, sizeof(entries)); - - for (i = 0; item; item = item->next) { - switch_xml_t title, description, subject, dept; - char *p; - - entries[i].inuse = 1; - entries[i].title_txt = NULL; - entries[i].description_txt = NULL; - entries[i].subject_txt = NULL; - entries[i].dept_txt = NULL; - - if ((title = switch_xml_child(item, "title"))) { - entries[i].title_txt = title->txt; - } - - if ((description = switch_xml_child(item, "description"))) { - char *t, *e; - entries[i].description_txt = description->txt; - for (;;) { - if (!(t = strchr(entries[i].description_txt, '<'))) { - break; - } - if (!(e = strchr(t, '>'))) { - break; - } - - memset(t, 32, ++e - t); - } - } - - if ((subject = switch_xml_child(item, "dc:subject"))) { - entries[i].subject_txt = subject->txt; - } - - if ((dept = switch_xml_child(item, "slash:department"))) { - entries[i].dept_txt = dept->txt; - } - - if (entries[i].description_txt && (p = strchr(entries[i].description_txt, '<'))) { - *p = '\0'; - } -#ifdef _STRIP_SOME_CHARS_ - for (p = entries[i].description_txt; *p; p++) { - if (*p == '\'' || *p == '"' || *p == ':') { - *p = ' '; - } - } -#endif - i++; - } - - if (switch_channel_ready(channel)) { - switch_time_exp_t tm; - char date[80] = ""; - switch_size_t retsize; - char dtmf[5] = ""; - - switch_time_exp_lt(&tm, switch_micro_time_now()); - switch_strftime_nocheck(date, &retsize, sizeof(date), "%I:%M %p", &tm); - - switch_ivr_sleep(session, 500, SWITCH_FALSE, NULL); - - switch_snprintf(buf, sizeof(buf), - ",%s. %s. %s. local time: %s, Press 0 for options, 5 to change voice, or pound to return to the main menu. ", - title_txt, description_txt, rights_txt, date); - args.input_callback = NULL; - args.buf = dtmf; - args.buflen = sizeof(dtmf); - status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, buf, &args); - if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - goto finished; - } - if (*dtmf != '\0') { - switch (*dtmf) { - case '0': - switch_set_flag(&dtb, SFLAG_INSTRUCT); - break; - case '#': - goto main_menu; - } - } - } - - for (last = 0; last < TTS_MAX_ENTRIES; last++) { - if (!entries[last].inuse) { - last--; - break; - } - } - - dtb.index = 0; - dtb.sh = &sh; - dtb.speed = TTS_MEAN_SPEED; - //switch_set_flag(&dtb, SFLAG_INFO); - switch_copy_string(dtb.voice, voice, sizeof(dtb.voice)); - while (entries[0].inuse && switch_channel_ready(channel)) { - while (switch_channel_ready(channel)) { - uint8_t cont = 0; - - if (dtb.index >= TTS_MAX_ENTRIES) { - dtb.index = 0; - } - if (dtb.index < 0) { - dtb.index = last; - } - - if (!entries[dtb.index].inuse) { - dtb.index = 0; - continue; - } - if (switch_channel_ready(channel)) { - char tmpbuf[1024] = ""; - uint32_t tmplen = 0; - - if (switch_test_flag(&dtb, SFLAG_MAIN)) { - switch_clear_flag(&dtb, SFLAG_MAIN); - goto main_menu; - } - if (switch_test_flag(&dtb, SFLAG_INFO)) { - switch_clear_flag(&dtb, SFLAG_INFO); - switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s %s. I am speaking at %u words per minute. ", sh.engine, sh.voice, - dtb.speed); - tmplen = (uint32_t) strlen(tmpbuf); - } - - if (switch_test_flag(&dtb, SFLAG_INSTRUCT)) { - switch_clear_flag(&dtb, SFLAG_INSTRUCT); - cont = 1; - switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s", - "Press star to pause or resume speech. " - "To go to the next item, press six. " - "To go back, press 4. " - "Press two to go faster, eight to slow down, or 7 to resume normal speed. " - "To change voices, press five. To restore the original voice press 9. " - "To hear these options again, press zero or press pound to return to the main menu. "); - } else { - switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "Story %d. ", dtb.index + 1); - tmplen = (uint32_t) strlen(tmpbuf); - - if (entries[dtb.index].subject_txt) { - switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "Subject: %s. ", entries[dtb.index].subject_txt); - tmplen = (uint32_t) strlen(tmpbuf); - } - - if (entries[dtb.index].dept_txt) { - switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "From the %s department. ", entries[dtb.index].dept_txt); - tmplen = (uint32_t) strlen(tmpbuf); - } - - if (entries[dtb.index].title_txt) { - switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s", entries[dtb.index].title_txt); - } - } - switch_core_speech_flush_tts(&sh); - args.input_callback = on_dtmf; - args.buf = &dtb; - args.buflen = sizeof(dtb); - status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, tmpbuf, &args); - if (status == SWITCH_STATUS_BREAK) { - continue; - } else if (status != SWITCH_STATUS_SUCCESS) { - goto finished; - } - - if (cont) { - continue; - } - - if (entries[dtb.index].description_txt) { - args.input_callback = on_dtmf; - args.buf = &dtb; - args.buflen = sizeof(dtb); - status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, entries[dtb.index].description_txt, &args); - } - if (status == SWITCH_STATUS_BREAK) { - continue; - } else if (status != SWITCH_STATUS_SUCCESS) { - goto finished; - } - } - - dtb.index++; - } - } - } - - finished: - switch_core_speech_close(&sh, &flags); - switch_core_codec_destroy(&speech_codec); - - if (timerp) { - /* End the audio absorbing thread */ - switch_core_thread_session_end(session); - switch_core_timer_destroy(&timer); - } - - switch_xml_free(xml); - switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE); -} - - -SWITCH_MODULE_LOAD_FUNCTION(mod_rss_load) -{ - switch_application_interface_t *app_interface; - - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_APP(app_interface, "rss", NULL, NULL, rss_function, NULL, SAF_NONE); - - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; -} - -/* For Emacs: - * Local Variables: - * mode:c - * indent-tabs-mode:t - * tab-width:4 - * c-basic-offset:4 - * End: - * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet: - */ diff --git a/src/mod/applications/mod_rss/script/news.js b/src/mod/applications/mod_rss/script/news.js deleted file mode 100644 index d6dea0dc29..0000000000 --- a/src/mod/applications/mod_rss/script/news.js +++ /dev/null @@ -1,12 +0,0 @@ -if (session.ready()) { - session.answer(); - session.speak("cepstral","David","Please wait while we refresh the RSS feeds.") - - fetchURLFile("http://weather.yahooapis.com/forecastrss?p=60610","rss/weather.rss"); - fetchURLFile("http://rss.news.yahoo.com/rss/topstories","rss/yahootop.rss"); - fetchURLFile("http://rss.news.yahoo.com/rss/science","rss/yahoosci.rss"); - fetchURLFile("http://rss.news.yahoo.com/rss/business","rss/yahoobus.rss"); - fetchURLFile("http://rss.news.yahoo.com/rss/entertainment","rss/yahooent.rss"); - fetchURLFile("http://rss.slashdot.org/Slashdot/slashdot","rss/slashdot.rss"); - fetchURLFile("http://www.freeswitch.org/xml.php","rss/freeswitch.rss"); -} diff --git a/src/mod/applications/mod_snom/Makefile.am b/src/mod/applications/mod_snom/Makefile.am deleted file mode 100644 index b388f069ec..0000000000 --- a/src/mod/applications/mod_snom/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -include $(top_srcdir)/build/modmake.rulesam -MODNAME=mod_snom - -mod_LTLIBRARIES = mod_snom.la -mod_snom_la_SOURCES = mod_snom.c -mod_snom_la_CFLAGS = $(AM_CFLAGS) -mod_snom_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS) -mod_snom_la_LIBADD = $(switch_builddir)/libfreeswitch.la -mod_snom_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_snom/conf/dialplan/snom_demo.xml b/src/mod/applications/mod_snom/conf/dialplan/snom_demo.xml deleted file mode 100644 index 5917713471..0000000000 --- a/src/mod/applications/mod_snom/conf/dialplan/snom_demo.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/mod/applications/mod_snom/mod_snom.2017.vcxproj b/src/mod/applications/mod_snom/mod_snom.2017.vcxproj deleted file mode 100644 index c74c9d08c8..0000000000 --- a/src/mod/applications/mod_snom/mod_snom.2017.vcxproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - mod_snom - {2A3D00C6-588D-4E86-81AC-9EF5EDE86E03} - mod_snom - Win32Proj - - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - DynamicLibrary - MultiByte - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - - - 6385;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) - - - false - - - - - - - X64 - - - WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions) - - - 6385;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) - - - false - - - MachineX64 - - - - - - - 6385;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) - - - false - - - - - - - X64 - - - - - 6385;6340;6246;6011;6387;%(DisableSpecificWarnings) - $(SolutionDir)\src\include;%(AdditionalIncludeDirectories) - - - false - - - MachineX64 - - - - - - - - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} - false - - - - - - \ No newline at end of file diff --git a/src/mod/applications/mod_snom/mod_snom.c b/src/mod/applications/mod_snom/mod_snom.c deleted file mode 100644 index b3cf2b478e..0000000000 --- a/src/mod/applications/mod_snom/mod_snom.c +++ /dev/null @@ -1,276 +0,0 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2005-2014, Anthony Minessale II - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * - * The Initial Developer of the Original Code is - * Anthony Minessale II - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Anthony Minessale II - * - * mod_snom.c -- SNOM Specific Features - * - */ -#include -#include - -SWITCH_MODULE_LOAD_FUNCTION(mod_snom_load); -SWITCH_MODULE_DEFINITION(mod_snom, mod_snom_load, NULL, NULL); - -static switch_bool_t snom_bind_key(const char *key, - const char *light, - const char *label, const char *user, const char *host, const char *profile, const char *action_name, const char *action) -{ - switch_event_t *event; - - - if (user && host && profile) { - if (switch_event_create(&event, SWITCH_EVENT_SEND_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "user", user); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "host", host); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "profile", profile); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "content-type", "application/x-buttons"); - if (action && action_name) { - switch_event_add_body(event, "k=%s\nc=%s\nl=%s\nn=%s\na=%s\n", key, light, label, action, action_name); - } else { - switch_event_add_body(event, "k=%s\nc=%s\nl=%s\n\n", key, light, label); - } - - switch_event_fire(&event); - } - return SWITCH_TRUE; - } - - return SWITCH_FALSE; -} - - -#define URL_SYNTAX "" -SWITCH_STANDARD_API(snom_url_api_function) -{ -#if 0 - char *tmp; - switch_event_serialize(stream->param_event, &tmp, SWITCH_TRUE); - printf("W00t\n%s\n", tmp); - free(tmp); -#endif - - return SWITCH_STATUS_SUCCESS; - -} - -#define KEY_BIND_SYNTAX "