diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-14 17:07:04 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-14 17:07:04 +0000 |
| commit | 6a82ed7697db42f6fe110b50bda240cbf4ff4032 (patch) | |
| tree | 3c73e034278f4d96d448868d8425711285629315 /apps | |
| parent | 597274493ab11d4ab24c3f9aca7df70e915f3c22 (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.1@194436 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 6c857c82e..eb8271e29 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2150,7 +2150,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; } @@ -2466,7 +2466,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) |