From 4924c4da1504669cd89fe2e896569582a90ecc14 Mon Sep 17 00:00:00 2001
From: Michael Collins <msc@freeswitch.org>
Date: Tue, 10 Feb 2009 22:44:07 +0000
Subject: [PATCH] Remove sleep(250) and add pause=250 for demo IVR

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11735 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 conf/lang/en/demo/demo-ivr.xml | 56 ++++++++++++----------------------
 1 file changed, 20 insertions(+), 36 deletions(-)

diff --git a/conf/lang/en/demo/demo-ivr.xml b/conf/lang/en/demo/demo-ivr.xml
index 27fd372b97..8c6f3f8624 100644
--- a/conf/lang/en/demo/demo-ivr.xml
+++ b/conf/lang/en/demo/demo-ivr.xml
@@ -5,64 +5,57 @@
   <macro name="demo_ivr_count">
     <input pattern="^(\d+)$">
       <match>
-	<action function="play-file" data="voicemail/vm-you_have.wav"/>
-	<action function="say" data="$1" method="pronounced" type="name_spelled"/>
-	<action function="play-file" data="voicemail/vm-messages.wav"/>
+        <action function="play-file" data="voicemail/vm-you_have.wav"/>
+        <action function="say" data="$1" method="pronounced" type="name_spelled"/>
+        <action function="play-file" data="voicemail/vm-messages.wav"/>
       </match>
     </input>
   </macro>
 
-  <macro name="demo_ivr_main_menu"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
+  <macro name="demo_ivr_main_menu" pause="250"> <!-- See conf/autoload_config/ivr.conf.xml for an example on how to use this macro in an IVR -->
     <input pattern="(.*)">
       <match>
         <!-- string together several existing sound files to create one long greeting -->
         <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-you_may_exit_by_hanging_up.wav"/>
         <!-- note that you can do more than just play files, e.g. have pauses and do TTS -->
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 1: Call FreeSWITCH conference-->
         <action function="play-file" data="ivr/ivr-enter_ext_pound.wav"/>
         <action function="execute" data="sleep(1500)"/>
         <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/1.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 2: Do FreeSWITCH echo test -->
         <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/2.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 3: Listen to Music on Hold -->
         <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/3.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 4: Hear a sample submenu -->
         <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/4.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 5: Listen to screaming monkeys -->
         <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/5.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 9: Repeat these options -->
         <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/9.wav"/>
@@ -73,48 +66,42 @@
 
   <!-- The following macro is the same as demo_ivr_main_menu except it is the "short" version -->
   <!-- The short version has all the options but not the initial greeting -->
-  <macro name="demo_ivr_main_menu_short"> 
+  <macro name="demo_ivr_main_menu_short" pause="250"> 
     <input pattern="(.*)">
       <match>
         <!-- Menu option 1: Call FreeSWITCH conference-->
         <action function="execute" data="sleep(1000)"/>
         <action function="play-file" data="ivr/ivr-to_call_the_freeswitch_conference.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/1.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 2: Do FreeSWITCH echo test -->
         <action function="play-file" data="ivr/ivr-to_do_a_freeswitch_echo_test.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/2.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 3: Listen to Music on Hold -->
         <action function="play-file" data="ivr/ivr-to_listen_to_moh.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/3.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 4: Hear a sample submenu -->
         <action function="play-file" data="ivr/ivr-to_hear_sample_submenu.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/4.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 5: Listen to screaming monkeys -->
         <action function="play-file" data="ivr/ivr-to_hear_screaming_monkeys.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/5.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option 9: Repeat these options -->
         <action function="play-file" data="ivr/ivr-to_repeat_these_options.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/9.wav"/>
@@ -128,16 +115,14 @@
     <input pattern="(.*)">
       <match>
         <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-sample_submenu.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
         <!-- Menu option *: Return to top menu -->
         <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/star.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
       </match>
     </input>
   </macro>
@@ -149,11 +134,10 @@
       <match>
         <!-- Menu option *: Return to top menu -->
         <action function="play-file" data="ivr/ivr-to_return_to_previous_menu.wav"/>
-        <action function="execute" data="sleep(250)"/>
         <action function="play-file" data="ivr/ivr-please.wav"/>
         <action function="play-file" data="voicemail/vm-press.wav"/>
         <action function="play-file" data="digits/star.wav"/>
-        <action function="execute" data="sleep(250)"/>
+
       </match>
     </input>
   </macro>