From 7b3b8d8a5327177c911d60e782784ea5e2315cd8 Mon Sep 17 00:00:00 2001
From: Karl Anderson <bitbashing@gmail.com>
Date: Wed, 4 May 2011 15:16:01 -0700
Subject: [PATCH] more tweaks

---
 autoload_configs/conference.conf.xml      | 202 ++++++++--------------
 autoload_configs/directory.conf.xml       |  20 ---
 autoload_configs/event_multicast.conf.xml |   9 -
 autoload_configs/fifo.conf.xml            |   6 -
 autoload_configs/ivr.conf.xml             |   5 -
 autoload_configs/modules.conf.xml         |  16 +-
 autoload_configs/voicemail.conf.xml       |  62 -------
 ivr_menus/empty.xml                       |   3 -
 8 files changed, 78 insertions(+), 245 deletions(-)
 delete mode 100644 autoload_configs/directory.conf.xml
 delete mode 100644 autoload_configs/event_multicast.conf.xml
 delete mode 100644 autoload_configs/fifo.conf.xml
 delete mode 100644 autoload_configs/ivr.conf.xml
 delete mode 100644 autoload_configs/voicemail.conf.xml
 delete mode 100644 ivr_menus/empty.xml

diff --git a/autoload_configs/conference.conf.xml b/autoload_configs/conference.conf.xml
index 8b119dd..8add428 100644
--- a/autoload_configs/conference.conf.xml
+++ b/autoload_configs/conference.conf.xml
@@ -1,174 +1,118 @@
 <configuration name="conference.conf" description="Audio Conference">
-    <caller-controls>
-        <group name="default">
-            <control action="mute" digits="0"/>
-            <control action="deaf mute" digits="*"/>
-            <control action="energy up" digits="9"/>
-            <control action="energy equ" digits="8"/>
-            <control action="energy dn" digits="7"/>
-            <control action="vol talk up" digits="3"/>
-            <control action="vol talk zero" digits="2"/>
-            <control action="vol talk dn" digits="1"/>
-            <control action="vol listen up" digits="6"/>
-            <control action="vol listen zero" digits="5"/>
-            <control action="vol listen dn" digits="4"/>
-            <control action="hangup" digits="#"/>
-        </group>
-    </caller-controls>
-    
+    <caller-controls/>
+
     <profiles>
         <profile name="default">
             <param name="rate" value="8000"/>
             <param name="interval" value="20"/>
             <param name="energy-level" value="300"/>
             <!--<param name="member-flags" value="waste"/>-->
-            <param name="caller-controls" value="default"/>
-            <param name="tts-engine" value="flite"/>
-            <param name="tts-voice" value="kal"/>
-            <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
-            <param name="ack-sound" value="beep.wav"/>
-            <param name="nack-sound" value="beeperr.wav"/>
-            <param name="muted-sound" value="conference/conf-muted.wav"/>
-            <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-            <param name="alone-sound" value="conference/conf-alone.wav"/>
-            <!--<param name="perpetual-sound" value="perpetual.wav"/>-->
-            <param name="moh-sound" value="local_stream://default"/>
-            <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-            <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-            <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-            <param name="locked-sound" value="conference/conf-locked.wav"/>
-            <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-            <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-            <param name="pin-sound" value="conference/conf-pin.wav"/>
-            <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+            <param name="caller-controls" value="none"/>
+            <param name="sound-prefix" value=""/>
+            <param name="ack-sound" value=""/>
+            <param name="nack-sound" value=""/>
+            <param name="muted-sound" value=""/>
+            <param name="unmuted-sound" value=""/>
+            <param name="alone-sound" value=""/>
+            <param name="perpetual-sound" value=""/>
+            <param name="moh-sound" value=""/>
+            <param name="enter-sound" value=""/>
+            <param name="exit-sound" value=""/>
+            <param name="kicked-sound" value=""/>
+            <param name="locked-sound" value=""/>
+            <param name="is-locked-sound" value=""/>
+            <param name="is-unlocked-sound" value=""/>
+            <param name="pin-sound" value=""/>
+            <param name="bad-pin-sound" value=""/>
             <param name="caller-id-name" value="Unknown"/>
             <param name="caller-id-number" value="5555555555"/>
             <!-- <param name="suppress-events" value="start-talking,stop-talking"/> -->
             <param name="comfort-noise" value="true"/>
