From 41130001b0bbbeb66f7253480540b945eb941727 Mon Sep 17 00:00:00 2001
From: Mike Jerris <mike@jerris.com>
Date: Tue, 25 Jul 2017 18:31:31 -0500
Subject: [PATCH] FS-10540: change conf to use sound_prefix var to allow
 changing to sounds set in one change

---
 conf/curl/autoload_configs/conference.conf.xml            | 8 ++++----
 conf/insideout/autoload_configs/conference.conf.xml       | 8 ++++----
 conf/insideout/lang/en/en.xml                             | 2 +-
 conf/insideout/vars.xml                                   | 1 +
 conf/rayo/autoload_configs/conference.conf.xml            | 8 ++++----
 conf/rayo/autoload_configs/ssml.conf.xml                  | 2 +-
 conf/rayo/lang/en/en.xml                                  | 2 +-
 conf/rayo/vars.xml                                        | 1 +
 conf/sbc/vars.xml                                         | 1 +
 conf/testing/autoload_configs/conference.conf.xml         | 8 ++++----
 .../testing/dialplan/default/0022_mod_com_amd_testing.xml | 2 +-
 conf/testing/lang/en/en.xml                               | 2 +-
 conf/testing/vars.xml                                     | 1 +
 conf/vanilla/autoload_configs/conference.conf.xml         | 8 ++++----
 conf/vanilla/lang/en/en.xml                               | 2 +-
 conf/vanilla/vars.xml                                     | 1 +
 16 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/conf/curl/autoload_configs/conference.conf.xml b/conf/curl/autoload_configs/conference.conf.xml
index 6ba27f9a46..dad34b2cce 100644
--- a/conf/curl/autoload_configs/conference.conf.xml
+++ b/conf/curl/autoload_configs/conference.conf.xml
@@ -52,7 +52,7 @@
       <!-- If TTS is enabled all audio-file params beginning with -->
       <!-- 'say:' will be considered text to say with TTS -->
       <!-- Set a default path here so you can use relative paths in the other sound params-->
-      <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
+      <param name="sound-prefix" value="$${sound_prefix}"/>
       <!-- File to play to acknowledge succees -->
       <!--<param name="ack-sound" value="beep.wav"/>-->
       <!-- File to play to acknowledge failure -->
@@ -106,7 +106,7 @@
       <param name="rate" value="16000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
+      <param name="sound-prefix" value="$${sound_prefix}"/>
       <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"/>
@@ -131,7 +131,7 @@
       <param name="rate" value="32000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
+      <param name="sound-prefix" value="$${sound_prefix}"/>
       <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"/>
@@ -156,7 +156,7 @@
       <param name="rate" value="48000"/>
       <param name="interval" value="10"/>
       <param name="energy-level" value="300"/>
-      <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
+      <param name="sound-prefix" value="$${sound_prefix}"/>
       <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"/>
diff --git a/conf/insideout/autoload_configs/conference.conf.xml b/conf/insideout/autoload_configs/conference.conf.xml
index 6ba27f9a46..dad34b2cce 100644
--- a/conf/insideout/autoload_configs/conference.conf.xml
+++ b/conf/insideout/autoload_configs/conference.conf.xml
@@ -52,7 +52,7 @@
       <!-- If TTS is enabled all audio-file params beginning with -->
       <!-- 'say:' will be considered text to say with TTS -->
       <!-- Set a default path here so you can use relative paths in the other sound params-->
-      <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
+      <param name="sound-prefix" value="$${sound_prefix}"/>
       <!-- File to play to acknowledge succees -->
       <!--<param name="ack-sound" value="beep.wav"/>-->
       <!-- File to play to acknowledge failure -->
@@ -106,7 +106,7 @@
       <param name="rate" value="16000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
+      <param name="sound-prefix" value="$${sound_prefix}"/>
       <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"/>
@@ -131,7 +131,7 @@
       <param name="rate" value="32000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
