From 7f99d94c82820d26a659cd06b7e86ef2bef48180 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 14 May 2009 17:07:47 +0000 Subject: [PATCH] Merged revisions 194434 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r194434 | file | 2009-05-14 14:05:33 -0300 (Thu, 14 May 2009) | 7 lines 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/branches/1.6.2@194437 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index e001f5ee0c..f5b630b8c5 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) {