diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-18 13:06:54 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-18 13:06:54 +0000 |
| commit | ef9b87ddeb0443cf43c6c63532df22d15567edba (patch) | |
| tree | 7068ebcfab9d5807baca5b208a1fbbba6086b14f /apps/app_meetme.c | |
| parent | f2943b8962dc921dd1f0a569d33d4d650f727cfb (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@28167 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 891b51554..a8db48d7f 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -96,7 +96,6 @@ static const char *descrip = " 's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n" " 't' -- set talk only mode. (Talk only, no listening)\n" " 'T' -- set talker detection (sent to manager interface and meetme list)\n" -" 'v' -- video mode\n" " 'w' -- wait until the marked user enters the conference\n" " 'x' -- close the conference when last marked user exits\n" " 'X' -- allow user to exit the conference by entering a valid single\n" @@ -212,7 +211,7 @@ static void *recordthread(void *args); #define CONFFLAG_STARMENU (1 << 4) /* If set asterisk will provide a menu to the user when '*' is pressed */ #define CONFFLAG_TALKER (1 << 5) /* If set the use can only send audio to the conference */ #define CONFFLAG_QUIET (1 << 6) /* If set there will be no enter or leave sounds */ -#define CONFFLAG_VIDEO (1 << 7) /* Set to enable video mode */ +#define CONFFLAG_ANNOUNCEUSERCOUNT (1 << 7) /* If set, when user joins the conference, they will be told the number of users that are already in */ #define CONFFLAG_AGI (1 << 8) /* Set to run AGI Script in Background */ #define CONFFLAG_MOH (1 << 9) /* Set to have music on hold when user is alone in conference */ #define CONFFLAG_MARKEDEXIT (1 << 10) /* If set the MeetMe will return if all marked with this flag left */ @@ -227,7 +226,6 @@ static void *recordthread(void *args); #define CONFFLAG_EMPTY (1 << 19) #define CONFFLAG_EMPTYNOPIN (1 << 20) #define CONFFLAG_ALWAYSPROMPT (1 << 21) -#define CONFFLAG_ANNOUNCEUSERCOUNT (1 << 22) /* If set, when user joins the conference, they will be told the number of users that are already in */ AST_APP_OPTIONS(meetme_opts, { |