From: Olle Johansson Date: Mon, 29 Apr 2013 08:36:15 +0000 (+0000) Subject: Play periodic prompst for first call in a call queue X-Git-Tag: 1.8.23.0-rc1~36 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa0b6a2fb5ee276b751a6668f0d467c5ab258446;p=thirdparty%2Fasterisk.git Play periodic prompst for first call in a call queue Review: https://reviewboard.asterisk.org/r/2263/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@386792 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/CHANGES b/CHANGES index 6b75959129..d28c989b78 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,15 @@ === ====================================================================== +------------------------------------------------------------------------------ +--- Functionality changes since Asterisk 1.8.19.1 ---------------------------- +------------------------------------------------------------------------------ + +App_queue +--------- + * App_queue will now play periodic announcements for the caller that + holds the first position in the queue while waiting for answer. + ------------------------------------------------------------------------------ --- Functionality changes since Asterisk 1.8.12.0 ---------------------------- ------------------------------------------------------------------------------ diff --git a/apps/app_queue.c b/apps/app_queue.c index 0f6d3e5efa..bb96bcd911 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3607,7 +3607,7 @@ static void rna(int rnatime, struct queue_ent *qe, char *interface, char *member * * \todo eventually all call forward logic should be intergerated into and replaced by ast_call_forward() */ -static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed) +static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed, int ringing) { const char *queue = qe->parent->name; struct callattempt *o, *start = NULL, *prev = NULL; @@ -4087,6 +4087,16 @@ skip_frame:; } } + /* Make a position announcement, if enabled */ + if (qe->parent->announcefrequency) { + say_position(qe, ringing); + } + + /* Make a periodic announcement, if enabled */ + if (qe->parent->periodicannouncefrequency) { + say_periodic_announcement(qe, ringing); + } + if (!*to) { for (o = start; o; o = o->call_next) { rna(orig, qe, o->interface, o->member->membername, 1); @@ -4833,7 +4843,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce ring_one(qe, outgoing, &numbusies); lpeer = wait_for_answer(qe, outgoing, &to, &digit, numbusies, ast_test_flag(&(bridge_config.features_caller), AST_FEATURE_DISCONNECT), - forwardsallowed); + forwardsallowed, ringing); /* The ast_channel_datastore_remove() function could fail here if the * datastore was moved to another channel during a masquerade. If this is * the case, don't free the datastore here because later, when the channel