[svn-commits] mnick: branch 1.6.0 r233047 - in /branches/1.6.0: ./ main/dsp.c

[SVN commits to the Digium repositories]

Author: mnick
Date: Fri Dec  4 09:46:46 2009
New Revision: 233047

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/dsp.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/dsp.c?view=diff&rev=233047&r1=233046&r2=233047
==============================================================================
--- branches/1.6.0/main/dsp.c (original)
+++ branches/1.6.0/main/dsp.c Fri Dec  4 09:46:46 2009
@@ -342,6 +342,7 @@
 	int digitmode;
 	int faxmode;
 	int thinkdigit;
+	int display_inband_dtmf_warning;
 	float genergy;
 	digit_detect_state_t digit_state;
 	tone_detect_state_t cng_tone_state;
@@ -1233,7 +1234,10 @@
 			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;
 	}
 	silence = __ast_dsp_silence(dsp, shortdata, len, NULL);
@@ -1388,6 +1392,7 @@
 		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 */