[svn-commits] mmichelson: branch 1.6.0 r180008 - in /branches/1.6.0: ./ apps/ configs/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Mar  3 16:49:32 2009
New Revision: 180008

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180008
Log:
Merged revisions 180007 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r180007 | mmichelson | 2009-03-03 16:49:07 -0600 (Tue, 03 Mar 2009) | 22 lines
  
  Merged revisions 180006 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r180006 | mmichelson | 2009-03-03 16:48:18 -0600 (Tue, 03 Mar 2009) | 17 lines
    
    Clarify some documentation of queues.conf.sample
    
    It had always been possible to explicitly specify a "blank"
    value for a sound file in queues.conf and have no sound played
    back. The problem with this is that it would result in some ugly
    CLI warnings from file.c.
    
    This commit introduces a check when playing a file in app_queue
    to see if the name of the file is zero-length and return early if
    that is the case. Also, the ability to specify the blank sound
    files in queues.conf is now mentioned more clearly in queues.conf.sample
    
    (closes issue #14227)
    Reported by: caspy
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c
    branches/1.6.0/configs/queues.conf.sample

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

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=180008&r1=180007&r2=180008
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Tue Mar  3 16:49:32 2009
@@ -1787,6 +1787,10 @@
 static int play_file(struct ast_channel *chan, const char *filename)
 {
 	int res;
+
+	if (ast_strlen_zero(filename)) {
+		return 0;
+	}
 
 	ast_stopstream(chan);
 

Modified: branches/1.6.0/configs/queues.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configs/queues.conf.sample?view=diff&rev=180008&r1=180007&r2=180008
==============================================================================
--- branches/1.6.0/configs/queues.conf.sample (original)
+++ branches/1.6.0/configs/queues.conf.sample Tue Mar  3 16:49:32 2009
@@ -232,6 +232,13 @@
 ; Use these sound files in making position/holdtime announcements.  The
 ; defaults are as listed below -- change only if you need to.
 ;
+; Keep in mind that you may also prevent a sound from being played if you
+; explicitly set a sound to be an empty string. For example, if you want to
+; prevent the queue from playing queue-thankyou, you may set the sound using
+; the following line:
+;
+; queue-thankyou=
+;
 			;	("You are now first in line.")
 ;queue-youarenext = queue-youarenext		
 			;	("There are")