diff options
| author | Mark Michelson <mmichelson@digium.com> | 2007-10-12 20:06:37 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2007-10-12 20:06:37 +0000 |
| commit | fbcd884e1be5bb20d09d2c065e57fb4f938ed0e4 (patch) | |
| tree | 84d6958fa29b4d5267993055faaf0aafa1f8a347 /apps | |
| parent | 24e2567e2d56013593fa0e07a059dbeadec77fe6 (diff) | |
Allow for the position announcement to be turned off if desired.
(closes issue #8515, reported by bruno_rocha, initial patch by bruno_rocha, final patch by qwell)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85527 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 9ed1b00d4..3a8654b81 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -372,6 +372,7 @@ struct call_queue { unsigned int wrapped:1; unsigned int timeoutrestart:1; unsigned int announceholdtime:2; + unsigned int announceposition:1; unsigned int strategy:3; unsigned int maskmemberstatus:1; unsigned int realtime:1; @@ -803,6 +804,7 @@ static void init_queue(struct call_queue *q) q->announcefrequency = 0; q->minannouncefrequency = DEFAULT_MIN_ANNOUNCE_FREQUENCY; q->announceholdtime = 0; + q->announceholdtime = 1; q->roundingseconds = 0; /* Default - don't announce seconds */ q->servicelevel = 0; q->ringinuse = 1; @@ -1013,6 +1015,8 @@ static void queue_set_param(struct call_queue *q, const char *param, const char q->announceholdtime = ANNOUNCEHOLDTIME_ALWAYS; else q->announceholdtime = 0; + } else if (!strcasecmp(param, "announce-position")) { + q->announceposition = ast_true(val); } else if (!strcasecmp(param, "periodic-announce")) { if (strchr(val, ',')) { char *s, *buf = ast_strdupa(val); @@ -1532,23 +1536,25 @@ static int say_position(struct queue_ent *qe, int ringing) } else { ast_moh_stop(qe->chan); } - /* Say we're next, if we are */ - if (qe->pos == 1) { - res = play_file(qe->chan, qe->parent->sound_next); - if (res) - goto playout; - else - goto posout; - } else { - res = play_file(qe->chan, qe->parent->sound_thereare); - if (res) - goto playout; - res = ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY, qe->chan->language, (char *) NULL); /* Needs gender */ - if (res) - goto playout; - res = play_file(qe->chan, qe->parent->sound_calls); - if (res) - goto playout; + if (qe->parent->announceposition) { + /* Say we're next, if we are */ + if (qe->pos == 1) { + res = play_file(qe->chan, qe->parent->sound_next); + if (res) + goto playout; + else + goto posout; + } else { + res = play_file(qe->chan, qe->parent->sound_thereare); + if (res) + goto playout; + res = ast_say_number(qe->chan, qe->pos, AST_DIGIT_ANY, qe->chan->language, (char *) NULL); /* Needs gender */ + if (res) + goto playout; + res = play_file(qe->chan, qe->parent->sound_calls); + if (res) + goto playout; + } } /* Round hold time to nearest minute */ avgholdmins = abs(((qe->parent->holdtime + 30) - (now - qe->start)) / 60); @@ -1603,8 +1609,10 @@ static int say_position(struct queue_ent *qe, int ringing) } posout: - ast_verb(3, "Told %s in %s their queue position (which was %d)\n", + if (qe->parent->announceposition) { + ast_verb(3, "Told %s in %s their queue position (which was %d)\n", qe->chan->name, qe->parent->name, qe->pos); + } res = play_file(qe->chan, qe->parent->sound_thanks); playout: |