[asterisk-commits] russell: trunk r317430 - in /trunk: ./ main/dsp.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu May  5 17:12:10 2011
New Revision: 317430

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317430
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/main/dsp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dsp.c?view=diff&rev=317430&r1=317429&r2=317430
==============================================================================
--- trunk/main/dsp.c (original)
+++ trunk/main/dsp.c Thu May  5 17:12:10 2011
@@ -1595,6 +1595,9 @@
 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)