[svn-commits] mnick: trunk r233046 - in /trunk: ./ main/dsp.c

[SVN commits to the Digium repositories]

Author: mnick
Date: Fri Dec  4 09:38:33 2009
New Revision: 233046

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=233046
Log:
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:
    trunk/   (props changed)
    trunk/main/dsp.c

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

Modified: trunk/main/dsp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dsp.c?view=diff&rev=233046&r1=233045&r2=233046
==============================================================================
--- trunk/main/dsp.c (original)
+++ trunk/main/dsp.c Fri Dec  4 09:38:33 2009
@@ -385,6 +385,7 @@
 	int digitmode;
 	int faxmode;
 	int dtmf_began;
+	int display_inband_dtmf_warning;
 	float genergy;
 	int mute_fragments;
 	fragment_t mute_data[5];
@@ -1334,7 +1335,10 @@
 		}
 		break;
 	default:
-		ast_log(LOG_WARNING, "Inband DTMF is not supported on codec %s. Use RFC2833\n", ast_getformatname(af->subclass.codec));
+		/*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.codec));
+		dsp->display_inband_dtmf_warning = 0;
 		return af;
 	}
 
@@ -1504,6 +1508,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 */