From: Michael S Collins <msc@freeswitch.org>
Date: Sat, 21 Jan 2012 00:23:08 +0000 (-0800)
Subject: Add other_callers_in_conf phrase macro
X-Git-Tag: v1.2-rc1~19^2~1^2~32^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65b89d10d5e82130d46a7590aefc6933b0e216e9;p=thirdparty%2Ffreeswitch.git

Add other_callers_in_conf phrase macro
---

diff --git a/conf/lang/en/ivr/sounds.xml b/conf/lang/en/ivr/sounds.xml
index 1e67062061..d2b3e4686a 100644
--- a/conf/lang/en/ivr/sounds.xml
+++ b/conf/lang/en/ivr/sounds.xml
@@ -1,33 +1,61 @@
 <include> <!--This line will be ignored it's here to validate the xml and is optional -->
-	<macro name="queue_position">
-		<input pattern="^(\d+)$">
-			<match>
-				<action function="play-file" data="ivr/ivr-you_are_number.wav"/>
-				<action function="say" data="$1" method="pronounced" type="items"/>
-				<action function="play-file" data="ivr/ivr-in_line.wav"/>
-			</match>
-		</input>
-	</macro>
+    <macro name="queue_position">
+        <input pattern="^(\d+)$">
+            <match>
+                <action function="play-file" data="ivr/ivr-you_are_number.wav"/>
+                <action function="say" data="$1" method="pronounced" type="items"/>
+                <action function="play-file" data="ivr/ivr-in_line.wav"/>
+            </match>
+        </input>
+    </macro>
 
-	<macro name="has_called_conf">
-		<input pattern="^(\d+)$">
-			<match>
-				<action function="play-file" data="$1"/>
+    <macro name="has_called_conf">
+        <input pattern="^(\d+)$">
+            <match>
+                <action function="play-file" data="$1"/>
+                <action function="sleep" data="100"/>
+                <action function="play-file" data="conference/conf-has_joined.wav"/>
+            </match>
+        </input>
+    </macro>
+    
+    <macro name="has_left_conf">
+        <input pattern="^(\d+)$">
+            <match>
+                <action function="play-file" data="$1"/>
+                <action function="sleep" data="100"/>
+                <action function="play-file" data="conference/conf-has_left.wav"/>
+            </match>
+        </input>
+    </macro>
+    
+    <macro name="callers_in_conf">
+        <input pattern="^1$" break_on_match="true">
+            <match>
+                <action function="sleep" data="500"/>
+<!--                <action function="play-file" data="ivr/ivr-there_is.wav"/> -->
+                <action function="play-file" data="digits/1.wav"/>
+                <action function="sleep" data="100"/>
+                <action function="play-file" data="conference/conf-listener_in_conference.wav"/>
+            </match>
+        </input>
+        <input pattern="^(\d+)$">
+            <match>
+                <action function="sleep" data="500"/>
+                <action function="play-file" data="ivr/ivr-there_are.wav"/>
+                <action function="say" data="$1" method="pronounced" type="items"/>
                 <action function="sleep" data="100"/>
-				<action function="play-file" data="conference/conf-has_joined.wav"/>
-			</match>
-		</input>
-	</macro>
-	
-	<macro name="has_left_conf">
-		<input pattern="^(\d+)$">
-			<match>
-				<action function="play-file" data="$1"/>
+                <action function="play-file" data="conference/conf-members_in_conference.wav"/>
+            </match>
+            <nomatch>
+                <action function="sleep" data="500"/>
+                <action function="play-file" data="ivr/ivr-there_are.wav"/>
+                <action function="play-file" data="digits/0.wav"/>
                 <action function="sleep" data="100"/>
-				<action function="play-file" data="conference/conf-has_left.wav"/>
-			</match>
-		</input>
-	</macro>
+                <action function="play-file" data="conference/conf-members_in_conference.wav"/>
+            </nomatch>          
+        </input>
+    </macro>    
 
     <macro name="enter_dest_number">
       <input pattern="^(.*)$">