+      <param name="sound-prefix" value="$${sound_prefix}"/>
       <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"/>
@@ -156,7 +156,7 @@
       <param name="rate" value="48000"/>
       <param name="interval" value="10"/>
       <param name="energy-level" value="300"/>
-      <param name="sound-prefix" value="$${base_dir}/sounds/en/us/callie"/>
+      <param name="sound-prefix" value="$${sound_prefix}"/>
       <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"/>
diff --git a/conf/insideout/lang/en/en.xml b/conf/insideout/lang/en/en.xml
index 92397ba390..0c4802867e 100644
--- a/conf/insideout/lang/en/en.xml
+++ b/conf/insideout/lang/en/en.xml
@@ -1,5 +1,5 @@
 <include>
-  <language name="en" sound-path="$${base_dir}/sounds/en/us/callie" tts-engine="cepstral" tts-voice="callie">
+  <language name="en" sound-path="$${sound_prefix}" tts-engine="cepstral" tts-voice="callie">
     <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
     <!--voicemail_en_tts is purely implemented with tts, we have the files based one that is the default. -->
     <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/>  <!-- vm/tts.xml if you want to use tts and have cepstral -->
diff --git a/conf/insideout/vars.xml b/conf/insideout/vars.xml
index 497d0d0c44..39a5dedd37 100644
--- a/conf/insideout/vars.xml
+++ b/conf/insideout/vars.xml
@@ -2,6 +2,7 @@
        These are introduced when configuration strings must be consistent across modules. 
    -->
   <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/>
+  <!--<Z-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/allison"/>-->
   <!--
       This setting is what sets the default domain FreeSWITCH will use if all else fails.
       
diff --git a/conf/rayo/autoload_configs/conference.conf.xml b/conf/rayo/autoload_configs/conference.conf.xml
index 6e89e1260a..1ccd675d75 100644
--- a/conf/rayo/autoload_configs/conference.conf.xml
+++ b/conf/rayo/autoload_configs/conference.conf.xml
@@ -63,7 +63,7 @@
       <!-- 'say:' will be considered text to say with TTS -->
       <!-- Override the default path here, after which you use relative paths in the other sound params -->
       <!-- Note: The default path is the conference's first caller's sound_prefix -->
-      <!--<param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>-->
+      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
       <!-- File to play to acknowledge succees -->
       <!--<param name="ack-sound" value="beep.wav"/>-->
       <!-- File to play to acknowledge failure -->
@@ -131,7 +131,7 @@
       <param name="rate" value="16000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <!--<param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>-->
+      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
       <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"/>
@@ -156,7 +156,7 @@
       <param name="rate" value="32000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <!--<param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>-->
+      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
       <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"/>
@@ -181,7 +181,7 @@
       <param name="rate" value="48000"/>
       <param name="interval" value="10"/>
       <param name="energy-level" value="300"/>
-      <!--<param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/>-->
+      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
       <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"/>
diff --git a/conf/rayo/autoload_configs/ssml.conf.xml b/conf/rayo/autoload_configs/ssml.conf.xml
index a3e732f88d..d4e27bf184 100644
--- a/conf/rayo/autoload_configs/ssml.conf.xml
+++ b/conf/rayo/autoload_configs/ssml.conf.xml
@@ -15,7 +15,7 @@
 
 	<!-- say voices in order of preference -->
 	<say-voices>
-		<voice name="callie" language="en-US" gender="female" prefix="$${sounds_dir}/en/us/callie/"/>
+		<voice name="callie" language="en-US" gender="female" prefix="$${sound_prefix}/"/>
 	</say-voices>
 
 	<!-- map interpret-as to say macros -->
diff --git a/conf/rayo/lang/en/en.xml b/conf/rayo/lang/en/en.xml
index 3d27bce17b..24bee311c9 100644
--- a/conf/rayo/lang/en/en.xml
+++ b/conf/rayo/lang/en/en.xml
@@ -1,5 +1,5 @@
 <include>
