|
|
@ -1396,9 +1396,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|
|
|
if (!menu_active) {
|
|
|
|
if (!menu_active) {
|
|
|
|
menu_active = 1;
|
|
|
|
menu_active = 1;
|
|
|
|
/* Record this sound! */
|
|
|
|
/* Record this sound! */
|
|
|
|
if (!ast_streamfile(chan, "conf-adminmenu", chan->language))
|
|
|
|
if (!ast_streamfile(chan, "conf-adminmenu", chan->language)) {
|
|
|
|
dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
|
|
|
|
dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
|
|
|
|
else
|
|
|
|
ast_stopstream(chan);
|
|
|
|
|
|
|
|
} else
|
|
|
|
dtmf = 0;
|
|
|
|
dtmf = 0;
|
|
|
|
} else
|
|
|
|
} else
|
|
|
|
dtmf = f->subclass;
|
|
|
|
dtmf = f->subclass;
|
|
|
@ -1475,9 +1476,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
|
|
|
|
/* User menu */
|
|
|
|
/* User menu */
|
|
|
|
if (!menu_active) {
|
|
|
|
if (!menu_active) {
|
|
|
|
menu_active = 1;
|
|
|
|
menu_active = 1;
|
|
|
|
if (!ast_streamfile(chan, "conf-usermenu", chan->language))
|
|
|
|
if (!ast_streamfile(chan, "conf-usermenu", chan->language)) {
|
|
|
|
dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
|
|
|
|
dtmf = ast_waitstream(chan, AST_DIGIT_ANY);
|
|
|
|
else
|
|
|
|
ast_stopstream(chan);
|
|
|
|
|
|
|
|
} else
|
|
|
|
dtmf = 0;
|
|
|
|
dtmf = 0;
|
|
|
|
} else
|
|
|
|
} else
|
|
|
|
dtmf = f->subclass;
|
|
|
|
dtmf = f->subclass;
|
|
|
|