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.1@194436 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 6c857c82edbf9fdbeb1ef913d8845e9555791e11..eb8271e29e0a540255103e2632bf21e92379d787 100644 (file)
--- 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)