diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | apps/app_waitforring.c | 9 | ||||
| -rw-r--r-- | apps/app_waitforsilence.c | 9 | ||||
| -rw-r--r-- | main/channel.c | 32 |
4 files changed, 44 insertions, 8 deletions
@@ -733,7 +733,7 @@ samples: adsi echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \ echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \ echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \ - echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated" ; \ + echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is waiting, being recorded, or DTMF is being generated" ; \ echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \ echo ";runuser = asterisk ; The user to run as" ; \ echo ";rungroup = asterisk ; The group to run as" ; \ 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; diff --git a/main/channel.c b/main/channel.c index bb78c76fa..be396f8a1 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1411,21 +1411,39 @@ struct ast_channel *ast_channel_get_by_exten(const char *exten, const char *cont 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 */ |