summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2017-09-26 06:22:14 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-09-26 06:22:14 -0500
commitdf17e01274fccbbb228d403f3c421492ead8d63d (patch)
tree078ac88cee5fe111298ba1a29edc50ae4178749a /apps
parent7977daa0cc74ddd15fb73378de8b612397178e5a (diff)
parent0adf6f3bd9d5645bd6654fbb200767824a494cb4 (diff)
Merge "app_queue: Only do announcement logic between ringing cycles" into 13
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 3fed5dcb6..04a4a040a 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4724,7 +4724,7 @@ static void update_connected_line_from_peer(struct ast_channel *chan, struct ast
*
* \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, int ringing)
+static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed)
{
const char *queue = qe->parent->name;
struct callattempt *o, *start = NULL, *prev = NULL;
@@ -5243,16 +5243,6 @@ skip_frame:;
}
}
- /* Make a position announcement, if enabled */
- if (qe->parent->announcefrequency && qe->parent->announce_to_first_user) {
- say_position(qe, ringing);
- }
-
- /* Make a periodic announcement, if enabled */
- if (qe->parent->periodicannouncefrequency && qe->parent->announce_to_first_user) {
- say_periodic_announcement(qe, ringing);
- }
-
if (!*to) {
for (o = start; o; o = o->call_next) {
if (o->chan) {
@@ -6659,7 +6649,7 @@ static int try_calling(struct queue_ent *qe, struct ast_flags opts, char **opt_a
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, ringing);
+ forwardsallowed);
ao2_lock(qe->parent);
if (qe->parent->strategy == QUEUE_STRATEGY_RRMEMORY || qe->parent->strategy == QUEUE_STRATEGY_RRORDERED) {
@@ -8072,14 +8062,14 @@ check_turns:
if (makeannouncement) {
/* Make a position announcement, if enabled */
- if (qe.parent->announcefrequency)
+ if (qe.parent->announcefrequency && qe.parent->announce_to_first_user)
if ((res = say_position(&qe,ringing)))
goto stop;
}
makeannouncement = 1;
/* Make a periodic announcement, if enabled */
- if (qe.parent->periodicannouncefrequency) {
+ if (qe.parent->periodicannouncefrequency && qe.parent->announce_to_first_user) {
if ((res = say_periodic_announcement(&qe,ringing))) {
goto stop;
}