-            <param name="auto-record" value="$${recordings_dir}/${conference_name}_${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
         </profile>
-                    
+
         <profile name="wideband">
             <param name="rate" value="16000"/>
             <param name="interval" value="20"/>
             <param name="energy-level" value="300"/>
             <!--<param name="member-flags" value="waste"/>-->
-            <param name="caller-controls" value="default"/>
-            <param name="tts-engine" value="flite"/>
-            <param name="tts-voice" value="kal"/>
-            <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
-            <param name="ack-sound" value="beep.wav"/>
-            <param name="nack-sound" value="beeperr.wav"/>
-            <param name="muted-sound" value="conference/conf-muted.wav"/>
-            <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-            <param name="alone-sound" value="conference/conf-alone.wav"/>
-            <!--<param name="perpetual-sound" value="perpetual.wav"/>-->
-            <param name="moh-sound" value="local_stream://default"/>
-            <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-            <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-            <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-            <param name="locked-sound" value="conference/conf-locked.wav"/>
-            <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-            <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-            <param name="pin-sound" value="conference/conf-pin.wav"/>
-            <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+            <param name="caller-controls" value="none"/>
+            <param name="sound-prefix" value=""/>
+            <param name="ack-sound" value=""/>
+            <param name="nack-sound" value=""/>
+            <param name="muted-sound" value=""/>
+            <param name="unmuted-sound" value=""/>
+            <param name="alone-sound" value=""/>
+            <param name="perpetual-sound" value=""/>
+            <param name="moh-sound" value=""/>
+            <param name="enter-sound" value=""/>
+            <param name="exit-sound" value=""/>
+            <param name="kicked-sound" value=""/>
+            <param name="locked-sound" value=""/>
+            <param name="is-locked-sound" value=""/>
+            <param name="is-unlocked-sound" value=""/>
+            <param name="pin-sound" value=""/>
+            <param name="bad-pin-sound" value=""/>
             <param name="caller-id-name" value="Unknown"/>
             <param name="caller-id-number" value="5555555555"/>
             <!-- <param name="suppress-events" value="start-talking,stop-talking"/> -->
             <param name="comfort-noise" value="true"/>
-            <param name="auto-record" value="$${recordings_dir}/${conference_name}_${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
         </profile>
-                                
+
         <profile name="ultrawideband">
             <param name="rate" value="32000"/>
             <param name="interval" value="20"/>
             <param name="energy-level" value="300"/>
             <!--<param name="member-flags" value="waste"/>-->
-            <param name="caller-controls" value="default"/>
-            <param name="tts-engine" value="flite"/>
-            <param name="tts-voice" value="kal"/>
-            <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
-            <param name="ack-sound" value="beep.wav"/>
-            <param name="nack-sound" value="beeperr.wav"/>
-            <param name="muted-sound" value="conference/conf-muted.wav"/>
-            <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-            <param name="alone-sound" value="conference/conf-alone.wav"/>
-            <!--<param name="perpetual-sound" value="perpetual.wav"/>-->
-            <param name="moh-sound" value="local_stream://default"/>
-            <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-            <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-            <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-            <param name="locked-sound" value="conference/conf-locked.wav"/>
-            <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-            <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-            <param name="pin-sound" value="conference/conf-pin.wav"/>
-            <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+            <param name="caller-controls" value="none"/>
+            <param name="sound-prefix" value=""/>
+            <param name="ack-sound" value=""/>
+            <param name="nack-sound" value=""/>
+            <param name="muted-sound" value=""/>
+            <param name="unmuted-sound" value=""/>
+            <param name="alone-sound" value=""/>
+            <param name="perpetual-sound" value=""/>
+            <param name="moh-sound" value=""/>
+            <param name="enter-sound" value=""/>
+            <param name="exit-sound" value=""/>
+            <param name="kicked-sound" value=""/>
+            <param name="locked-sound" value=""/>
+            <param name="is-locked-sound" value=""/>
+            <param name="is-unlocked-sound" value=""/>
+            <param name="pin-sound" value=""/>
+            <param name="bad-pin-sound" value=""/>
             <param name="caller-id-name" value="Unknown"/>
             <param name="caller-id-number" value="5555555555"/>
             <!-- <param name="suppress-events" value="start-talking,stop-talking"/> -->
             <param name="comfort-noise" value="true"/>
