[asterisk-commits] file: branch file/bridging r109363 - /team/file/bridging/apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Mar 18 09:20:06 2008
New Revision: 109363

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109363
Log:
Now we add an option to wait for a marked user....

Modified:
    team/file/bridging/apps/app_confbridge.c

Modified: team/file/bridging/apps/app_confbridge.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_confbridge.c?view=diff&rev=109363&r1=109362&r2=109363
==============================================================================
--- team/file/bridging/apps/app_confbridge.c (original)
+++ team/file/bridging/apps/app_confbridge.c Tue Mar 18 09:20:06 2008
@@ -59,12 +59,13 @@
 "      'd' -- Dynamically add conference\n"
 "      'm' -- Present menu (user or admin) when '#' is received\n"
 "      'M[(<class>)]'\n"
-"          -- enable music on hold when the conference has a single caller.\n"
+"          -- Enable music on hold when the conference has a single caller.\n"
 "             Optionally, specify a musiconhold class to use.  If one is not\n"
 "             provided, it will use the channel's currently set music class,\n"
 "             or \"default\".\n"
 "      'l' -- Do not play message when first person enters\n"
-"      's' -- set initially muted\n"
+"      's' -- Set initially muted\n"
+"      'w' -- Wait until a marked user enters before starting the conference\n"
 "The join sound can be set using the CONFBRIDGE_JOIN_SOUND variable and the leave sound\n"
 "can be set using the CONFBRIDGE_LEAVE_SOUND variable. These can be unique to the caller.";
 
@@ -77,6 +78,7 @@
 	OPTION_STARTMUTED = (1 << 5),        /*!< Set if the caller should be initially set muted */
 	OPTION_ANNOUNCEUSERCOUNT = (1 << 6), /*!< Set if the number of users should be announced to the caller */
 	OPTION_MARKEDUSER = (1 << 7),        /*!< Set if the caller is a marked user */
+	OPTION_WAITMARKED = (1 << 8),        /*!< Set if the conference must wait for a marked user before starting */
 } option_flags;
 
 enum {
@@ -94,6 +96,7 @@
 	AST_APP_OPTION_ARG('M', OPTION_MUSICONHOLD, OPTION_MUSICONHOLD_CLASS),
 	AST_APP_OPTION('1', OPTION_NOONLYPERSON),
 	AST_APP_OPTION('s', OPTION_STARTMUTED),
+	AST_APP_OPTION('w', OPTION_WAITMARKED),
 });
 
 #define MAX_CONF_NAME 32