aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]config/freeswitch/freeswitch.inc23
-rw-r--r--config/freeswitch/freeswitch.xml12
-rw-r--r--config/freeswitch/freeswitch_features.tmp4
-rw-r--r--config/freeswitch/freeswitch_recordings.tmp7
-rwxr-xr-xpkg_config.7.xml2
5 files changed, 38 insertions, 10 deletions
diff --git a/config/freeswitch/freeswitch.inc b/config/freeswitch/freeswitch.inc
index 9333f7cc..e61f7e10 100755..100644
--- a/config/freeswitch/freeswitch.inc
+++ b/config/freeswitch/freeswitch.inc
@@ -342,6 +342,17 @@ function sync_package_freeswitch_settings()
fclose($fout);
recording_js();
+
+ //shout.conf.xml
+ $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=\"" . $rowhelper['mod_shout_decoder'] . "\"/>\n";
+ $tmpxml .= " <param name=\"volume\" value=\"" . $rowhelper['mod_shout_volume'] . "\"/>\n";
+ $tmpxml .= " <!--<param name=\"outscale\" value=\"8192\"/>-->\n";
+ $tmpxml .= " </settings>\n";
+ $tmpxml .= "</configuration>";
//config.js
$admin_pin = $config['installedpackages']['freeswitchsettings']['config'][0]['admin_pin'];
@@ -1681,7 +1692,7 @@ function sync_package_freeswitch()
function freeswitch_php_install_command()
{
global $config;
- $freeswitch_package_version = "0.8.4.4";
+ $freeswitch_package_version = "0.8.4.5";
$freeswitch_build_version = "1.0.3";
$freeswitch_build_revision = "12545";
@@ -1739,7 +1750,7 @@ function freeswitch_php_install_command()
//unlink_if_exists("/tmp/mod_shout.so.tmp");
exec("cp /tmp/mod_fax.so.1 /usr/local/freeswitch/mod/mod_fax.so");
- unlink_if_exists("/tmp/mod_shout.so.tmp");
+ unlink_if_exists("/tmp/mod_fax.so.tmp");
//rename PHP files from .tmp to .php
@@ -1853,7 +1864,13 @@ function freeswitch_php_install_command()
}
if (strlen($config['installedpackages']['freeswitchsettings']['config'][0]['admin_pin']) == 0) {
$config['installedpackages']['freeswitchsettings']['config'][0]['admin_pin'] = "7575";
- }
+ }
+ if (strlen($config['installedpackages']['freeswitchsettings']['config'][0]['mod_shout_decoder']) == 0) {
+ $config['installedpackages']['freeswitchsettings']['config'][0]['mod_shout_decoder'] = "i386";
+ }
+ if (strlen($config['installedpackages']['freeswitchsettings']['config'][0]['mod_shout_volume']) == 0) {
+ $config['installedpackages']['freeswitchsettings']['config'][0]['mod_shout_volume'] = "0.3";
+ }
$numbering_plan = $config['installedpackages']['freeswitchsettings']['config'][0]['numbering_plan'];
$event_socket_password = $config['installedpackages']['freeswitchsettings']['config'][0]['event_socket_password'];
diff --git a/config/freeswitch/freeswitch.xml b/config/freeswitch/freeswitch.xml
index f0aefb79..b6dd9192 100644
--- a/config/freeswitch/freeswitch.xml
+++ b/config/freeswitch/freeswitch.xml
@@ -456,6 +456,18 @@
<description>Enter the SMTP From Name.</description>
<type>input</type>
</field>
+ <field>
+ <fielddescr>Mod Shout Decoder</fielddescr>
+ <fieldname>mod_shout_decoder</fieldname>
+ <description>Enter the Decoder. default: i386</description>
+ <type>input</type>
+ </field>
+ <field>
+ <fielddescr>Mod Shout Volume</fielddescr>
+ <fieldname>mod_shout_volume</fieldname>
+ <description>Enter the Volume. default: 0.3</description>
+ <type>input</type>
+ </field>
</fields>
<custom_add_php_command>
</custom_add_php_command>
diff --git a/config/freeswitch/freeswitch_features.tmp b/config/freeswitch/freeswitch_features.tmp
index aee3002a..612e04dd 100644
--- a/config/freeswitch/freeswitch_features.tmp
+++ b/config/freeswitch/freeswitch_features.tmp
@@ -154,8 +154,8 @@ include("head.inc");
<tr>
<td width='10%' class="vncell"><a href='freeswitch_recordings.php'>Open</a></td>
<td class="vtable">
- <!--Music on hold can be in WAV or MP3 format. To play MP3 you must have mod_shout enabled on the 'Modules' tab.-->
- Music on hold can be in WAV format. For best performance upload 16bit 8khz/16khz Mono WAV files.
+ Music on hold can be in WAV or MP3 format. To play an MP3 files you must have mod_shout enabled on the 'Modules' tab.
+ For best performance upload 16bit 8khz/16khz Mono WAV files.
</td>
</tr>
</table>
diff --git a/config/freeswitch/freeswitch_recordings.tmp b/config/freeswitch/freeswitch_recordings.tmp
index d747af0c..1366c514 100644
--- a/config/freeswitch/freeswitch_recordings.tmp
+++ b/config/freeswitch/freeswitch_recordings.tmp
@@ -391,10 +391,9 @@ if ($config_change == 1) {
<tr>
<td><p><span class="vexpl"><span class="red"><strong>Music on Hold:<br>
</strong></span>
- <!-- Music on hold can be in WAV or MP3 format. To play MP3 you must have
- mod_shout enabled on the 'Modules' tab. -->
- Music on hold is in WAV format.
- For best performance upload 16bit 8khz/16khz Mono WAV files.
+ Music on hold can be in WAV or MP3 format. To play an MP3 file you must have
+ mod_shout enabled on the 'Modules' tab. You can adjust the volume of the MP3
+ audio from the 'Settings' tab. For best performance upload 16bit 8khz/16khz Mono WAV files.
<!--Click on the 'Filename' to download it or the 'Recording Name' to
play the audio.-->
</span></p></td>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 36c7c7ce..f07f5185 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -92,7 +92,7 @@
<pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</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.8.4.4</version>
+ <version>0.8.4.5</version>
<status>Beta</status>
<required_version>1.2.1</required_version>
<maintainer>markjcrane@gmail.com</maintainer>