Merge pull request #2707 from signalwire/soundtouch

[mod_soundtouch] Remove from tree

Author: andywolk

build/modules.conf.in

@@ -40,7 +40,6 @@ applications/mod_sms
 #applications/mod_snapshot
 #applications/mod_snom
 #applications/mod_sonar
-#applications/mod_soundtouch
 applications/mod_spandsp
 #applications/mod_spy
 applications/mod_test

build/modules.conf.most

@@ -40,7 +40,6 @@ applications/mod_sms
 applications/mod_snapshot
 applications/mod_snom
 applications/mod_sonar
-applications/mod_soundtouch
 applications/mod_spandsp
 applications/mod_spy
 applications/mod_test

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],[
@@ -2132,7 +2128,6 @@ AC_CONFIG_FILES([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_test/Makefile

debian/bootstrap.sh

@@ -78,7 +78,6 @@ avoid_mods_wheezy=(
   applications/mod_hiredis
   formats/mod_shout
   applications/mod_sonar
-  applications/mod_soundtouch
   formats/mod_vlc
 )
 avoid_mods_trusty=(
@@ -547,7 +546,6 @@ Recommends:
  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-valet-parking (= \${binary:Version}),
@@ -636,7 +634,6 @@ Depends: \${misc:Depends}, freeswitch (= \${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-translate (= \${binary:Version}),
@@ -862,7 +859,6 @@ Depends: \${misc:Depends}, freeswitch (= \${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-translate-dbg (= \${binary:Version}),

debian/control-modules

@@ -210,11 +210,6 @@ 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.

freeswitch.spec

@@ -514,18 +514,6 @@ Requires:       %{name} = %{version}-%{release}
 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
@@ -1217,7 +1205,6 @@ 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-valet_parking
 Requires:	freeswitch-application-video_filter
@@ -1296,7 +1283,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 applications/mod_soundtouch \
+APPLICATION_MODULES_SZ="applications/mod_signalwire applications/mod_sms applications/mod_snapshot applications/mod_snom \
 			applications/mod_spandsp applications/mod_spy \
 			applications/mod_valet_parking applications/mod_translate applications/mod_voicemail \
 			applications/mod_voicemail_ivr applications/mod_video_filter"
@@ -1963,9 +1950,6 @@ fi
 %files application-snom
 %{MODINSTDIR}/mod_snom.so*
 
-%files application-soundtouch
-%{MODINSTDIR}/mod_soundtouch.so*
-
 %files application-spy
 %{MODINSTDIR}/mod_spy.so*
 

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

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