change moh to a var so you can change it with ease

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

diff --git a/conf/autoload_configs/conference.conf.xml b/conf/autoload_configs/conference.conf.xml
index 05b8cffc3aa5a6dc60a5b8bba283fc47783c2684..19b7e25f375ef6e0213a95dc9464b3bcfa62ecc3 100644 (file)
--- a/conf/autoload_configs/conference.conf.xml
+++ b/conf/autoload_configs/conference.conf.xml
@@ -64,7 +64,9 @@
       <!-- File to play if you are alone in the conference -->
       <!--<param name="alone-sound" value="yactopitc.wav"/>-->
       <!-- File to play endlessly (nobody will ever be able to talk) -->
-      <!--<param name="perpetual-sound" value="local_stream://moh"/>-->
+      <!--<param name="perpetual-sound" value="perpetual.wav"/>-->
+      <!-- File to play when you're alone (music on hold)-->
+      <param name="moh-sound" value="$${moh_uri}"/>
       <!-- File to play when you join the conference -->
       <!--<param name="enter-sound" value="welcome.wav"/>-->
       <!-- File to play when you leave the conference -->

diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index e319b5d75805bc58901a759fb36b1cc33e8eceb4..445101f654945833cbccd8b3d7799831367a7b9b 100644 (file)
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -197,7 +197,7 @@
     <extension name="hold_music">
       <condition field="destination_number" expression="^9999$">
        <action application="answer"/>
-       <action application="playback" data="local_stream://moh"/>
+       <action application="playback" data="$${moh_uri}"/>
       </condition>
     </extension>
 

diff --git a/conf/sip_profiles/default.xml b/conf/sip_profiles/default.xml
index f5a9be996f1e4f062577967978832650a73dc5fa..cbdab21c4254fd0173c9468d82d0c32a0d387bd7 100644 (file)
--- a/conf/sip_profiles/default.xml
+++ b/conf/sip_profiles/default.xml
@@ -28,7 +28,7 @@
     <param name="rtp-timer-name" value="soft"/>
     <param name="rtp-ip" value="$${local_ip_v4}"/>
     <param name="sip-ip" value="$${local_ip_v4}"/>
-    <param name="hold-music" value="local_stream://moh"/>
+    <param name="hold-music" value="$${moh_uri}"/>
     <!--enable to use presense and mwi -->
     <param name="manage-presence" value="true"/>
     <!-- This setting is for AAL2 bitpacking on G726 -->

diff --git a/conf/sip_profiles/nat.xml b/conf/sip_profiles/nat.xml
index c855e2b64be26da11ecc2dc02dccb693f727a622..26238df55b3c88475f813a87c3c581b8f2e90b84 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="$${global_codec_prefs}"/>
     <param name="use-rtp-timer" value="true"/>
-    <param name="hold-music" value="local_stream://moh"/>
+    <param name="hold-music" value="$${moh_uri}"/>
     <param name="rtp-timer-name" value="soft"/>
     <param name="manage-presence" value="true"/>
     <param name="inbound-codec-negotiation" value="generous"/>

diff --git a/conf/sip_profiles/outbound.xml b/conf/sip_profiles/outbound.xml
index e86b040a56b9c229f42b20742c0438a29d513af0..0767a27ca78b705bdb0e81fd309cbff96639f1bb 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="$${global_codec_prefs}"/>
-    <param name="hold-music" value="local_stream://moh"/>
+    <param name="hold-music" value="$${moh_uri}"/>
     <param name="use-rtp-timer" value="true"/>
     <param name="rtp-timer-name" value="soft"/>
     <param name="manage-presence" value="true"/>

diff --git a/conf/vars.xml b/conf/vars.xml
index f2d74c2dddc6d5463de72f67f3585a0e31906b49..c8b229f671f84aae123fa5ab13e615b1776f0ba6 100644 (file)
--- a/conf/vars.xml
+++ b/conf/vars.xml
@@ -2,6 +2,7 @@
        These are introduced when configuration strings must be consistent across modules. 
    -->
   <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/>
+  <X-PRE-PROCESS cmd="set" data="moh_uri=local_stream://moh"/>
   <!-- sip_profile 
        Must be a domain name if you are being a registry server; otherwise
        can be any string.