diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index 3e4451ad7b..764bd54daa 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -291,8 +291,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}" @@ -1216,17 +1214,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 @@ -2526,7 +2513,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} diff --git a/build/modules.conf.in b/build/modules.conf.in index 92796371a5..e3d752bdbb 100755 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -38,7 +38,6 @@ applications/mod_httapi applications/mod_signalwire applications/mod_sms #applications/mod_snapshot -#applications/mod_snom applications/mod_spandsp #applications/mod_spy applications/mod_test diff --git a/build/modules.conf.most b/build/modules.conf.most index 4eafa04a8e..9ab256e24a 100755 --- a/build/modules.conf.most +++ b/build/modules.conf.most @@ -38,7 +38,6 @@ applications/mod_rss applications/mod_signalwire applications/mod_sms applications/mod_snapshot -applications/mod_snom applications/mod_spandsp applications/mod_spy applications/mod_test diff --git a/conf/insideout/autoload_configs/modules.conf.xml b/conf/insideout/autoload_configs/modules.conf.xml index 0e1f60f77d..62d7f31b48 100755 --- a/conf/insideout/autoload_configs/modules.conf.xml +++ b/conf/insideout/autoload_configs/modules.conf.xml @@ -48,9 +48,6 @@ - - - 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/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml index 8480d8509c..8bdf873a76 100755 --- a/conf/vanilla/autoload_configs/modules.conf.xml +++ b/conf/vanilla/autoload_configs/modules.conf.xml @@ -75,9 +75,6 @@ - - - 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 35bc029486..89ed163568 100755 --- a/configure.ac +++ b/configure.ac @@ -2126,7 +2126,6 @@ AC_CONFIG_FILES([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_spandsp/Makefile src/mod/applications/mod_spy/Makefile src/mod/applications/mod_test/Makefile diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 9a4b746a10..eacc07ce7b 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -543,7 +543,6 @@ Recommends: freeswitch-mod-rss (= \${binary:Version}), freeswitch-mod-sms (= \${binary:Version}), freeswitch-mod-snapshot (= \${binary:Version}), - freeswitch-mod-snom (= \${binary:Version}), freeswitch-mod-spandsp (= \${binary:Version}), freeswitch-mod-spy (= \${binary:Version}), freeswitch-mod-valet-parking (= \${binary:Version}), @@ -630,7 +629,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}), freeswitch-mod-shout (= \${binary:Version}), freeswitch-mod-sms (= \${binary:Version}), freeswitch-mod-snapshot (= \${binary:Version}), - freeswitch-mod-snom (= \${binary:Version}), freeswitch-mod-spandsp (= \${binary:Version}), freeswitch-mod-spy (= \${binary:Version}), freeswitch-mod-translate (= \${binary:Version}), @@ -854,7 +852,6 @@ Depends: \${misc:Depends}, freeswitch (= \${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-spandsp-dbg (= \${binary:Version}), freeswitch-mod-spy-dbg (= \${binary:Version}), freeswitch-mod-translate-dbg (= \${binary:Version}), diff --git a/debian/control-modules b/debian/control-modules index 2b54b6f7e6..b20538ee1c 100755 --- a/debian/control-modules +++ b/debian/control-modules @@ -201,10 +201,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_spandsp Description: SpanDSP This module implements spandsp fax, dsp, and codec functionality. diff --git a/freeswitch.spec b/freeswitch.spec index 128347f8f5..2c0a001677 100755 --- a/freeswitch.spec +++ b/freeswitch.spec @@ -505,15 +505,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-spy Summary: FreeSWITCH mod_spy Group: System/Libraries @@ -1204,7 +1195,6 @@ Requires: freeswitch-application-rss Requires: freeswitch-application-signalwire Requires: freeswitch-application-sms Requires: freeswitch-application-snapshot -Requires: freeswitch-application-snom Requires: freeswitch-application-spy Requires: freeswitch-application-valet_parking Requires: freeswitch-application-video_filter @@ -1283,7 +1273,7 @@ APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/ applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_rad_auth \ applications/mod_redis applications/mod_rss " -APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot applications/mod_snom \ +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" @@ -1947,9 +1937,6 @@ fi %files application-snapshot %{MODINSTDIR}/mod_snapshot.so* -%files application-snom -%{MODINSTDIR}/mod_snom.so* - %files application-spy %{MODINSTDIR}/mod_spy.so* 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 "