diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-25 14:39:45 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-25 14:39:45 +0000 |
| commit | 3eb4aac76561fe4d339ae3573604258a95ce7b6f (patch) | |
| tree | f1c72f2cd199b4bd266e68ecd3ae411a7f034771 /main | |
| parent | 0414aded37f0f89bb38aa36de693de72eeb2a417 (diff) | |
Merged revisions 110628 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r110628 | file | 2008-03-25 11:37:35 -0300 (Tue, 25 Mar 2008) | 4 lines
Add an option (transmit_silence) which transmits silence during both Record() and DTMF generation. The reason this is an option is that in order to transmit silence we have to setup a translation path. This may not be needed/wanted in all cases.
(closes issue #10058)
Reported by: tracinet
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@110629 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/app.c | 9 | ||||
| -rw-r--r-- | main/asterisk.c | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/main/app.c b/main/app.c index 7a2227fb9..ee72d1078 100644 --- a/main/app.c +++ b/main/app.c @@ -244,6 +244,7 @@ int ast_dtmf_stream(struct ast_channel *chan, struct ast_channel *peer, const ch { const char *ptr; int res = 0; + struct ast_silence_generator *silgen = NULL; if (!between) between = 100; @@ -258,6 +259,10 @@ int ast_dtmf_stream(struct ast_channel *chan, struct ast_channel *peer, const ch if (res < 0) return res; + if (ast_opt_transmit_silence) { + silgen = ast_channel_start_silence_generator(chan); + } + for (ptr = digits; *ptr; ptr++) { if (*ptr == 'w') { /* 'w' -- wait half a second */ @@ -284,6 +289,10 @@ int ast_dtmf_stream(struct ast_channel *chan, struct ast_channel *peer, const ch res = -1; } + if (silgen) { + ast_channel_stop_silence_generator(chan, silgen); + } + return res; } diff --git a/main/asterisk.c b/main/asterisk.c index 9ad011b49..aac00c9b2 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2633,8 +2633,8 @@ static void ast_readconfig(void) /* Build transcode paths via SLINEAR, instead of directly */ } else if (!strcasecmp(v->name, "transcode_via_sln")) { ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_TRANSCODE_VIA_SLIN); - /* Transmit SLINEAR silence while a channel is being recorded */ - } else if (!strcasecmp(v->name, "transmit_silence_during_record")) { + /* Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated on a channel */ + } else if (!strcasecmp(v->name, "transmit_silence_during_record") || !strcasecmp(v->name, "transmit_silence")) { ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_TRANSMIT_SILENCE); /* Enable internal timing */ } else if (!strcasecmp(v->name, "internal_timing")) { |