diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-14 17:06:23 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-14 17:06:23 +0000 |
| commit | b6dd4813025535d21daa299b123376e5ce4be163 (patch) | |
| tree | 68a2a051f9421a3ace1b3d42eaababd66bf6ebbd /apps | |
| parent | d02fffc88c4118d3e40fcf2ed1d8308f2219ae16 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@194435 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -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 6acdfc010..c2b310b4f 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2096,7 +2096,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; } @@ -2413,7 +2413,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if (user->talk.actual) 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) |