automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@36724 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 0 deletions

diff --git a/dsp.c b/dsp.c
index e204f5360..f23f45b6a 100644
--- a/dsp.c
+++ b/dsp.c
@@ -1279,6 +1279,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)) {
@@ -1289,6 +1290,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);