From 94c85b112a021491bd1bb9074b1ccc44fca8e572 Mon Sep 17 00:00:00 2001 From: dvossel Date: Tue, 5 Jan 2010 23:10:17 +0000 Subject: Merged revisions 237920 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r237920 | dvossel | 2010-01-05 17:08:50 -0600 (Tue, 05 Jan 2010) | 16 lines fixes holdtime playback issue in app_queue When reporting hold time, the number of seconds should be mod 60. Otherwise audio playback could be something like "2 minutes 123 seconds" rather than "2 minutes 3 seconds". Also, the "minute" sound file is missing, so for the moment until that file can be created the "minutes" file is used instead. (closes issue #16168) Reported by: nickilo Patches: patch-unified-trunk-rev-222176 uploaded by nickilo (license ) Tested by: nickilo, wonderg ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@237923 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_queue.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'apps/app_queue.c') diff --git a/apps/app_queue.c b/apps/app_queue.c index 1a8b3b0f7..74eb7ad17 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3626,11 +3626,8 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce time(&now); holdtime = abs((now - qe->start) / 60); - holdtimesecs = abs((now - qe->start)); - if (holdtime == 1) { - ast_say_number(peer, holdtime, AST_DIGIT_ANY, peer->language, NULL); - play_file(peer, qe->parent->sound_minute); - } else { + holdtimesecs = abs((now - qe->start) % 60); + if (holdtime > 0) { ast_say_number(peer, holdtime, AST_DIGIT_ANY, peer->language, NULL); play_file(peer, qe->parent->sound_minutes); } -- cgit v1.2.3