diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-08-20 23:32:23 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-08-20 23:32:23 +0000 |
commit | 031d8209fbd07c60c103be66457a2dbb875bad3e (patch) | |
tree | 1bc2f0f033fffdac05ed0e43f4c989e950996d44 | |
parent | 0d76f2c124e54cafbf01d5d40d77a9359cd8867c (diff) |
Merge meetmecount patch (with cleanups) bug #140
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1387 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | apps/app_meetme.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index a26392d02..3103e9dea 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -55,9 +55,10 @@ static char *descrip = " 'q' -- quiet mode (don't play enter/leave sounds)\n"; static char *descrip2 = -" MeetMeCount(confno): Plays back the number of users in the specified MeetMe\n" -"conference. Returns 0 on success or -1 on a hangup. A ZAPTEL INTERFACE\n" -"MUST BE INSTALLED FOR CONFERENCING FUNCTIONALITY.\n"; +" MeetMeCount(confno[|var]): Plays back the number of users in the specifiedi\n" +"MeetMe conference. If var is specified, playback will be skipped and the value\n" +"will be returned in the variable. Returns 0 on success or -1 on a hangup.\n" +"A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING FUNCTIONALITY.\n"; STANDARD_LOCAL_USER; @@ -490,19 +491,33 @@ static int count_exec(struct ast_channel *chan, void *data) int res = 0; struct conf *conf; int cnt; + char *confnum,*localdata,*mhandle; + char val[80] = "0"; + if (!data || !strlen(data)) { ast_log(LOG_WARNING, "MeetMeCount requires an argument (conference number)\n"); return -1; } + mhandle = alloca(strlen(data) + 1); + localdata = mhandle; /* this is to make sure I have the original pointer for the free below */ LOCAL_USER_ADD(u); - conf = find_conf(data, 0); + strcpy(localdata,data); + confnum = strsep(&localdata,"|"); + conf = find_conf(confnum, 0); if (conf) cnt = conf->users; else cnt = 0; - if (chan->_state != AST_STATE_UP) - ast_answer(chan); - res = ast_say_number(chan, cnt, "", chan->language); + + if(localdata && strlen(localdata)){ + /* have var so load it and exit */ + snprintf(val,sizeof(val), "%i",cnt); + pbx_builtin_setvar_helper(chan, localdata,val); + }else{ + if (chan->_state != AST_STATE_UP) + ast_answer(chan); + res = ast_say_number(chan, cnt, "", chan->language); + } LOCAL_USER_REMOVE(u); return res; } |