Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

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

This commit is contained in:
Mike Jerris 2017-07-25 18:31:31 -05:00
parent ba4eecbfbe
commit 41130001b0
16 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/curl/autoload_configs/conference.conf.xml
View File

@ -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"/>

8
conf/insideout/autoload_configs/conference.conf.xml
View File

@ -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"/>

2
conf/insideout/lang/en/en.xml
View File

@ -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 -->

1
conf/insideout/vars.xml
View File

@ -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.

8
conf/rayo/autoload_configs/conference.conf.xml
View File

@ -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"/>

2
conf/rayo/autoload_configs/ssml.conf.xml
View File

@ -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 -->

2
conf/rayo/lang/en/en.xml
View File

@ -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 -->

1
conf/rayo/vars.xml
View File

@ -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.

1
conf/sbc/vars.xml
View File

@ -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.

8
conf/testing/autoload_configs/conference.conf.xml
View File

@ -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"/>

2
conf/testing/dialplan/default/0022_mod_com_amd_testing.xml
View File

@ -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>

2
conf/testing/lang/en/en.xml
View File

@ -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 -->

1
conf/testing/vars.xml
View File

@ -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"/>

8
conf/vanilla/autoload_configs/conference.conf.xml
View File

@ -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"/>

2
conf/vanilla/lang/en/en.xml
View File

@ -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 -->

1
conf/vanilla/vars.xml
View File

@ -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.