diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 22:49:32 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 22:49:32 +0000 |
| commit | a6059a815b240ac476ba8aff43afc0e6ef926646 (patch) | |
| tree | c56e32c6fd11d4cf23d7d7c10541b50649b32181 | |
| parent | 67512d848fd4e9da4de38808a82c10c4f917c63e (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@180008 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_queue.c | 4 | ||||
| -rw-r--r-- | configs/queues.conf.sample | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 24fe45afa..89221459f 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1788,6 +1788,10 @@ static int play_file(struct ast_channel *chan, const char *filename) { int res; + if (ast_strlen_zero(filename)) { + return 0; + } + ast_stopstream(chan); res = ast_streamfile(chan, filename, chan->language); diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample index 7a7cddd30..e15110bad 100644 --- a/configs/queues.conf.sample +++ b/configs/queues.conf.sample @@ -232,6 +232,13 @@ shared_lastcall=no ; 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") |