[asterisk-commits] file: trunk r194434 - /trunk/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu May 14 12:05:33 2009
New Revision: 194434

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=194434
Log:
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:
    trunk/apps/app_meetme.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=194434&r1=194433&r2=194434
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu May 14 12:05:33 2009
@@ -2484,7 +2484,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;
 		}
@@ -2855,7 +2855,7 @@
 						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) {