diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-31 01:59:02 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-31 01:59:02 +0000 |
| commit | 3f22aa53af0a7bb3efb280a1adda11f00a7f68fc (patch) | |
| tree | 95a924d57b906428b26d398758facf98b92bdcb2 /res | |
| parent | 0fcb352fba60344329a582f891ddd4433f48c6fa (diff) | |
Merge in VLDTMF support with Zaptel/Core done by the ever great Darumkilla Russell Bryant and the RTP portion done by myself, Muffinlicious Joshua Colp. This has gone through so many discussions/revisions it's not funny but we finally have it!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41507 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_agi.c | 2 | ||||
| -rw-r--r-- | res/res_features.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index a050d1c8d..bf51946f9 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1016,6 +1016,8 @@ static int handle_recordfile(struct ast_channel *chan, AGI *agi, int argc, char break; case AST_FRAME_VIDEO: ast_writestream(fs, f); + default: + /* Ignore all other frames */ break; } ast_frfree(f); diff --git a/res/res_features.c b/res/res_features.c index 10faf0027..aba923fb8 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1439,9 +1439,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast if (aoh && aoh->flag == AST_OPTION_FLAG_REQUEST) ast_channel_setoption(other, ntohs(aoh->option), aoh->data, f->datalen - sizeof(struct ast_option_header), 0); } - } - /* check for '*', if we find it it's time to disconnect */ - if (f->frametype == AST_FRAME_DTMF) { + } else if (f->frametype == AST_FRAME_DTMF_BEGIN) { + /* eat it */ + } else if (f->frametype == AST_FRAME_DTMF) { char *featurecode; int sense; |