Skip to content

Commit b752476

Browse files
andywolkandywolk
authored
Merge pull request #2712 from signalwire/snom
[mod_snom] Remove from tree.
2 parents 33f7be8 + 4c447a9 commit b752476

File tree

17 files changed

+1
-553
lines changed

17 files changed

+1
-553
lines changed

‎Freeswitch.2017.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shout", "src\mod\format
291291
EndProject
292292
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libs\win32\libogg\libogg.2017.vcxproj", "{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}"
293293
EndProject
294-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_snom", "src\mod\applications\mod_snom\mod_snom.2017.vcxproj", "{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}"
295-
EndProject
296294
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}"
297295
EndProject
298296
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
12161214
{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|Win32.Build.0 = Release|Win32
12171215
{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64.ActiveCfg = Release|x64
12181216
{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}.Release|x64.Build.0 = Release|x64
1219-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|Win32.ActiveCfg = Release|x64
1220-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64.ActiveCfg = Release|x64
1221-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.All|x64.Build.0 = Release|x64
1222-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|Win32.ActiveCfg = Debug|Win32
1223-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|Win32.Build.0 = Debug|Win32
1224-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64.ActiveCfg = Debug|x64
1225-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Debug|x64.Build.0 = Debug|x64
1226-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|Win32.ActiveCfg = Release|Win32
1227-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|Win32.Build.0 = Release|Win32
1228-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64.ActiveCfg = Release|x64
1229-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}.Release|x64.Build.0 = Release|x64
12301217
{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|Win32.ActiveCfg = Release|x64
12311218
{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64.ActiveCfg = Release|x64
12321219
{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.All|x64.Build.0 = Release|x64
@@ -2526,7 +2513,6 @@ Global
25262513
{D3D8B329-20BE-475E-9E83-653CEA0E0EF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
25272514
{38FE0559-9910-43A8-9E45-3E5004C27692} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
25282515
{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
2529-
{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
25302516
{B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E} = {6CD61A1D-797C-470A-BE08-8C31B68BB336}
25312517
{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E} = {0C808854-54D1-4230-BFF5-77B5FD905000}
25322518
{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0} = {0C808854-54D1-4230-BFF5-77B5FD905000}

‎build/modules.conf.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ applications/mod_httapi
3838
applications/mod_signalwire
3939
applications/mod_sms
4040
#applications/mod_snapshot
41-
#applications/mod_snom
4241
applications/mod_spandsp
4342
#applications/mod_spy
4443
applications/mod_test

‎build/modules.conf.most

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ applications/mod_rss
3838
applications/mod_signalwire
3939
applications/mod_sms
4040
applications/mod_snapshot
41-
applications/mod_snom
4241
applications/mod_spandsp
4342
applications/mod_spy
4443
applications/mod_test

‎conf/insideout/autoload_configs/modules.conf.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
<load module="mod_fsv"/>
4949
<!--<load module="mod_translate"/>-->
5050

51-
<!-- SNOM Module -->
52-
<!--<load module="mod_snom"/>-->
53-
5451
<!-- Dialplan Interfaces -->
5552
<!-- <load module="mod_dialplan_directory"/> -->
5653
<load module="mod_dialplan_xml"/>

‎conf/insideout/dialplan/default.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -116,24 +116,6 @@
116116
</condition>
117117
</extension>
118118
-->
119-
<!--
120-
snom button demo, call 9000 to make button 2 mapped to transfer the current call to a conference
121-
-->
122-
123-
<extension name="snom-demo-2">
124-
<condition field="destination_number" expression="^9001$">
125-
<action application="eval" data="${snom_bind_key(2 off DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message notused)}"/>
126-
<action application="transfer" data="3000"/>
127-
</condition>
128-
</extension>
129-
130-
<extension name="snom-demo-1">
131-
<condition field="destination_number" expression="^9000$">
132-
<!--<key> <light> <label> <user> <host> <profile> <action_name> <action>-->
133-
<action application="eval" data="${snom_bind_key(2 on DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message api+uuid_transfer ${uuid} 9001)}"/>
134-
<action application="playback" data="$${hold_music}"/>
135-
</condition>
136-
</extension>
137119

138120
<extension name="eavesdrop">
139121
<condition field="destination_number" expression="^88(.*)$|^\*0(.*)$">

‎conf/sbc/dialplan/default.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,24 +115,6 @@
115115
</condition>
116116
</extension>
117117
-->
118-
<!--
119-
snom button demo, call 9000 to make button 2 mapped to transfer the current call to a conference
120-
-->
121-
122-
<extension name="snom-demo-2">
123-
<condition field="destination_number" expression="^9001$">
124-
<action application="eval" data="${snom_bind_key(2 off DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message notused)}"/>
125-
<action application="transfer" data="3000"/>
126-
</condition>
127-
</extension>
128-
129-
<extension name="snom-demo-1">
130-
<condition field="destination_number" expression="^9000$">
131-
<!--<key> <light> <label> <user> <host> <profile> <action_name> <action>-->
132-
<action application="eval" data="${snom_bind_key(2 on DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message api+uuid_transfer ${uuid} 9001)}"/>
133-
<action application="playback" data="$${hold_music}"/>
134-
</condition>
135-
</extension>
136118

137119
<extension name="eavesdrop">
138120
<condition field="destination_number" expression="^88(.*)$|^\*0(.*)$">

‎conf/vanilla/autoload_configs/modules.conf.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@
7575
<load module="mod_httapi"/>
7676
<!--<load module="mod_translate"/>-->
7777

78-
<!-- SNOM Module -->
79-
<!--<load module="mod_snom"/>-->
80-
8178
<!-- Dialplan Interfaces -->
8279
<!-- <load module="mod_dialplan_directory"/> -->
8380
<load module="mod_dialplan_xml"/>

‎conf/vanilla/dialplan/default.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -179,24 +179,6 @@
179179
</condition>
180180
</extension>
181181
-->
182-
<!--
183-
Snom button demo, call 9000 to make button 2 mapped to transfer the current call to a conference
184-
-->
185-
186-
<extension name="snom-demo-2">
187-
<condition field="destination_number" expression="^9001$">
188-
<action application="eval" data="${snom_bind_key(2 off DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message notused)}"/>
189-
<action application="transfer" data="3000"/>
190-
</condition>
191-
</extension>
192-
193-
<extension name="snom-demo-1">
194-
<condition field="destination_number" expression="^9000$">
195-
<!--<key> <light> <label> <user> <host> <profile> <action_name> <action>-->
196-
<action application="eval" data="${snom_bind_key(2 on DND ${sip_from_user} ${sip_from_host} ${sofia_profile_name} message api+uuid_transfer ${uuid} 9001)}"/>
197-
<action application="playback" data="$${hold_music}"/>
198-
</condition>
199-
</extension>
200182

201183
<extension name="eavesdrop">
202184
<condition field="destination_number" expression="^88(\d{4})$|^\*0(.*)$">

‎configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2126,7 +2126,6 @@ AC_CONFIG_FILES([Makefile
21262126
src/mod/applications/mod_signalwire/Makefile
21272127
src/mod/applications/mod_sms/Makefile
21282128
src/mod/applications/mod_snapshot/Makefile
2129-
src/mod/applications/mod_snom/Makefile
21302129
src/mod/applications/mod_spandsp/Makefile
21312130
src/mod/applications/mod_spy/Makefile
21322131
src/mod/applications/mod_test/Makefile

‎debian/bootstrap.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,6 @@ Recommends:
543543
freeswitch-mod-rss (= \${binary:Version}),
544544
freeswitch-mod-sms (= \${binary:Version}),
545545
freeswitch-mod-snapshot (= \${binary:Version}),
546-
freeswitch-mod-snom (= \${binary:Version}),
547546
freeswitch-mod-spandsp (= \${binary:Version}),
548547
freeswitch-mod-spy (= \${binary:Version}),
549548
freeswitch-mod-valet-parking (= \${binary:Version}),
@@ -630,7 +629,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
630629
freeswitch-mod-shout (= \${binary:Version}),
631630
freeswitch-mod-sms (= \${binary:Version}),
632631
freeswitch-mod-snapshot (= \${binary:Version}),
633-
freeswitch-mod-snom (= \${binary:Version}),
634632
freeswitch-mod-spandsp (= \${binary:Version}),
635633
freeswitch-mod-spy (= \${binary:Version}),
636634
freeswitch-mod-translate (= \${binary:Version}),
@@ -854,7 +852,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
854852
freeswitch-mod-rss-dbg (= \${binary:Version}),
855853
freeswitch-mod-sms-dbg (= \${binary:Version}),
856854
freeswitch-mod-snapshot-dbg (= \${binary:Version}),
857-
freeswitch-mod-snom-dbg (= \${binary:Version}),
858855
freeswitch-mod-spandsp-dbg (= \${binary:Version}),
859856
freeswitch-mod-spy-dbg (= \${binary:Version}),
860857
freeswitch-mod-translate-dbg (= \${binary:Version}),

‎debian/control-modules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,6 @@ Description: Snapshot
201201
This module can record a sliding window of audio and take snapshots
202202
to disk.
203203

204-
Module: applications/mod_snom
205-
Description: SNOM specific features
206-
This module implements features specific to SNOM phones.
207-
208204
Module: applications/mod_spandsp
209205
Description: SpanDSP
210206
This module implements spandsp fax, dsp, and codec functionality.

‎freeswitch.spec

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -505,15 +505,6 @@ Requires: %{name} = %{version}-%{release}
505505
Provides FreeSWITCH mod_snapshot, allows recording a sliding window of audio
506506
and taking snapshots to disk.
507507

508-
%package application-snom
509-
Summary: FreeSWITCH mod_snom
510-
Group: System/Libraries
511-
Requires: %{name} = %{version}-%{release}
512-
513-
%description application-snom
514-
Provides FreeSWITCH mod_snom, an application for controlling the functionality
515-
and appearance of the programmable softkeys on Snom phones
516-
517508
%package application-spy
518509
Summary: FreeSWITCH mod_spy
519510
Group: System/Libraries
@@ -1204,7 +1195,6 @@ Requires: freeswitch-application-rss
12041195
Requires: freeswitch-application-signalwire
12051196
Requires: freeswitch-application-sms
12061197
Requires: freeswitch-application-snapshot
1207-
Requires: freeswitch-application-snom
12081198
Requires: freeswitch-application-spy
12091199
Requires: freeswitch-application-valet_parking
12101200
Requires: freeswitch-application-video_filter
@@ -1283,7 +1273,7 @@ APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/
12831273
applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_rad_auth \
12841274
applications/mod_redis applications/mod_rss "
12851275

1286-
APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot applications/mod_snom \
1276+
APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot \
12871277
applications/mod_spandsp applications/mod_spy \
12881278
applications/mod_valet_parking applications/mod_translate applications/mod_voicemail \
12891279
applications/mod_voicemail_ivr applications/mod_video_filter"
@@ -1947,9 +1937,6 @@ fi
19471937
%files application-snapshot
19481938
%{MODINSTDIR}/mod_snapshot.so*
19491939

1950-
%files application-snom
1951-
%{MODINSTDIR}/mod_snom.so*
1952-
19531940
%files application-spy
19541941
%{MODINSTDIR}/mod_spy.so*
19551942

‎src/mod/applications/mod_snom/Makefile.am

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/mod/applications/mod_snom/conf/dialplan/snom_demo.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)