[asterisk-commits] dvossel: trunk r237920 - /trunk/apps/app_queue.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Jan  5 17:08:50 2010
New Revision: 237920

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=237920
Log:
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


Modified:
    trunk/apps/app_queue.c

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=237920&r1=237919&r2=237920
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Jan  5 17:08:50 2010
@@ -4335,11 +4335,8 @@
 
 						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);
 						}