diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-09-26 06:28:04 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-09-26 06:28:04 -0500 |
commit | 0220915cb2482ac378c79cccf44b2a41f003168a (patch) | |
tree | 9c2507ca90d6069fab4ba7cc2a4d423ea064678f /apps | |
parent | 629e9bb6a0cd315e3c005429147e09bc0169c4f1 (diff) | |
parent | d0d4b139fcc19469ce170e223ac79e249c0d3c22 (diff) |
Merge "app_queue: Only do announcement logic between ringing cycles" into 15
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_queue.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index ef40a891c..b6079afd5 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -4831,7 +4831,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; @@ -5349,16 +5349,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) { @@ -6788,7 +6778,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) { @@ -8259,14 +8249,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; } |