-            <param name="auto-record" value="$${recordings_dir}/${conference_name}_${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
         </profile>
 
-        <profile name="cdquality">
+        <profile name="cd-quality">
             <param name="rate" value="48000"/>
             <param name="interval" value="20"/>
             <param name="energy-level" value="300"/>
             <!--<param name="member-flags" value="waste"/>-->
-            <param name="caller-controls" value="default"/>
-            <param name="tts-engine" value="flite"/>
-            <param name="tts-voice" value="kal"/>
-            <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
-            <param name="ack-sound" value="beep.wav"/>
-            <param name="nack-sound" value="beeperr.wav"/>
-            <param name="muted-sound" value="conference/conf-muted.wav"/>
-            <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-            <param name="alone-sound" value="conference/conf-alone.wav"/>
-            <!--<param name="perpetual-sound" value="perpetual.wav"/>-->
-            <param name="moh-sound" value="local_stream://default"/>
-            <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-            <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-            <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-            <param name="locked-sound" value="conference/conf-locked.wav"/>
-            <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-            <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-            <param name="pin-sound" value="conference/conf-pin.wav"/>
-            <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
-            <param name="caller-id-name" value="Unknown"/>
-            <param name="caller-id-number" value="5555555555"/>
-            <!-- <param name="suppress-events" value="start-talking,stop-talking"/> -->
-            <param name="comfort-noise" value="true"/>
-            <param name="auto-record" value="$${recordings_dir}/${conference_name}_${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
-        </profile>
-
-        <profile name="basic">
-            <param name="rate" value="8000"/>
-            <param name="interval" value="20"/>
-            <param name="energy-level" value="300"/>
-            <!--<param name="member-flags" value="waste"/>-->
             <param name="caller-controls" value="none"/>
-            <param name="tts-engine" value="flite"/>
-            <param name="tts-voice" value="kal"/>
-            <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>
-            <param name="muted-sound" value="conference/conf-muted.wav"/>
-            <param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
-            <param name="alone-sound" value="conference/conf-alone.wav"/>
-            <!--<param name="perpetual-sound" value="perpetual.wav"/>-->
-            <param name="moh-sound" value="silence"/>
-            <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
-            <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
-            <param name="kicked-sound" value="conference/conf-kicked.wav"/>
-            <param name="locked-sound" value="conference/conf-locked.wav"/>
-            <param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
-            <param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
-            <param name="pin-sound" value="conference/conf-pin.wav"/>
-            <param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+            <param name="sound-prefix" value=""/>
+            <param name="ack-sound" value=""/>
+            <param name="nack-sound" value=""/>
+            <param name="muted-sound" value=""/>
+            <param name="unmuted-sound" value=""/>
+            <param name="alone-sound" value=""/>
+            <param name="perpetual-sound" value=""/>
+            <param name="moh-sound" value=""/>
+            <param name="enter-sound" value=""/>
+            <param name="exit-sound" value=""/>
+            <param name="kicked-sound" value=""/>
+            <param name="locked-sound" value=""/>
+            <param name="is-locked-sound" value=""/>
+            <param name="is-unlocked-sound" value=""/>
+            <param name="pin-sound" value=""/>
+            <param name="bad-pin-sound" value=""/>
             <param name="caller-id-name" value="Unknown"/>
             <param name="caller-id-number" value="5555555555"/>
             <!-- <param name="suppress-events" value="start-talking,stop-talking"/> -->
             <param name="comfort-noise" value="true"/>
