[asterisk-commits] file: branch 1.6.0 r194435 - in /branches/1.6.0: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu May 14 12:06:23 2009
New Revision: 194435

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=194435
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_meetme.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_meetme.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/apps/app_meetme.c?view=diff&rev=194435&r1=194434&r2=194435
==============================================================================
--- branches/1.6.0/apps/app_meetme.c (original)
+++ branches/1.6.0/apps/app_meetme.c Thu May 14 12:06:23 2009
@@ -2096,7 +2096,7 @@
 			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 @@
 					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)