kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_queue: Refactor odd placement of if's around say_position"

Browse Source
This commit is contained in:
Kevin Harwell
2020-02-27 14:42:44 -06:00
committed by Gerrit Code Review
parent d18af40431 680e6b9774
commit 2d9ecd9cd1
1 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/app_queue.c
View File

@@ -1614,7 +1614,7 @@ struct member {
time_t starttime; /*!< The time at which the member answered the current caller. */
time_t lastcall; /*!< When last successful call was hungup */
time_t lastpause; /*!< When started the last pause */
struct call_queue *lastqueue; /*!< Last queue we received a call */
struct call_queue *lastqueue; /*!< Last queue we received a call */
unsigned int dead:1; /*!< Used to detect members deleted in realtime */
unsigned int delme:1; /*!< Flag to delete entry on reload */
char rt_uniqueid[80]; /*!< Unique id of realtime member entry */
@@ -4017,44 +4017,26 @@ static int say_position(struct queue_ent *qe, int ringing)
/* Say we're next, if we are */
if (qe->pos == 1) {
res = play_file(qe->chan, qe->parent->sound_next);
if (res) {
goto playout;
if (!res) {
goto posout;
}
goto posout;
/* Say there are more than N callers */
} else if (qe->parent->announceposition == ANNOUNCEPOSITION_MORE_THAN && qe->pos > qe->parent->announcepositionlimit) {
res = (
play_file(qe->chan, qe->parent->queue_quantity1) ||
ast_say_number(qe->chan, qe->parent->announcepositionlimit, AST_DIGIT_ANY,
ast_channel_language(qe->chan), NULL) || /* Needs gender */
play_file(qe->chan, qe->parent->queue_quantity2));
/* Say there are currently N callers waiting */
} else {
if (qe->parent->announceposition == ANNOUNCEPOSITION_MORE_THAN && qe->pos > qe->parent->announcepositionlimit){
/* More than Case*/
res = play_file(qe->chan, qe->parent->queue_quantity1);
if (res) {
goto playout;
}
res = ast_say_number(qe->chan, qe->parent->announcepositionlimit, AST_DIGIT_ANY, ast_channel_language(qe->chan), NULL); /* Needs gender */
if (res) {
goto playout;
}
} else {
/* Normal Case */
res = play_file(qe->chan, qe->parent->sound_thereare);
if (res) {
goto playout;
}
res = ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY, ast_channel_language(qe->chan), NULL); /* Needs gender */
if (res) {
goto playout;
}
}
if (qe->parent->announceposition == ANNOUNCEPOSITION_MORE_THAN && qe->pos > qe->parent->announcepositionlimit){
/* More than Case*/
res = play_file(qe->chan, qe->parent->queue_quantity2);
if (res) {
goto playout;
}
} else {
res = play_file(qe->chan, qe->parent->sound_calls);
if (res) {
goto playout;
}
}
res = (
play_file(qe->chan, qe->parent->sound_thereare) ||
ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY,
ast_channel_language(qe->chan), NULL) || /* Needs gender */
play_file(qe->chan, qe->parent->sound_calls));
}
if (res) {
goto playout;
}
}
/* Round hold time to nearest minute */