-            <param name="auto-record" value="$${recordings_dir}/${conference_name}_${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
         </profile>
 
     </profiles>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/autoload_configs/directory.conf.xml b/autoload_configs/directory.conf.xml
deleted file mode 100644
index 1704d16..0000000
--- a/autoload_configs/directory.conf.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<configuration name="directory.conf" description="Directory">
-    <settings>
-    </settings>
-    
-    <profiles>
-        <profile name="default">
-            <param name="max-menu-attempts" value="3"/>
-            <param name="min-search-digits" value="3"/>
-            <param name="terminator-key" value="#"/>
-            <param name="digit-timeout" value="3000"/>
-            <param name="max-result" value="5"/>
-            <param name="next-key" value="6"/>
-            <param name="prev-key" value="4"/>
-            <param name="switch-order-key" value="*"/>
-            <param name="select-name-key" value="1"/>
-            <param name="new-search-key" value="3"/>
-            <param name="search-order" value="last_name"/>
-        </profile>
-    </profiles>
-</configuration> 
diff --git a/autoload_configs/event_multicast.conf.xml b/autoload_configs/event_multicast.conf.xml
deleted file mode 100644
index 846dbc2..0000000
--- a/autoload_configs/event_multicast.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<configuration name="event_multicast.conf" description="Multicast Event">
-    <settings>
-        <param name="address" value="225.1.1.1"/>
-        <param name="port" value="4242"/>
-        <param name="bindings" value="all"/>
-        <param name="ttl" value="1"/>
-        <param name="psk" value="sh0vvMEthev01p"/>
-    </settings>
-</configuration>
diff --git a/autoload_configs/fifo.conf.xml b/autoload_configs/fifo.conf.xml
deleted file mode 100644
index c20b6a4..0000000
--- a/autoload_configs/fifo.conf.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<configuration name="fifo.conf" description="FIFO Configuration">
-    <settings>
-        <param name="delete-all-outbound-member-on-startup" value="false"/>
-    </settings>
-    <fifos />
-</configuration>
diff --git a/autoload_configs/ivr.conf.xml b/autoload_configs/ivr.conf.xml
deleted file mode 100644
index 93a4ad3..0000000
--- a/autoload_configs/ivr.conf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<configuration name="ivr.conf" description="IVR menus">
-    <menus>
-        <X-PRE-PROCESS cmd="include" data="../ivr_menus/*.xml"/>
-    </menus>
-</configuration>
diff --git a/autoload_configs/modules.conf.xml b/autoload_configs/modules.conf.xml
index dea1ca9..371a3a3 100644
--- a/autoload_configs/modules.conf.xml
+++ b/autoload_configs/modules.conf.xml
@@ -10,7 +10,6 @@
 
         <!-- Event Handlers -->
         <load module="mod_event_socket"/>
-        <!--<load module="mod_event_multicast"/>-->
         <load module="mod_erlang_event" />
 
         <!-- Directory Interfaces -->
@@ -25,40 +24,35 @@
         <load module="mod_conference"/>
         <load module="mod_dptools"/>
         <load module="mod_expr"/>
-        <load module="mod_fifo"/>
-        <!--<load module="mod_voicemail"/>-->
-        <load module="mod_directory"/>
-        <load module="mod_esf"/>
-        <!--<load module="mod_valet_parking"/>-->
-        <load module="mod_hash"/>
 
         <!-- Codec Interfaces -->
         <load module="mod_spandsp"/>
-        <!--<load module="mod_g723_1"/>-->
+        <load module="mod_siren"/>
         <load module="mod_g729"/>
+        <!--<load module="mod_g723_1"/>-->
         <!--<load module="mod_amr"/>-->
         <!--<load module="mod_ilbc"/>-->
         <!--<load module="mod_speex"/>-->
         <!--<load module="mod_h26x"/>-->
-        <load module="mod_siren"/>
         <!--<load module="mod_celt"/>-->
