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)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36698 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 0 deletions

diff --git a/dsp.c b/dsp.c
index dfa6b1e3d..7e62c8bf7 100644
--- a/dsp.c
+++ b/dsp.c
@@ -1322,6 +1322,7 @@ int ast_dsp_busydetect(struct ast_dsp *dsp)
 			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 @@ int ast_dsp_busydetect(struct ast_dsp *dsp)
 			res = 0;
 		}
 	}
+#endif
 #if 1
 	if (res)
 		ast_log(LOG_DEBUG, "ast_dsp_busydetect detected busy, avgtone: %d, avgsilence %d\n", avgtone, avgsilence);