Fix options 'm' and 's'. They were swapped in the code. Also document the fact that...
[asterisk/asterisk.git] / apps / app_confbridge.c
index d7a0bad..2389e9b 100644 (file)
@@ -97,6 +97,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                 <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>This application will not automatically answer the channel.</note>
                 </description>
         </application>
 ***/
@@ -111,7 +112,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * bridge lock if it is important.
  */
 
-static const char * const app = "ConfBridge";
+static const char app[] = "ConfBridge";
 
 enum {
        OPTION_ADMIN = (1 << 0),             /*!< Set if the caller is an administrator */
@@ -135,10 +136,10 @@ AST_APP_OPTIONS(app_opts,{
        AST_APP_OPTION('A', OPTION_MARKEDUSER),
        AST_APP_OPTION('a', OPTION_ADMIN),
        AST_APP_OPTION('c', OPTION_ANNOUNCEUSERCOUNT),
-       AST_APP_OPTION('m', OPTION_MENU),
+       AST_APP_OPTION('m', OPTION_STARTMUTED),
        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('s', OPTION_MENU),
        AST_APP_OPTION('w', OPTION_WAITMARKED),
        AST_APP_OPTION('q', OPTION_QUIET),
 });
@@ -559,7 +560,7 @@ static int play_sound_file(struct conference_bridge *conference_bridge, const ch
        if (!(conference_bridge->playback_chan)) {
                int cause;
 
-               if (!(conference_bridge->playback_chan = ast_request("Bridge", AST_FORMAT_SLINEAR, "", &cause))) {
+               if (!(conference_bridge->playback_chan = ast_request("Bridge", AST_FORMAT_SLINEAR, NULL, "", &cause))) {
                        ast_mutex_unlock(&conference_bridge->playback_lock);
                        return -1;
                }