Author: brian Date: Tue Dec 18 12:11:18 2007 New Revision: 6866 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: change moh to a var so you can change it with ease 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 Dec 18 12:11:18 2007 @@ -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 --> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Dec 18 12:11:18 2007 @@ -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> Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Tue Dec 18 12:11:18 2007 @@ -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 --> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Tue Dec 18 12:11:18 2007 @@ -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"/> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Tue Dec 18 12:11:18 2007 @@ -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"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Tue Dec 18 12:11:18 2007 @@ -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.