mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 12:52:33 +00:00
Revert "app_queue: periodic announcement configurable start time."
This reverts commit 71e317f68f
.
Reason for revert: Causes segmentation fault.
Change-Id: I3beeda83249bffec2a8f246aa50a6b2f1b59ef59
This commit is contained in:
committed by
Friendly Automation
parent
0119f3ad48
commit
4ec4543332
@@ -1836,7 +1836,6 @@ struct call_queue {
|
||||
int announcepositionlimit; /*!< How many positions we announce? */
|
||||
int announcefrequency; /*!< How often to announce their position */
|
||||
int minannouncefrequency; /*!< The minimum number of seconds between position announcements (def. 15) */
|
||||
int periodicannouncestartdelay; /*!< How long into the queue should the periodic accouncement start */
|
||||
int periodicannouncefrequency; /*!< How often to play periodic announcement */
|
||||
int numperiodicannounce; /*!< The number of periodic announcements configured */
|
||||
int randomperiodicannounce; /*!< Are periodic announcments randomly chosen */
|
||||
@@ -2965,7 +2964,6 @@ static void init_queue(struct call_queue *q)
|
||||
q->weight = 0;
|
||||
q->timeoutrestart = 0;
|
||||
q->periodicannouncefrequency = 0;
|
||||
q->periodicannouncestartdelay = -1;
|
||||
q->randomperiodicannounce = 0;
|
||||
q->numperiodicannounce = 0;
|
||||
q->relativeperiodicannounce = 0;
|
||||
@@ -3422,8 +3420,6 @@ static void queue_set_param(struct call_queue *q, const char *param, const char
|
||||
ast_str_set(&q->sound_periodicannounce[0], 0, "%s", val);
|
||||
q->numperiodicannounce = 1;
|
||||
}
|
||||
} else if (!strcasecmp(param, "periodic-announce-startdelay")) {
|
||||
q->periodicannouncestartdelay = atoi(val);
|
||||
} else if (!strcasecmp(param, "periodic-announce-frequency")) {
|
||||
q->periodicannouncefrequency = atoi(val);
|
||||
} else if (!strcasecmp(param, "relative-periodic-announce")) {
|
||||
@@ -8523,10 +8519,6 @@ static int queue_exec(struct ast_channel *chan, const char *data)
|
||||
qe.last_pos_said = 0;
|
||||
qe.last_pos = 0;
|
||||
qe.last_periodic_announce_time = time(NULL);
|
||||
if (qe.parent->periodicannouncestartdelay >= 0) {
|
||||
qe.last_periodic_announce_time += qe.parent->periodicannouncestartdelay;
|
||||
qe.last_periodic_announce_time -= qe.parent->periodicannouncefrequency;
|
||||
}
|
||||
qe.last_periodic_announce_sound = 0;
|
||||
qe.valid_digits = 0;
|
||||
if (join_queue(args.queuename, &qe, &reason, position)) {
|
||||
|
Reference in New Issue
Block a user