diff options
| -rwxr-xr-x | apps/app_meetme.c | 39 | ||||
| -rwxr-xr-x | sounds.txt | 7 |
2 files changed, 46 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a656c024d..203d8b46c 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -76,6 +76,7 @@ static char *descrip = " using format ${MEETME_RECORDINGFORMAT}). Default filename is\n" " meetme-conf-rec-${CONFNO}-${UNIQUEID} and the default format is wav.\n" " 'q' -- quiet mode (don't play enter/leave sounds)\n" +" 'c' -- announce user(s) count on joining a conference\n" " 'M' -- enable music on hold when the conference has a single caller\n" " 'x' -- close the conference when last marked user exits\n" " 'w' -- wait until the marked user enters the conference\n" @@ -189,10 +190,12 @@ 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_DECLARE_OPTIONS(meetme_opts,{ ['a'] = { CONFFLAG_ADMIN }, + ['c'] = { CONFFLAG_ANNOUNCEUSERCOUNT }, ['T'] = { CONFFLAG_MONITORTALKER }, ['i'] = { CONFFLAG_INTROUSER }, ['m'] = { CONFFLAG_MONITOR }, @@ -693,6 +696,42 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_waitstream(chan, ""); } + if (!(confflags & CONFFLAG_QUIET) && (confflags & CONFFLAG_ANNOUNCEUSERCOUNT) && conf->users > 1) { + int keepplaying=1; + + if (conf->users == 2) { + if (!ast_streamfile(chan,"conf-onlyone",chan->language)) { + res = ast_waitstream(chan, AST_DIGIT_ANY); + if (res > 0) + keepplaying=0; + else if (res == -1) + goto outrun; + } + } else { + if (!ast_streamfile(chan, "conf-thereare", chan->language)) { + res = ast_waitstream(chan, AST_DIGIT_ANY); + if (res > 0) + keepplaying=0; + else if (res == -1) + goto outrun; + } + if (keepplaying) { + res = ast_say_number(chan, conf->users - 1, AST_DIGIT_ANY, chan->language, (char *) NULL); + if (res > 0) + keepplaying=0; + else if (res == -1) + goto outrun; + } + if (keepplaying && !ast_streamfile(chan, "conf-otherinparty", chan->language)) { + res = ast_waitstream(chan, AST_DIGIT_ANY); + if (res > 0) + keepplaying=0; + else if (res == -1) + goto outrun; + } + } + } + /* Set it into linear mode (write) */ if (ast_set_write_format(chan, AST_FORMAT_SLINEAR) < 0) { ast_log(LOG_WARNING, "Unable to set '%s' to write linear mode\n", chan->name); diff --git a/sounds.txt b/sounds.txt index 3970bafe3..e02dad5b0 100755 --- a/sounds.txt +++ b/sounds.txt @@ -664,6 +664,7 @@ %vm-leavemsg.gsm% Press 5 to send a voicemail message %queue-less-than.gsm%less than + %conf-waitforleader.gsm%The conference will begin when the leader arrives. %conf-userwilljoin.gsm%user will join the conference. @@ -674,3 +675,9 @@ %conf-placeintoconf.gsm%You will now be placed into the conference. +%conf-thereare.gsm%There are currently + +%conf-otherinparty.gsm%other participants in the conference + +%conf-onlyone.gsm%There is currently only one other participant in the conference. + |