Merged revisions 239712 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r239712 | dvossel | 2010-01-13 10:31:14 -0600 (Wed, 13 Jan 2010) | 24 lines
  
  add silence gen to wait apps
  
  asterisk.conf's 'transmit_silence' option existed before
  this patch, but was limited to only generating silence
  while recording and sending DTMF.  Now enabling the
  transmit_silence option generates silence during wait
  times as well.
  
  To achieve this, ast_safe_sleep has been modified to
  generate silence anytime no other generators are present
  and transmit_silence is enabled.  Wait apps not using
  ast_safe_sleep now generate silence when transmit_silence
  is enabled as well.
  
  (closes issue #16524)
  Reported by: kobaz
  
  (closes issue #16523)
  Reported by: kobaz
  Tested by: dvossel
  
  Review: https://reviewboard.asterisk.org/r/456/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@239714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2010-01-13 16:38:31 +00:00
parent 782a0923af
commit db7380ffcd
4 changed files with 44 additions and 8 deletions

View File

@@ -48,6 +48,7 @@ static char *app = "WaitForRing";
static int waitforring_exec(struct ast_channel *chan, void *data)
{
struct ast_frame *f;
struct ast_silence_generator *silgen = NULL;
int res = 0;
double s;
int ms;
@@ -57,6 +58,10 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
return 0;
}
if (ast_opt_transmit_silence) {
silgen = ast_channel_start_silence_generator(chan);
}
ms = s * 1000.0;
while (ms > 0) {
ms = ast_waitfor(chan, ms);
@@ -101,6 +106,10 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
}
}
if (silgen) {
ast_channel_stop_silence_generator(chan, silgen);
}
return res;
}