-  <language name="en" say-module="en" sound-prefix="$${sounds_dir}/en/us/callie" tts-engine="cepstral" tts-voice="callie">
+  <language name="en" say-module="en" sound-prefix="$${sound_prefix}" tts-engine="cepstral" tts-voice="callie">
     <phrases>
       <macros>
         <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
diff --git a/conf/rayo/vars.xml b/conf/rayo/vars.xml
index 9781bb50a8..a91c963465 100644
--- a/conf/rayo/vars.xml
+++ b/conf/rayo/vars.xml
@@ -1,5 +1,6 @@
 <include>
   <X-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/callie"/>
+  <!--<Z-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/allison"/>-->
 
   <!--
       This setting is what sets the default domain FreeSWITCH will use if all else fails.
diff --git a/conf/sbc/vars.xml b/conf/sbc/vars.xml
index 52efb0683a..6186ff7cc7 100644
--- a/conf/sbc/vars.xml
+++ b/conf/sbc/vars.xml
@@ -3,6 +3,7 @@
        These are introduced when configuration strings must be consistent across modules. 
    -->
   <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/>
+  <!--<Z-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/allison"/>-->
   <!--
       This setting is what sets the default domain FreeSWITCH will use if all else fails.
       
diff --git a/conf/testing/autoload_configs/conference.conf.xml b/conf/testing/autoload_configs/conference.conf.xml
index 4e531ecfaf..7e8b728865 100644
--- a/conf/testing/autoload_configs/conference.conf.xml
+++ b/conf/testing/autoload_configs/conference.conf.xml
@@ -82,7 +82,7 @@
       <!-- 'say:' will be considered text to say with TTS -->
       <!-- Override the default path here, after which you use relative paths in the other sound params -->
       <!-- Note: The default path is the conference's first caller's sound_prefix -->
-      <!-- <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/> -->
+      <!-- <param name="sound-prefix" value="$${sound_prefix}"/> -->
       <!-- File to play to acknowledge succees -->
       <!-- <param name="ack-sound" value="beep.wav"/> -->
       <!-- File to play to acknowledge failure -->
@@ -152,7 +152,7 @@
       <param name="rate" value="16000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <!-- <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/> -->
+      <!-- <param name="sound-prefix" value="$${sound_prefix}"/> -->
       <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"/>
@@ -177,7 +177,7 @@
       <param name="rate" value="32000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <!-- <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/> -->
+      <!-- <param name="sound-prefix" value="$${sound_prefix}"/> -->
       <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"/>
@@ -216,7 +216,7 @@
       <param name="rate" value="48000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="300"/>
-      <!-- <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/> -->
+      <!-- <param name="sound-prefix" value="$${sound_prefix}"/> -->
       <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"/>
diff --git a/conf/testing/dialplan/default/0022_mod_com_amd_testing.xml b/conf/testing/dialplan/default/0022_mod_com_amd_testing.xml
index cec7fe234b..2f6325aa3a 100644
--- a/conf/testing/dialplan/default/0022_mod_com_amd_testing.xml
+++ b/conf/testing/dialplan/default/0022_mod_com_amd_testing.xml
@@ -14,7 +14,7 @@
   <condition field="destination_number" expression="^(machine_detected)$">
     <action application="wait_for_silence" data="300 30 5 25000"/>
     <action application="sleep" data="8000"/>
-    <action application="playback" data="$${sounds_dir}/en/us/callie/ivr/8000/ivr-welcome_to_freeswitch.wav"/>
+    <action application="playback" data="$${sound_prefix}/ivr/8000/ivr-welcome_to_freeswitch.wav"/>
     <action application="info"/>
     <action application="hangup"/>
   </condition>
