diff options
| author | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 15:57:05 +0000 |
|---|---|---|
| committer | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 15:57:05 +0000 |
| commit | bc53f606a8d4359e7742f8e29f34f8183bca88b3 (patch) | |
| tree | 51082f7a6d362c260dce10ea29e965bab423a98c /main/dsp.c | |
| parent | 96c698f26f428d534c35fe5b4d88941c173dea48 (diff) | |
Merged revisions 233046 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r233046 | mnick | 2009-12-04 09:38:33 -0600 (Fri, 04 Dec 2009) | 17 lines
Merged revisions 233014 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r233014 | mnick | 2009-12-04 09:17:03 -0600 (Fri, 04 Dec 2009) | 11 lines
Warning message gets displayed only once
Added additional field 'int display_inband_dtmf_warning', which when set to '1' displays the warning ('Inband DTMF is not supported on codec %s. Use RFC2833'), and when set to '0' doesn't display the warning. Otherwise you would get hundreds of warnings every second.
(closes issue #15769)
Reported by: falves11
Patches:
patch_15769_14.txt uploaded by mnick (license 874)
Tested by: mnick, falves11
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@233049 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/dsp.c')
| -rw-r--r-- | main/dsp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/dsp.c b/main/dsp.c index 1ddfe967f..8c4a61d21 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -392,6 +392,7 @@ struct ast_dsp { int digitmode; int faxmode; int dtmf_began; + int display_inband_dtmf_warning; float genergy; int mute_fragments; fragment_t mute_data[5]; @@ -1341,7 +1342,10 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, } break; default: - ast_log(LOG_WARNING, "Inband DTMF is not supported on codec %s. Use RFC2833\n", ast_getformatname(af->subclass)); + /*Display warning only once. Otherwise you would get hundreds of warnings every second */ + if (dsp->display_inband_dtmf_warning) + ast_log(LOG_WARNING, "Inband DTMF is not supported on codec %s. Use RFC2833\n", ast_getformatname(af->subclass)); + dsp->display_inband_dtmf_warning = 0; return af; } @@ -1514,6 +1518,7 @@ struct ast_dsp *ast_dsp_new(void) dsp->faxmode = DSP_FAXMODE_DETECT_CNG; /* Initialize digit detector */ ast_digit_detect_init(&dsp->digit_state, dsp->digitmode & DSP_DIGITMODE_MF); + dsp->display_inband_dtmf_warning = 1; /* Initialize initial DSP progress detect parameters */ ast_dsp_prog_reset(dsp); /* Initialize fax detector */ |