diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-09-07 01:22:57 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-09-07 01:22:57 +0000 |
| commit | 53a61fb2b7900ae1be446d40bdc58b43cdd3f70c (patch) | |
| tree | 259daa585dfc25cd12e4fadcfdf49e45f6584bbe /apps | |
| parent | 2184e527649e2165fb010f06dc359c7ccb6e1616 (diff) | |
Make menu interruptible (bug #2377), Also fix PBX "add extension" CLI (bug #2289)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3732 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/app_meetme.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 42f42fc13..ef2ff3de9 100755 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -5,7 +5,7 @@ * * Copyright (C) 1999-2004, Digium, Inc. * - * Mark Spencer <markster@linux-support.net> + * Mark Spencer <markster@digium.com> * * This program is free software, distributed under the terms of * the GNU General Public License @@ -511,6 +511,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c char *agifiledefault = "conf-background.agi"; char meetmesecs[30] = ""; char exitcontext[AST_MAX_EXTENSION] = ""; + int dtmf; ZT_BUFFERINFO bi; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; @@ -840,10 +841,14 @@ zapretry: menu_active = 1; /* Record this sound! */ if (!ast_streamfile(chan, "conf-adminmenu", chan->language)) - ast_waitstream(chan, ""); - } else { - switch(f->subclass - 48) { - case 1: /* Un/Mute */ + dtmf = ast_waitstream(chan, AST_DIGIT_ANY); + else + dtmf = 0; + } else + dtmf = f->subclass; + if (dtmf) { + switch(dtmf) { + case '1': /* Un/Mute */ menu_active = 0; if (ztc.confmode & ZT_CONF_TALKER) { ztc.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER; @@ -865,7 +870,7 @@ zapretry: ast_waitstream(chan, ""); } break; - case 2: /* Un/Lock the Conference */ + case '2': /* Un/Lock the Conference */ menu_active = 0; if (conf->locked) { conf->locked = 0; @@ -891,10 +896,14 @@ zapretry: menu_active = 1; /* Record this sound! */ if (!ast_streamfile(chan, "conf-usermenu", chan->language)) - ast_waitstream(chan, ""); - } else { - switch(f->subclass - 48) { - case 1: /* Un/Mute */ + dtmf = ast_waitstream(chan, AST_DIGIT_ANY); + else + dtmf = 0; + } else + dtmf = f->subclass; + if (dtmf) { + switch(dtmf) { + case '1': /* Un/Mute */ menu_active = 0; if (ztc.confmode & ZT_CONF_TALKER) { ztc.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER; |