diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-13 16:31:14 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-13 16:31:14 +0000 |
| commit | e49e9326db2236bf9cf98b3698d2eeac1f16f3fb (patch) | |
| tree | 35ef3538d59fe02244a0291b264467b17cd88e91 /apps | |
| parent | c36ddcfa8a8ff8094902a5ac57f93a770edf9c3a (diff) | |
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/trunk@239712 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_waitforring.c | 9 | ||||
| -rw-r--r-- | apps/app_waitforsilence.c | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c index 1df60795f..7ddc9db12 100644 --- a/apps/app_waitforring.c +++ b/apps/app_waitforring.c @@ -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; } diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c index 25e3d071a..fb76f9134 100644 --- a/apps/app_waitforsilence.c +++ b/apps/app_waitforsilence.c @@ -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; |