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: http://svn.digium.com/svn/asterisk/branches/1.6.1@239714 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 25 insertions, 7 deletions

diff --git a/main/channel.c b/main/channel.c
index 33b1dcd30..e66b6e045 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1304,21 +1304,39 @@ struct ast_channel *ast_walk_channel_by_exten_locked(const struct ast_channel *c
 int ast_safe_sleep_conditional(struct ast_channel *chan, int ms, int (*cond)(void*), void *data)
 {
 	struct ast_frame *f;
+	struct ast_silence_generator *silgen = NULL;
+	int res = 0;
+
+	/* If no other generator is present, start silencegen while waiting */
+	if (ast_opt_transmit_silence && !chan->generatordata) {
+		silgen = ast_channel_start_silence_generator(chan);
+	}
 
 	while (ms > 0) {
-		if (cond && ((*cond)(data) == 0))
-			return 0;
+		if (cond && ((*cond)(data) == 0)) {
+			break;
+		}
 		ms = ast_waitfor(chan, ms);
-		if (ms < 0)
-			return -1;
+		if (ms < 0) {
+			res = -1;
+			break;
+		}
 		if (ms > 0) {
 			f = ast_read(chan);
-			if (!f)
-				return -1;
+			if (!f) {
+				res = -1;
+				break;
+			}
 			ast_frfree(f);
 		}
 	}
-	return 0;
+
+	/* stop silgen if present */
+	if (silgen) {
+		ast_channel_stop_silence_generator(chan, silgen);
+	}
+
+	return res;
 }
 
 /*! \brief Wait, look for hangups */