Merge member delay patch (bug #2563)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3904 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 35c9bc0..24bea74 100755 (executable)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -229,6 +229,7 @@ struct ast_call_queue {
        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? */
+       int memberdelay;                /* Seconds to delay connecting member to caller */
 
        struct member *members;         /* Member channels to be tried */
        struct queue_ent *head;         /* Start of the actual queue */
@@ -1162,15 +1163,19 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
                member = lpeer->member;
                hanguptree(outgoing, peer);
                outgoing = NULL;
-               if (announce || qe->parent->reportholdtime) {
+               if (announce || qe->parent->reportholdtime || qe->parent->memberdelay) {
                        int res2;
                        res2 = ast_autoservice_start(qe->chan);
                        if (!res2) {
-                               if (announce) {
+                               if (qe->parent->memberdelay) {
+                                       ast_log(LOG_NOTICE, "Delaying member connect for %d seconds\n", qe->parent->memberdelay);
+                                       res2 |= ast_safe_sleep(peer, qe->parent->memberdelay * 1000);
+                               }
+                               if (!res2 && announce) {
                                        if (play_file(peer, announce))
                                                ast_log(LOG_WARNING, "Announcement file '%s' is unavailable, continuing anyway...\n", announce);
                                }
-                               if (qe->parent->reportholdtime) {
+                               if (!res2 && qe->parent->reportholdtime) {
                                        if (!play_file(peer, qe->parent->sound_reporthold)) {
                                                int holdtime;
                                                time_t now;
@@ -1916,6 +1921,8 @@ static void reload_queues(void)
                                                q->eventwhencalled = ast_true(var->value);
                                        } else if (!strcasecmp(var->name, "reportholdtime")) {
                                                q->reportholdtime = ast_true(var->value);
+                                       } else if (!strcasecmp(var->name, "memberdelay")) {
+                                               q->memberdelay = atoi(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);
                                        }

diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index d22e385..5b570a0 100755 (executable)
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -130,6 +130,11 @@
 ; reportholdtime = no
 ;
 ;
+; If you wish to have a delay before the member is connected to the caller (or before the member
+; hears any announcement messages), set this to the number of seconds to delay.
+;
+; memberdelay = 0
+;
 ; Each member of this call queue is listed on a separate line in
 ; the form technology/dialstring.  "member" means a normal member of a
 ; queue.  An optional penalty may be specified after a comma, such that

diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index 9fcc3c9..90ef529 100755 (executable)
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -3,9 +3,9 @@
  *
  * Save GSM in the proprietary Microsoft format.
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2004, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License