[asterisk-commits] mmichelson: trunk r86030 - /trunk/apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Oct 16 17:54:37 2007
New Revision: 86030

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86030
Log:
Removed the monitor-join option. If one wishes to mix audio, they should instead use
monitor-type=mixmonitor.

(related to issue #10885)


Modified:
    trunk/apps/app_queue.c

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=86030&r1=86029&r2=86030
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Oct 16 17:54:37 2007
@@ -360,7 +360,6 @@
 	char moh[80];                       /*!< Music On Hold class to be used */
 	char announce[80];                  /*!< Announcement to play when call is answered */
 	char context[AST_MAX_CONTEXT];      /*!< Exit context */
-	unsigned int monjoin:1;
 	unsigned int dead:1;
 	unsigned int joinempty:2;
 	unsigned int eventwhencalled:2;
@@ -968,8 +967,6 @@
 		q->setqueuevar = ast_true(val);
 	} else if (!strcasecmp(param, "setqueueentryvar")) {
 		q->setqueueentryvar = ast_true(val);
-	} else if (!strcasecmp(param, "monitor-join")) {
-		q->monjoin = ast_true(val);
 	} else if (!strcasecmp(param, "monitor-format")) {
 		ast_copy_string(q->monfmt, val, sizeof(q->monfmt));
 	} else if (!strcasecmp(param, "membermacro")) {
@@ -2879,8 +2876,6 @@
 					snprintf(tmpid, sizeof(tmpid), "chan-%lx", ast_random());
 					ast_monitor_start(which, qe->parent->monfmt, tmpid, 1, X_REC_IN | X_REC_OUT);
 				}
-				if (qe->parent->monjoin)
-					ast_monitor_setjoinfiles(which, 1);
 			} else {
 				ast_debug(1, "Starting MixMonitor as requested.\n");
 				monitorfilename = pbx_builtin_getvar_helper(qe->chan, "MONITOR_FILENAME");