automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36724 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/dsp.c b/dsp.c
index e204f53603c210bd3b2c70d9f9c811e72b65c660..f23f45b6a9abee69e50090a41e47ecfbc57c6c61 100644 (file)
--- 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);