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

add silence gen to wait apps

Browse Source 
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/trunk@239712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2010-01-13 16:31:14 +00:00
parent c300b12b18
commit 03529837cc
4 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/app_waitforring.c
View File

@@ -56,6 +56,7 @@ static char *app = "WaitForRing";
static int waitforring_exec(struct ast_channel *chan, const char *data)
{
struct ast_frame *f;
struct ast_silence_generator *silgen = NULL;
int res = 0;
double s;
int ms;
@@ -65,6 +66,10 @@ static int waitforring_exec(struct ast_channel *chan, const char *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);
@@ -109,6 +114,10 @@ static int waitforring_exec(struct ast_channel *chan, const char *data)
}
}
if (silgen) {
ast_channel_stop_silence_generator(chan, silgen);
}
return res;
}

9
apps/app_waitforsilence.c
View File

@@ -209,6 +209,7 @@ static int waitfor_exec(struct ast_channel *chan, const char *data, int wait_for
int timeout = 0;
int iterations = 1, i;
time_t waitstart;
struct ast_silence_generator *silgen = NULL;
if (chan->_state != AST_STATE_UP) {
res = ast_answer(chan); /* Answer the channel */
@@ -222,11 +223,19 @@ static int waitfor_exec(struct ast_channel *chan, const char *data, int wait_for
ast_verb(3, "Waiting %d time(s) for %d ms silence with %d timeout\n", iterations, timereqd, 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, timereqd, waitstart, timeout, wait_for_silence);
}
if (silgen) {
ast_channel_stop_silence_generator(chan, silgen);
}
if (res > 0)
res = 0;
return res;