kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix options 'm' and 's'. They were swapped in the code. Also document the fact that app_confbridge does not automatically answer the channel.

Browse Source 
(closes issue #15964)
Reported by: shrift


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@220904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2009-09-29 19:49:02 +00:00
parent a9154a905a
commit 4b4432b67e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_confbridge.c
View 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>
***/
@@ -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),
});