diff options
| author | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 15:51:48 +0000 |
|---|---|---|
| committer | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 15:51:48 +0000 |
| commit | bf382353161a5d0ae7677ba3d471e966d75cf628 (patch) | |
| tree | f0b5f0fdaa04dc58a647da80c0ff57f7da6a381f | |
| parent | 963aafc51ef4b2802db1d279aa8ec5580bfc743f (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.1@233048 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 b35238280..eaa5c66c3 100644 --- a/main/dsp.c +++ b/main/dsp.c @@ -389,6 +389,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]; @@ -1300,7 +1301,10 @@ struct ast_frame *ast_dsp_process(struct ast_channel *chan, struct ast_dsp *dsp, shortdata[x] = AST_ALAW(odata[x]); 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; } @@ -1465,6 +1469,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 */ |