From bee9786cc25c97a02cf03255d2abb16cbc5f90f1 Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Sun, 21 Dec 2008 07:26:39 +0000
Subject: FreeSWITCH package added mod_shout (support mp3), mod_siren codec
 (16kHz G722.1 and 32kHz G722.1C, mod_celt codec (48kHz cd quality),
 FreeSWITCH revision 10896.

---
 packages/freeswitch/freeswitch.inc         | 23 ++++++++++++++++++++-
 packages/freeswitch/freeswitch.xml         |  2 +-
 packages/freeswitch/freeswitch_modules.xml | 32 ++++++++++++++++++++++++++++++
 pkg_config.7.xml                           |  2 +-
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index e7da6cd1..576b545d 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -609,6 +609,8 @@ function sync_package_freeswitch_modules()
       if ($rowhelper['mod_amr'] == "enable"){       $tmpxml .= "    <load module=\"mod_amr\"/>\n"; }
       if ($rowhelper['mod_ilbc'] == "enable"){      $tmpxml .= "    <load module=\"mod_ilbc\"/>\n"; }
       if ($rowhelper['mod_speex'] == "enable"){     $tmpxml .= "    <load module=\"mod_speex\"/>\n"; }
+      if ($rowhelper['mod_siren'] == "enable"){     $tmpxml .= "    <load module=\"mod_siren\"/>\n"; }
+      if ($rowhelper['mod_celt'] == "enable"){     $tmpxml .= "    <load module=\"mod_celt\"/>\n"; }
       if ($rowhelper['mod_h26x'] == "enable"){      $tmpxml .= "    <load module=\"mod_h26x\"/>\n"; }
       $tmpxml .= "\n";
       $tmpxml .= "    <!-- File Format Interfaces -->\n";
@@ -1796,6 +1798,19 @@ function freeswitch_php_install_command()
 		fclose($fout);
 		unset($filename);
 	
+	//prepare shout.conf.xml for mod_shout	
+		$fout = fopen("/usr/local/freeswitch/conf/autoload_configs/shout.conf.xml","w");
+		$tmpxml = "<configuration name=\"shout.conf\" description=\"mod shout config\">\n";
+		$tmpxml .= "  <settings>\n";
+		$tmpxml .= "    <!-- Don't change these unless you are insane -->\n";
+		$tmpxml .= "    <param name=\"decoder\" value=\"i586\"/>\n";
+		$tmpxml .= "    <!--<param name=\"volume\" value=\".1\"/>-->\n";
+		$tmpxml .= "    <!--<param name=\"outscale\" value=\"8192\"/>-->\n";
+		$tmpxml .= "  </settings>\n";
+		$tmpxml .= "</configuration>";
+		fwrite($fout, $tmpxml);
+		unset($tmpxml);
+		fclose($fout);
 	
 	$fout = fopen("/usr/local/freeswitch/conf/autoload_configs/event_socket.conf.xml","w");
 	$tmpxml = "<configuration name=\"event_socket.conf\" description=\"Socket Client\">\n";
@@ -1935,6 +1950,12 @@ function freeswitch_php_install_command()
   	if (strlen($config['installedpackages']['freeswitchmodules']['config'][0]['mod_speex']) == 0) {
   	   $config['installedpackages']['freeswitchmodules']['config'][0]['mod_speex'] = "enable";
   	}
+  	if (strlen($config['installedpackages']['freeswitchmodules']['config'][0]['mod_siren']) == 0) {
+  	   $config['installedpackages']['freeswitchmodules']['config'][0]['mod_siren'] = "enable";
+  	}
+  	if (strlen($config['installedpackages']['freeswitchmodules']['config'][0]['mod_celt']) == 0) {
+  	   $config['installedpackages']['freeswitchmodules']['config'][0]['mod_celt'] = "enable";
+  	}
   	if (strlen($config['installedpackages']['freeswitchmodules']['config'][0]['mod_h26x']) == 0) {
   	   $config['installedpackages']['freeswitchmodules']['config'][0]['mod_h26x'] = "enable";
   	}
@@ -2041,7 +2062,7 @@ function freeswitch_php_install_command()
 	}
 
 	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_version'] = "1.0.1 revision 10638.";
-	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.3";
+	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.5.4";
 	
 	       
 	conf_mount_ro();
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index a97212a3..cde813a4 100644
--- a/packages/freeswitch/freeswitch.xml
+++ b/packages/freeswitch/freeswitch.xml
@@ -44,7 +44,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>FreeSWITCH Settings</name>
-	<version>0.5.3</version>
+	<version>0.5.4</version>
 	<title>FreeSWITCH: Settings</title>
 	<include_file>/usr/local/pkg/freeswitch.inc</include_file>
 	<menu>
diff --git a/packages/freeswitch/freeswitch_modules.xml b/packages/freeswitch/freeswitch_modules.xml
index 38b0ac9b..87ad6a44 100644
--- a/packages/freeswitch/freeswitch_modules.xml
+++ b/packages/freeswitch/freeswitch_modules.xml
@@ -836,6 +836,38 @@
 				</option>
 			</options>
 	</field>
+    <field>
+			<fielddescr>mod_siren</fielddescr>
+			<fieldname>mod_siren</fieldname>
+			<description>Siren codec.</description>
+			<type>select</type>
+			<options>
+				<option>
+					<name>enable</name>
+					<value>enable</value>
+				</option>
+				<option>
+					<name>disable</name>
+					<value>disable</value>
+				</option>
+			</options>
+	</field>	
+    <field>
+			<fielddescr>mod_celt</fielddescr>
+			<fieldname>mod_celt</fieldname>
+			<description>Celt codec.</description>
+			<type>select</type>
+			<options>
+				<option>
+					<name>enable</name>
+					<value>enable</value>
+				</option>
+				<option>
+					<name>disable</name>
+					<value>disable</value>
+				</option>
+			</options>
+	</field>
     <field>
 			<fielddescr>mod_h26x</fielddescr>
 			<fieldname>mod_h26x</fieldname>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index dc61f208..ac973f49 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -66,7 +66,7 @@
       <pkginfolink>http://forum.pfsense.org/index.php/topic,11930.0.html</pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.5.3</version>
+      <version>0.5.4</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
-- 
cgit v1.2.3