[asterisk-commits] dvossel: branch 1.6.1 r237922 - in /branches/1.6.1: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Jan  5 17:09:55 2010
New Revision: 237922

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_queue.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=237922&r1=237921&r2=237922
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Tue Jan  5 17:09:55 2010
@@ -3703,11 +3703,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);
 						}