FS-10540: change conf to use sound_prefix var to allow changing to sounds set in...

diff --git a/conf/curl/autoload_configs/conference.conf.xml b/conf/curl/autoload_configs/conference.conf.xml
index 6ba27f9a46f098712f7b6b6ff66d4c2efe7a2154..dad34b2cce28e49d249b884d2a8ef23ed312ebe5 100644 (file)
--- 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 6ba27f9a46f098712f7b6b6ff66d4c2efe7a2154..dad34b2cce28e49d249b884d2a8ef23ed312ebe5 100644 (file)
--- 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 92397ba390e738eab2622fbf916bc939125d5cbd..0c4802867e6198c075ca8989636fc5b4ddd13f22 100644 (file)
--- 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 497d0d0c449246b145b414e3b0b0892769abe3fa..39a5dedd37ae177f7c554a50fcd4c78ec9d7431a 100644 (file)
--- 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 6e89e1260afee179fcad1065d01e80645b1f8536..1ccd675d756c0f483ac65e8f116973b4c91c27f8 100644 (file)
--- 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 a3e732f88dfd1a041c26952caa804162960a911d..d4e27bf18480a8c98fb5a3402ca1f5f4ab02784c 100644 (file)
--- 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 3d27bce17b49b0c6587c1cf118617f33757f2ae8..24bee311c9bd92873d8b58b0d80eb4a2392ab634 100644 (file)
--- 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 9781bb50a802d50549a29be7b98f1cab4c03eb75..a91c963465286e6fda827ea7c65f3c22c9f98df2 100644 (file)
--- 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 52efb0683ac96d45b727d3a2c701f09cf5b61550..6186ff7cc7fa422131ca70a75c88077e219f4d7e 100644 (file)
--- 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 4e531ecfaf7a69778344859f62613a2c080168e5..7e8b7288652c8cf1b172a04f985ccac50f4113b6 100644 (file)
--- 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 cec7fe234bda9b699765d8836b2d17e8980fc5d8..2f6325aa3a224ef121d4bda51c1ecef9ba84ef9a 100644 (file)
--- 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 3d27bce17b49b0c6587c1cf118617f33757f2ae8..24bee311c9bd92873d8b58b0d80eb4a2392ab634 100644 (file)
--- 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 405c7a7037c4b8c580aa0e3dd349628bac261113..814f709be35feccc90c72a352b12e5e15158fb26 100644 (file)
--- 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 2df467b6d768e0885a1804e28611fa1c2c223dab..a918e1e799b4b3b590dbe2328ac20a3647596b7a 100644 (file)
--- 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 3d27bce17b49b0c6587c1cf118617f33757f2ae8..24bee311c9bd92873d8b58b0d80eb4a2392ab634 100644 (file)
--- 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 9ed2a115fa0c57928c2e243568a2aa9d4a211006..15e7d6e7589641628a143cbbdd97843cd7d827ad 100644 (file)
--- 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.