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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 2f9cdb7927a0540bcca728c5a98ab38b7b43d14e..9b5b6d7ac4dc5458cbd653b1d058c23dac455489 100644 (file)
--- 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) {