kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add count of users in conference (bug #3215)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-20 03:04:46 +00:00
parent 6d63970147
commit 87bbe6ee7a
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
apps/app_meetme.c
View File

@@ -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);

7
sounds.txt
View File

@@ -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.