Merged revisions 317429 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317429 | russell | 2011-05-05 17:11:19 -0500 (Thu, 05 May 2011) | 5 lines

  Only display inband DTMF warning if inband DTMF detection is enabled.

  (closes issue #18901)
  Reported by: irroot
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317430 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/dsp.c b/main/dsp.c
index 3ea61fe..03e429f 100644 (file)
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -1595,6 +1595,9 @@ struct ast_dsp *ast_dsp_new_with_rate(unsigned int sample_rate)
 void ast_dsp_set_features(struct ast_dsp *dsp, int features)
 {
        dsp->features = features;
+       if (!(features & DSP_FEATURE_DIGIT_DETECT)) {
+               dsp->display_inband_dtmf_warning = 0;
+       }
 }
 
 void ast_dsp_free(struct ast_dsp *dsp)