mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-25 07:01:09 +00:00
Use the DTMF frame on the channel when returning a DTMF frame from AST_FRAME_NULL or AST_FRAME_VOICE.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@63698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2332,6 +2332,8 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
|
|||||||
struct timeval now = ast_tvnow();
|
struct timeval now = ast_tvnow();
|
||||||
if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
|
if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
|
||||||
chan->emulate_dtmf_duration = 0;
|
chan->emulate_dtmf_duration = 0;
|
||||||
|
ast_frfree(f);
|
||||||
|
f = &chan->dtmff;
|
||||||
f->frametype = AST_FRAME_DTMF_END;
|
f->frametype = AST_FRAME_DTMF_END;
|
||||||
f->subclass = chan->emulate_dtmf_digit;
|
f->subclass = chan->emulate_dtmf_digit;
|
||||||
f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
|
f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
|
||||||
@@ -2358,6 +2360,8 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
|
|||||||
struct timeval now = ast_tvnow();
|
struct timeval now = ast_tvnow();
|
||||||
if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
|
if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
|
||||||
chan->emulate_dtmf_duration = 0;
|
chan->emulate_dtmf_duration = 0;
|
||||||
|
ast_frfree(f);
|
||||||
|
f = &chan->dtmff;
|
||||||
f->frametype = AST_FRAME_DTMF_END;
|
f->frametype = AST_FRAME_DTMF_END;
|
||||||
f->subclass = chan->emulate_dtmf_digit;
|
f->subclass = chan->emulate_dtmf_digit;
|
||||||
f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
|
f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
|
||||||
|
Reference in New Issue
Block a user