diff options
| author | Joshua Colp <jcolp@digium.com> | 2009-05-14 17:05:33 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2009-05-14 17:05:33 +0000 |
| commit | 5ff58c1ff9bee83c2891272ebef39ef148e3cb82 (patch) | |
| tree | 6ce960ac4f8ee738fae7822e18451b20e1de910e /apps/app_meetme.c | |
| parent | 5a3797643c7e635fcf5b73b92648aeeb606e9b97 (diff) | |
Fix a bug where the 'T' option to Meetme did not work.
(closes issue #15031)
Reported by: Stochastic
(closes issue #13801)
Reported by: justdave
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@194434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 2f9cdb792..9b5b6d7ac 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2484,7 +2484,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c x = 1; ast_channel_setoption(chan, AST_OPTION_TONE_VERIFY, &x, sizeof(char), 0); } - if ((confflags & CONFFLAG_OPTIMIZETALKER) && !(confflags & CONFFLAG_MONITOR) && !(dsp = ast_dsp_new())) { + if (confflags & (CONFFLAG_OPTIMIZETALKER | CONFFLAG_MONITORTALKER) && !(dsp = ast_dsp_new())) { ast_log(LOG_WARNING, "Unable to allocate DSP!\n"); res = -1; } @@ -2855,7 +2855,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_frame_adjust_volume(f, user->talk.actual); } - if ((confflags & CONFFLAG_OPTIMIZETALKER) && !(confflags & CONFFLAG_MONITOR)) { + if (confflags & (CONFFLAG_OPTIMIZETALKER | CONFFLAG_MONITORTALKER)) { int totalsilence; if (user->talking == -1) { |