+        <!--<load module="mod_opus"/>-->
 
         <!-- File Format Interfaces -->
         <load module="mod_sndfile"/>
         <load module="mod_native_file"/>
         <load module="mod_local_stream"/>
         <load module="mod_tone_stream"/>
+        <load module="mod_shout"/>
+        <load module="mod_shell_stream"/>
 
         <!-- Timers -->
 
         <!-- Languages -->
 
         <!-- ASR /TTS -->
-        <load module="mod_flite"/>
 
         <!-- Say -->
         <load module="mod_say_en"/>
-        <!--<load module="mod_say_ru"/>-->
 
         <!-- Third party modules -->
         
diff --git a/autoload_configs/voicemail.conf.xml b/autoload_configs/voicemail.conf.xml
deleted file mode 100644
index de8f6f2..0000000
--- a/autoload_configs/voicemail.conf.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<configuration name="voicemail.conf" description="Voicemail">
-    <settings/>
-    
-    <profiles>
-        <profile name="default">
-            <param name="file-extension" value="wav"/>
-            <param name="terminator-key" value="#"/>
-            <param name="max-login-attempts" value="3"/>
-            <param name="digit-timeout" value="10000"/>
-            <param name="min-record-len" value="3"/>
-            <param name="max-record-len" value="300"/>
-            <param name="max-retries" value="3"/>
-            <param name="tone-spec" value="%(1000, 0, 640)"/>
-            <param name="callback-dialplan" value="XML"/>
-            <param name="callback-context" value="default"/>
-            <param name="play-new-messages-key" value="1"/>
-            <param name="play-saved-messages-key" value="2"/>
-            <param name="login-keys" value="*"/>
-            <param name="main-menu-key" value="0"/>
-            <param name="config-menu-key" value="5"/>
-            <param name="record-greeting-key" value="1"/>
-            <param name="choose-greeting-key" value="2"/>
-            <param name="change-pass-key" value="6"/>
-            <param name="record-name-key" value="3"/>
-            <param name="record-file-key" value="3"/>
-            <param name="listen-file-key" value="1"/>
-            <param name="save-file-key" value="2"/>
-            <param name="delete-file-key" value="7"/>
-            <param name="undelete-file-key" value="8"/>
-            <param name="email-key" value="4"/>
-            <param name="pause-key" value="0"/>
-            <param name="restart-key" value="1"/>
-            <param name="ff-key" value="6"/>
-            <param name="rew-key" value="4"/>
-            <param name="skip-greet-key" value="#"/>
-            <!--<param name="previous-message-key" value=""/>-->
-            <!--<param name="next-message-key" value=""/>-->
-            <!--<param name="skip-info-key" value=""/>-->
-            <param name="record-silence-threshold" value="200"/>
-            <param name="record-silence-hits" value="2"/>
-            <param name="web-template-file" value="web-vm.tpl"/>
-            <!--<param name="record-sample-rate" value="11025"/>-->
-            <param name="operator-extension" value="operator XML default"/>
-            <param name="operator-key" value="0"/>
-            <param name="vmain-extension" value="vmain XML default"/>
-            <param name="vmain-key" value="*"/>
-            <!--<param name="auto-playback-recordings" value="true"/>-->
-            <email>
-                <param name="template-file" value="../templates/voicemail.tpl"/>
-                <param name="notify-template-file" value="../templates/notify-voicemail.tpl"/>
-                <!-- this is the format voicemail_time will have -->
-                <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/>
-                <param name="email-from" value="${voicemail_account}@${voicemail_domain}"/>
-            </email>
-            <!--<param name="storage-dir" value="/tmp"/>-->
-            <!--<param name="odbc-dsn" value="fs_vm"/>-->
-            <param name="record-comment" value="Powered by 2600Hz"/>
-            <param name="record-title" value="Voicemail Message"/>
-            <!--<param name="record-copyright" value="Your Copyright"/>-->
-        </profile>
-    </profiles>
-</configuration>
diff --git a/ivr_menus/empty.xml b/ivr_menus/empty.xml
deleted file mode 100644
index dd68d75..0000000
--- a/ivr_menus/empty.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<include>
-</include>