Author: brian Date: Tue Apr 22 10:19:47 2008 New Revision: 8169 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/conf/sip_profiles/outbound.xml freeswitch/trunk/conf/vars.xml Log: fix moh_uri vs hold_music var Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Tue Apr 22 10:19:47 2008 @@ -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"/> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Apr 22 10:19:47 2008 @@ -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> Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Tue Apr 22 10:19:47 2008 @@ -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"/>--> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Tue Apr 22 10:19:47 2008 @@ -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"/> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Tue Apr 22 10:19:47 2008 @@ -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"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Tue Apr 22 10:19:47 2008 @@ -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.