[svn-commits] dvossel: branch dvossel/hd_confbridge r311738 - /team/dvossel/hd_confbridge/a...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon Mar 28 12:20:14 2011
New Revision: 311738

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311738
Log:
Updates to ConfBridge documentation

Modified:
    team/dvossel/hd_confbridge/apps/app_confbridge.c

Modified: team/dvossel/hd_confbridge/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/app_confbridge.c?view=diff&rev=311738&r1=311737&r2=311738
==============================================================================
--- team/dvossel/hd_confbridge/apps/app_confbridge.c (original)
+++ team/dvossel/hd_confbridge/apps/app_confbridge.c Mon Mar 28 12:20:14 2011
@@ -64,11 +64,11 @@
                             <para>The conference number</para>
                     </parameter>
                     <parameter name="bridge_profile">
-                            <para>The bridge profile name from confbridge.conf.  When left blank, the 'default_bridge' profile found in confbridge.conf will be used if present.</para>
+                            <para>The bridge profile name from confbridge.conf.  When left blank, a dynamically built bridge profile created by the CONFBRIDGE dialplan function is searched for on the channel and used.  If no dynamic profile is present, the 'default_bridge' profile found in confbridge.conf is used. </para>
                             <para>It is important to note that while user profiles may be unique for each participant, mixing bridge profiles on a single conference is _NOT_ recommended and will produce undefined results.</para>
                     </parameter>
                     <parameter name="user_profile">
-                            <para>The user profile name from confbridge.conf.  When left blank, the 'default_user' profile found in confbridge.conf will be used if present.</para>
+                            <para>The user profile name from confbridge.conf.  When left blank, a dynamically built user profile created by the CONFBRIDGE dialplan function is searched for on the channel and used.  If no dynamic profile is present, the 'default_user' profile found in confbridge.conf is used.</para>
                     </parameter>
                     <parameter name="menu">
                             <para>The name of the DTMF menu in confbridge.conf to be applied to this channel.  No menu is applied by default if this option is left blank.</para>
@@ -77,7 +77,6 @@
             <description>
                     <para>Enters the user into a specified conference bridge. The user can exit the conference by hangup only.</para>
                     <para>The join sound can be set using the <literal>CONFBRIDGE_JOIN_SOUND</literal> variable and the leave sound can be set using the <literal>CONFBRIDGE_LEAVE_SOUND</literal> variable. These can be unique to the caller.</para>
-            <note><para>This application will not automatically answer the channel.</para></note>
             </description>
     </application>
 	<function name="CONFBRIDGE" language="en_US">
@@ -93,19 +92,19 @@
 			</parameter>
 		</syntax>
 		<description>
-            <para>---- Example 1 ----</para>
+			<para>---- Example 1 ----</para>
 			<para>In this example the custom set user profile on this channel will automatically be used by the ConfBridge app.</para> 
-            <para>exten => 1,1,Answer() </para>
-            <para>exten => 1,n,Set(CONFBRIDGE(user,announce_join_leave)=yes)</para>
-            <para>exten => 1,n,Set(CONFBRIDGE(user,startmuted)=yes)</para>
-            <para>exten => 1,n,ConfBridge(1) </para>
-            <para>---- Example 2 ----</para>
+			<para>exten => 1,1,Answer() </para>
+			<para>exten => 1,n,Set(CONFBRIDGE(user,announce_join_leave)=yes)</para>
+			<para>exten => 1,n,Set(CONFBRIDGE(user,startmuted)=yes)</para>
+			<para>exten => 1,n,ConfBridge(1) </para>
+			<para>---- Example 2 ----</para>
 			<para>This example shows how to use a predefined user or bridge profile in confbridge.conf as a template for a dynamic profile. Here we make a admin/marked user out of the default_user profile that is already defined in confbridge.conf.</para> 
-            <para>exten => 1,1,Answer() </para>
-            <para>exten => 1,n,Set(CONFBRIDGE(user,template)=default_user)</para>
-            <para>exten => 1,n,Set(CONFBRIDGE(user,admin)=yes)</para>
-            <para>exten => 1,n,Set(CONFBRIDGE(user,marked)=yes)</para>
-            <para>exten => 1,n,ConfBridge(1)</para>
+			<para>exten => 1,1,Answer() </para>
+			<para>exten => 1,n,Set(CONFBRIDGE(user,template)=default_user)</para>
+			<para>exten => 1,n,Set(CONFBRIDGE(user,admin)=yes)</para>
+			<para>exten => 1,n,Set(CONFBRIDGE(user,marked)=yes)</para>
+			<para>exten => 1,n,ConfBridge(1)</para>
 		</description>
 	</function>
 	<manager name="ConfbridgeList" language="en_US">
@@ -1156,6 +1155,10 @@
 	);
 	ast_bridge_features_init(&conference_bridge_user.features);
 
+	if (chan->_state != AST_STATE_UP) {
+		ast_answer(chan);
+	}
+
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "%s requires an argument (conference name[,options])\n", app);
 		res = -1; /* invalid PIN */