diff --git a/conf/testing/lang/en/en.xml b/conf/testing/lang/en/en.xml
index 3d27bce17b..24bee311c9 100644
--- a/conf/testing/lang/en/en.xml
+++ b/conf/testing/lang/en/en.xml
@@ -1,5 +1,5 @@
 <include>
-  <language name="en" say-module="en" sound-prefix="$${sounds_dir}/en/us/callie" tts-engine="cepstral" tts-voice="callie">
+  <language name="en" say-module="en" sound-prefix="$${sound_prefix}" tts-engine="cepstral" tts-voice="callie">
     <phrases>
       <macros>
         <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
diff --git a/conf/testing/vars.xml b/conf/testing/vars.xml
index 405c7a7037..814f709be3 100644
--- a/conf/testing/vars.xml
+++ b/conf/testing/vars.xml
@@ -1,6 +1,7 @@
 <include>
   <X-PRE-PROCESS cmd="set" data="default_password=1234"/>
   <X-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/callie"/>
+  <!--<Z-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/allison"/>-->
   <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
   <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/>
   <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
diff --git a/conf/vanilla/autoload_configs/conference.conf.xml b/conf/vanilla/autoload_configs/conference.conf.xml
index 2df467b6d7..a918e1e799 100644
--- a/conf/vanilla/autoload_configs/conference.conf.xml
+++ b/conf/vanilla/autoload_configs/conference.conf.xml
@@ -63,7 +63,7 @@
       <!-- 'say:' will be considered text to say with TTS -->
       <!-- Override the default path here, after which you use relative paths in the other sound params -->
       <!-- Note: The default path is the conference's first caller's sound_prefix -->
-      <!-- <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/> -->
+      <!-- <param name="sound-prefix" value="$${sound_prefix}"/> -->
       <!-- File to play to acknowledge succees -->
       <!-- <param name="ack-sound" value="beep.wav"/> -->
       <!-- File to play to acknowledge failure -->
@@ -133,7 +133,7 @@
       <param name="rate" value="16000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="100"/>
-      <!-- <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/> -->
+      <!-- <param name="sound-prefix" value="$${sound_prefix}"/> -->
       <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"/>
@@ -158,7 +158,7 @@
       <param name="rate" value="32000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="100"/>
-      <!-- <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/> -->
+      <!-- <param name="sound-prefix" value="$${sound_prefix}"/> -->
       <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"/>
@@ -197,7 +197,7 @@
       <param name="rate" value="48000"/>
       <param name="interval" value="20"/>
       <param name="energy-level" value="100"/>
-      <!-- <param name="sound-prefix" value="$${sounds_dir}/en/us/callie"/> -->
+      <!-- <param name="sound-prefix" value="$${sound_prefix}"/> -->
       <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"/>
diff --git a/conf/vanilla/lang/en/en.xml b/conf/vanilla/lang/en/en.xml
index 3d27bce17b..24bee311c9 100644
--- a/conf/vanilla/lang/en/en.xml
+++ b/conf/vanilla/lang/en/en.xml
@@ -1,5 +1,5 @@
 <include>
-  <language name="en" say-module="en" sound-prefix="$${sounds_dir}/en/us/callie" tts-engine="cepstral" tts-voice="callie">
+  <language name="en" say-module="en" sound-prefix="$${sound_prefix}" tts-engine="cepstral" tts-voice="callie">
     <phrases>
       <macros>
         <X-PRE-PROCESS cmd="include" data="demo/*.xml"/> <!-- Note: this now grabs whole subdir, previously grabbed only demo.xml -->
diff --git a/conf/vanilla/vars.xml b/conf/vanilla/vars.xml
index 9ed2a115fa..15e7d6e758 100644
--- a/conf/vanilla/vars.xml
+++ b/conf/vanilla/vars.xml
@@ -50,6 +50,7 @@
 
 
   <X-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/callie"/>
+  <!--<Z-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/allison"/> -->
 
   <!--
       This setting is what sets the default domain FreeSWITCH will use if all else fails.