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 0016524)
Reported by: kobaz

(closes issue 0016523)
Reported by: kobaz
Tested by: dvossel
  
Review: https://reviewboard.asterisk.org/r/456/


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@239718 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 17 insertions, 0 deletions

diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index c4cea20e8..a136701d5 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -57,6 +57,7 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
 {
 	struct ast_module_user *u;
 	struct ast_frame *f;
+	struct ast_silence_generator *silgen = NULL;
 	int res = 0;
 	int ms;
 
@@ -67,6 +68,10 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
 
 	u = ast_module_user_add(chan);
 
+	if (ast_opt_transmit_silence) {
+		silgen = ast_channel_start_silence_generator(chan);
+	}
+
 	ms *= 1000;
 	while(ms > 0) {
 		ms = ast_waitfor(chan, ms);
@@ -114,6 +119,10 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
 	}
 	ast_module_user_remove(u);
 
+	if (silgen) {
+		ast_channel_stop_silence_generator(chan, silgen);
+	}
+
 	return res;
 }
 
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index d0e02e062..a60ec6ada 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -164,6 +164,7 @@ static int waitforsilence_exec(struct ast_channel *chan, void *data)
 	int timeout = 0;
 	int iterations = 1, i;
 	time_t waitstart;
+	struct ast_silence_generator *silgen = NULL;
 
 	res = ast_answer(chan); /* Answer the channel */
 
@@ -176,11 +177,18 @@ static int waitforsilence_exec(struct ast_channel *chan, void *data)
 	if (option_verbose > 2)
 		ast_verbose(VERBOSE_PREFIX_3 "Waiting %d time(s) for %d ms silence with %d timeout\n", iterations, silencereqd, timeout);
 
+	if (ast_opt_transmit_silence) {
+		silgen = ast_channel_start_silence_generator(chan);
+	}
 	time(&waitstart);
 	res = 1;
 	for (i=0; (i<iterations) && (res == 1); i++) {
 		res = do_waiting(chan, silencereqd, waitstart, timeout);
 	}
+	if (silgen) {
+		ast_channel_stop_silence_generator(chan, silgen);
+	}
+
 	if (res > 0)
 		res = 0;
 	return res;