fix moh_uri vs hold_music var

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8169 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/conf/autoload_configs/conference.conf.xml b/conf/autoload_configs/conference.conf.xml
index 590f465d7c242fd55aa4aa37aeb5a10112516929..4a11ba8cd5b8351d0dd3743f1ba308eb5298092e 100644 (file)
--- a/conf/autoload_configs/conference.conf.xml
+++ b/conf/autoload_configs/conference.conf.xml
@@ -66,7 +66,7 @@
       <!-- File to play endlessly (nobody will ever be able to talk) -->
       <!--<param name="perpetual-sound" value="perpetual.wav"/>-->
       <!-- File to play when you're alone (music on hold)-->
-      <param name="moh-sound" value="$${moh_uri}"/>
+      <param name="moh-sound" value="$${hold_music}"/>
       <!-- File to play when you join the conference -->
       <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
       <!-- File to play when you leave the conference -->
@@ -104,7 +104,7 @@
       <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="moh-sound" value="$${moh_uri}"/>
+      <param name="moh-sound" value="$${hold_music}"/>
       <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"/>
@@ -127,7 +127,7 @@
       <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="moh-sound" value="$${moh_uri}"/>
+      <param name="moh-sound" value="$${hold_music}"/>
       <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"/>

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index 8c1bc4af91178abc8497a7aa7e0ae8be6f60499e..dca49ed5206a7eb02c158acdf6aaea3262d99baf 100644 (file)
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -216,7 +216,7 @@
     -->
     <extension name="park">
       <condition field="destination_number" expression="^5900$">
-       <action application="set" data="fifo_music=$${moh_uri}"/>
+       <action application="set" data="fifo_music=$${hold_music}"/>
        <action application="fifo" data="5900@$${domain} in"/>
       </condition>
     </extension>
@@ -241,7 +241,7 @@
     <extension name="park">
       <condition field="source" expression="mod_sofia"/>
       <condition field="destination_number" expression="park\+(\d+)">
-       <action application="fifo" data="$1@$${domain} in undef $${moh_uri}"/>
+       <action application="fifo" data="$1@$${domain} in undef $${hold_music}"/>
       </condition>
     </extension> 
     <!--
@@ -307,10 +307,10 @@
       <condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$">
        <action application="answer"/>
        <action application="execute_extension" data="is_secure XML features"/>
-       <action application="playback" data="$${moh_uri}"/>
+       <action application="playback" data="$${hold_music}"/>
        <anti-action application="answer"/>
        <!--<anti-action application="send_display" data="Insecure Music On Hold"/>-->
-       <anti-action application="playback" data="$${moh_uri}"/>
+       <anti-action application="playback" data="$${hold_music}"/>
       </condition>
     </extension>
 

diff --git a/conf/sip_profiles/default.xml b/conf/sip_profiles/default.xml
index 3f3fad193acc5137b34742cf3bcc3be38ce103a5..575647203dd1d83c35db10cecf3ebc9dbc26bbec 100644 (file)
--- a/conf/sip_profiles/default.xml
+++ b/conf/sip_profiles/default.xml
@@ -33,7 +33,7 @@
     <param name="rtp-ip" value="$${local_ip_v4}"/>
     <!-- ip address to bind to -->
     <param name="sip-ip" value="$${local_ip_v4}"/>
-    <param name="hold-music" value="$${moh_uri}"/>
+    <param name="hold-music" value="$${hold_music}"/>
     <!--<param name="enable-timer" value="false"/>-->
     <!--<param name="enable-100rel" value="false"/>-->
     <!--<param name="apply-inbound-acl" value="lan"/>-->

diff --git a/conf/sip_profiles/nat.xml b/conf/sip_profiles/nat.xml
index 5b5f6eb7e4d22c4d4c1e9fd68c7a2ec533af1f02..d05fa2d9cc3b0c6b17db6063351ad7c5f0f4abe8 100644 (file)
--- a/conf/sip_profiles/nat.xml
+++ b/conf/sip_profiles/nat.xml
@@ -14,7 +14,7 @@
     <param name="dtmf-duration" value="100"/>
     <param name="codec-prefs" value="$${outbound_codec_prefs}"/>
     <param name="use-rtp-timer" value="true"/>
-    <param name="hold-music" value="$${moh_uri}"/>
+    <param name="hold-music" value="$${hold_music}"/>
     <param name="rtp-timer-name" value="soft"/>
     <param name="manage-presence" value="false"/>
     <param name="inbound-codec-negotiation" value="generous"/>

diff --git a/conf/sip_profiles/outbound.xml b/conf/sip_profiles/outbound.xml
index 9db6b720bcc9bde920fbd91376336c4bcdc7753c..8d2f420eac458d93d50ffe612f3925d8ab6f2e56 100644 (file)
--- a/conf/sip_profiles/outbound.xml
+++ b/conf/sip_profiles/outbound.xml
@@ -18,7 +18,7 @@
     <param name="context" value="public"/>
     <param name="dtmf-duration" value="100"/>
     <param name="codec-prefs" value="$${outbound_codec_prefs}"/>
-    <param name="hold-music" value="$${moh_uri}"/>
+    <param name="hold-music" value="$${hold_music}"/>
     <param name="use-rtp-timer" value="true"/>
     <param name="rtp-timer-name" value="soft"/>
     <param name="manage-presence" value="false"/>

diff --git a/conf/vars.xml b/conf/vars.xml
index 7310cba2063d1a9ef8e9c680f810351d475bc407..10ac8ae27645cbd53ef160f4b176692998b70459 100644 (file)
--- a/conf/vars.xml
+++ b/conf/vars.xml
@@ -3,7 +3,6 @@
    -->
   <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/>
   <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
-  <X-PRE-PROCESS cmd="set" data="moh_uri=local_stream://moh"/>
   <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
   <!-- xmpp_client_profile and xmpp_server_profile
        xmpp_client_profile can be any string.