diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-29 19:49:50 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-29 19:49:50 +0000 |
| commit | d747286380f132cd7318c0caa358acfacf946c47 (patch) | |
| tree | a8fe899d18aad10ed875778a9cc1418bb7be71da /apps/app_confbridge.c | |
| parent | 40f820aa8798006cc8244a855f73a1cfd627d5e7 (diff) | |
Merged revisions 220904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r220904 | mnicholson | 2009-09-29 14:49:02 -0500 (Tue, 29 Sep 2009) | 5 lines
Fix options 'm' and 's'. They were swapped in the code. Also document the fact that app_confbridge does not automatically answer the channel.
(closes issue #15964)
Reported by: shrift
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@220905 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_confbridge.c')
| -rw-r--r-- | apps/app_confbridge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 3531b684b..d52d3449d 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -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> ***/ @@ -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), }); |