diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-18 23:58:38 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-18 23:58:38 +0000 |
| commit | d70a72d688c2121c69c03f80fdc8238e43f35127 (patch) | |
| tree | c1d47e0566e72dde7e0df7737987440f02c048e2 /main | |
| parent | d9d1ed38227d0646eed979a8f12139ae517e5b5f (diff) | |
Merged revisions 103801 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r103801 | file | 2008-02-18 19:56:48 -0400 (Mon, 18 Feb 2008) | 10 lines
Ensure that emulated DTMFs do not get interrupted by another begin frame.
(closes issue #11740)
Reported by: gserra
Patches:
v1-11740.patch uploaded by dimas (license 88)
(closes issue #11955)
Reported by: tsearle
(closes issue #10530)
Reported by: xmarksthespot
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@103802 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 197cf1e71..830775fd8 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2524,7 +2524,7 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio) case AST_FRAME_DTMF_BEGIN: send_dtmf_event(chan, "Received", f->subclass, "Yes", "No"); ast_log(LOG_DTMF, "DTMF begin '%c' received on %s\n", f->subclass, chan->name); - if ( ast_test_flag(chan, AST_FLAG_DEFER_DTMF | AST_FLAG_END_DTMF_ONLY) || + if ( ast_test_flag(chan, AST_FLAG_DEFER_DTMF | AST_FLAG_END_DTMF_ONLY | AST_FLAG_EMULATE_DTMF) || (!ast_tvzero(chan->dtmf_tv) && ast_tvdiff_ms(ast_tvnow(), chan->dtmf_tv) < AST_MIN_DTMF_GAP) ) { ast_log(LOG_DTMF, "DTMF begin ignored '%c' on %s\n", f->subclass, chan->name); |