[svn-commits] mmichelson: trunk r180007 - in /trunk: ./ apps/ configs/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Mar  3 16:49:07 2009
New Revision: 180007

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180007
Log:
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:
    trunk/   (props changed)
    trunk/apps/app_queue.c
    trunk/configs/queues.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/apps/app_queue.c?view=diff&rev=180007&r1=180006&r2=180007
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Tue Mar  3 16:49:07 2009
@@ -1974,6 +1974,10 @@
 {
 	int res;
 
+	if (ast_strlen_zero(filename)) {
+		return 0;
+	}
+
 	ast_stopstream(chan);
 
 	res = ast_streamfile(chan, filename, chan->language);

Modified: trunk/configs/queues.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/trunk/configs/queues.conf.sample?view=diff&rev=180007&r1=180006&r2=180007
==============================================================================
--- trunk/configs/queues.conf.sample (original)
+++ trunk/configs/queues.conf.sample Tue Mar  3 16:49:07 2009
@@ -292,6 +292,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