kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 180007 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-03-03 22:49:32 +00:00
parent 6767bd053d
commit d24e3e05bc
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_queue.c
View File

@@ -1788,6 +1788,10 @@ static int play_file(struct ast_channel *chan, const char *filename)
{ {
int res; int res;
if (ast_strlen_zero(filename)) {
return 0;
}
ast_stopstream(chan); ast_stopstream(chan);
res = ast_streamfile(chan, filename, chan->language); res = ast_streamfile(chan, filename, chan->language);

7
configs/queues.conf.sample
View File

@@ -231,6 +231,13 @@ shared_lastcall=no
; ;
; Use these sound files in making position/holdtime announcements. The ; Use these sound files in making position/holdtime announcements. The
; defaults are as listed below -- change only if you need to. ; 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.") ; ("You are now first in line.")
;queue-youarenext = queue-youarenext ;queue-youarenext = queue-youarenext