[Asterisk-cvs] asterisk/apps app_queue.c,1.128,1.129

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv4791/apps

Modified Files:
	app_queue.c 
Log Message:
Fix a bunch of const stuff, merge queue changes, add experimental "hybrid" DTMF mode


Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- app_queue.c	21 Mar 2005 22:08:36 -0000	1.128
+++ app_queue.c	28 Mar 2005 20:48:24 -0000	1.129
@@ -3,7 +3,7 @@
  *
  * True call queues with optional send URL on answer
  * 
- * Copyright (C) 1999-2004, Digium, Inc.
+ * Copyright (C) 1999-2005, Digium, Inc.
  *
  * Mark Spencer <markster at digium.com>
  *
@@ -14,8 +14,8 @@
  *             Each dynamic agent in each queue is now stored in the astdb.
  *             When asterisk is restarted, each agent will be automatically
[...1065 lines suppressed...]
 						q->memberdelay = atoi(var->value);
 					} else if (!strcasecmp(var->name, "weight")) {
@@ -2605,7 +2680,7 @@
 						if (q->weight)
 							use_weight++;
 					} else if (!strcasecmp(var->name, "timeoutrestart")) {
-						ast_set2_flag(q, ast_true(var->value), QUEUE_FLAG_TIMEOUTRESTART);
+						q->timeoutrestart = ast_true(var->value);
 					} else {
 						ast_log(LOG_WARNING, "Unknown keyword in queue '%s': %s at line %d of queue.conf\n", cat, var->name, var->lineno);
 					}
@@ -2637,7 +2712,7 @@
 	ql = NULL;
 	while(q) {
 		qn = q->next;
-		if (ast_test_flag(q, QUEUE_FLAG_DEAD)) {
+		if (q->dead) {
 			if (ql)
 				ql->next = q->next;
 			else