[svn-commits] trunk r36698 - in /trunk: ./ dsp.c

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Jul  2 22:24:58 2006
New Revision: 36698

URL: http://svn.digium.com/view/asterisk?rev=36698&view=rev
Log:
Merged revisions 36697 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r36697 | russell | 2006-07-02 23:23:36 -0400 (Sun, 02 Jul 2006) | 2 lines

fix the build with BUSYDETECT_TONEONLY defined (issue #7414)

........

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

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

Modified: trunk/dsp.c
URL: http://svn.digium.com/view/asterisk/trunk/dsp.c?rev=36698&r1=36697&r2=36698&view=diff
==============================================================================
--- trunk/dsp.c (original)
+++ trunk/dsp.c Sun Jul  2 22:24:58 2006
@@ -1322,6 +1322,7 @@
 			res = 0;
 		}
 	}
+#ifndef BUSYDETECT_TONEONLY
 	/* If we know the expected busy tone silent-period length, check we are in the range */
 	if (res && (dsp->busy_quietlength > 0)) {
 		if (abs(avgsilence - dsp->busy_quietlength) > (dsp->busy_quietlength*BUSY_PAT_PERCENT/100)) {
@@ -1332,6 +1333,7 @@
 			res = 0;
 		}
 	}
+#endif
 #if 1
 	if (res)
 		ast_log(LOG_DEBUG, "ast_dsp_busydetect detected busy, avgtone: %d, avgsilence %d\n", avgtone, avgsilence);