[Asterisk-cvs] asterisk/apps app_queue.c,1.88,1.89

[markster at lists.digium.com]

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

Modified Files:
	app_queue.c 
Log Message:
Add reporting of actual hold time (bug #2564)


Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- app_queue.c	2 Oct 2004 00:58:31 -0000	1.88
+++ app_queue.c	3 Oct 2004 16:46:06 -0000	1.89
@@ -211,6 +211,7 @@
 	char sound_lessthan[80];        /* Sound file: "less-than" (def. queue-lessthan) */
 	char sound_seconds[80];         /* Sound file: "seconds." (def. queue-seconds) */
 	char sound_thanks[80];          /* Sound file: "Thank you for your patience." (def. queue-thankyou) */
+	char sound_reporthold[80];	/* Sound file: "Hold time" (def. queue-reporthold) */
 
 	int count;			/* How many entries are in the queue */
 	int maxlen;			/* Max number of entries in queue */
@@ -227,6 +228,7 @@
 	int joinempty;			/* Do we care if the queue has no members? */
 	int eventwhencalled;			/* Generate an event when the agent is called (before pickup) */
 	int leavewhenempty;		/* If all agents leave the queue, remove callers from the queue */
+	int reportholdtime;		/* Should we report caller hold time to member? */
 
 	struct member *members;		/* Member channels to be tried */
 	struct queue_ent *head;		/* Start of the actual queue */
@@ -1160,16 +1162,28 @@
 		member = lpeer->member;
 		hanguptree(outgoing, peer);
 		outgoing = NULL;
-		if (announce) {
+		if (announce || qe->parent->reportholdtime) {
 			int res2;
 			res2 = ast_autoservice_start(qe->chan);
 			if (!res2) {
-				res2 = ast_streamfile(peer, announce, peer->language);
-				if (!res2)
-					res2 = ast_waitstream(peer, "");
-				else {
-					ast_log(LOG_WARNING, "Announcement file '%s' is unavailable, continuing anyway...\n", announce);
-					res2 = 0;
+				if (announce) {
+					if (play_file(peer, announce))
+						ast_log(LOG_WARNING, "Announcement file '%s' is unavailable, continuing anyway...\n", announce);
+				}
+				if (qe->parent->reportholdtime) {
+					if (!play_file(peer, qe->parent->sound_reporthold)) {
+						int holdtime;
+						time_t now;
+
+						time(&now);
+						holdtime = abs((now - qe->start) / 60);
+						if (holdtime < 2) {
+							play_file(peer, qe->parent->sound_lessthan);
+							ast_say_number(peer, 2, AST_DIGIT_ANY, peer->language, NULL);
+						} else 
+							ast_say_number(peer, holdtime, AST_DIGIT_ANY, peer->language, NULL);
+						play_file(peer, qe->parent->sound_minutes);
+					}
 				}
 			}
 			res2 |= ast_autoservice_stop(qe->chan);
@@ -1803,6 +1817,7 @@
 				strncpy(q->sound_seconds, "queue-seconds", sizeof(q->sound_seconds) - 1);
 				strncpy(q->sound_thanks, "queue-thankyou", sizeof(q->sound_thanks) - 1);
 				strncpy(q->sound_lessthan, "queue-less-than", sizeof(q->sound_lessthan) - 1);
+				strncpy(q->sound_reporthold, "queue-reporthold", sizeof(q->sound_reporthold) - 1);
 				prev = q->members;
 				if (prev) {
 					/* find the end of any dynamic members */
@@ -1867,6 +1882,8 @@
 						strncpy(q->sound_lessthan, var->value, sizeof(q->sound_lessthan) - 1);
 					} else if (!strcasecmp(var->name, "queue-thankyou")) {
 						strncpy(q->sound_thanks, var->value, sizeof(q->sound_thanks) - 1);
+					} else if (!strcasecmp(var->name, "queue-reporthold")) {
+						strncpy(q->sound_reporthold, var->value, sizeof(q->sound_reporthold) - 1);
 					} else if (!strcasecmp(var->name, "announce-frequency")) {
 						q->announcefrequency = atoi(var->value);
 					} else if (!strcasecmp(var->name, "announce-round-seconds")) {
@@ -1897,6 +1914,8 @@
 						q->leavewhenempty = ast_true(var->value);
 					} else if (!strcasecmp(var->name, "eventwhencalled")) {
 						q->eventwhencalled = ast_true(var->value);
+					} else if (!strcasecmp(var->name, "reportholdtime")) {
+						q->reportholdtime = 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);
 					}