Merged revisions 63698 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 9 May 2007 19:24:27 +0000 (19:24 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 9 May 2007 19:24:27 +0000 (19:24 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63698 | file | 2007-05-09 15:22:39 -0400 (Wed, 09 May 2007) | 2 lines

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/trunk@63699 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

index 17b85a2..dd3a5c7 100644 (file)
@@ -2292,6 +2292,8 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                                struct timeval now = ast_tvnow();
                                if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
                                        chan->emulate_dtmf_duration = 0;
                                struct timeval now = ast_tvnow();
                                if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
                                        chan->emulate_dtmf_duration = 0;
+                                       ast_frfree(f);
+                                       f = &chan->dtmff;
                                        f->frametype = AST_FRAME_DTMF_END;
                                        f->subclass = chan->emulate_dtmf_digit;
                                        f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
                                        f->frametype = AST_FRAME_DTMF_END;
                                        f->subclass = chan->emulate_dtmf_digit;
                                        f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
@@ -2318,6 +2320,8 @@ static struct ast_frame *__ast_read(struct ast_channel *chan, int dropaudio)
                                struct timeval now = ast_tvnow();
                                if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
                                        chan->emulate_dtmf_duration = 0;
                                struct timeval now = ast_tvnow();
                                if (ast_tvdiff_ms(now, chan->dtmf_tv) >= chan->emulate_dtmf_duration) {
                                        chan->emulate_dtmf_duration = 0;
+                                       ast_frfree(f);
+                                       f = &chan->dtmff;
                                        f->frametype = AST_FRAME_DTMF_END;
                                        f->subclass = chan->emulate_dtmf_digit;
                                        f->len = ast_tvdiff_ms(now, chan->dtmf_tv);
                                        f->frametype = AST_FRAME_DTMF_END;
                                        f->subclass = chan->emulate_dtmf_digit;
                                        f->len = ast_tvdiff_ms(now, chan->dtmf_tv);