[svn-commits] mmichelson: branch 1.4 r180006 - in /branches/1.4: apps/ configs/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Mar  3 16:48:18 2009
New Revision: 180006

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180006
Log:
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.4/apps/app_queue.c
    branches/1.4/configs/queues.conf.sample

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

Modified: branches/1.4/configs/queues.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/configs/queues.conf.sample?view=diff&rev=180006&r1=180005&r2=180006
==============================================================================
--- branches/1.4/configs/queues.conf.sample (original)
+++ branches/1.4/configs/queues.conf.sample Tue Mar  3 16:48:18 2009
@@ -155,6 +155,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