Merged revisions 58389 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 8 Mar 2007 16:09:23 +0000 (16:09 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 8 Mar 2007 16:09:23 +0000 (16:09 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r58389 | file | 2007-03-08 11:07:10 -0500 (Thu, 08 Mar 2007) | 10 lines

Merged revisions 58388 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r58388 | file | 2007-03-08 11:04:58 -0500 (Thu, 08 Mar 2007) | 2 lines

Only print out debug message if the definition that makes the variables shows up was actually defined. (issue #9233 reported by serginuez)

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58390 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/dsp.c

index 6432909..e89b726 100644 (file)
@@ -1335,12 +1335,14 @@ int ast_dsp_busydetect(struct ast_dsp *dsp)
                }
        }
 #endif
+#ifndef BUSYDETECT_TONEONLY
 #if 1
        if (res) {
                if (option_debug)
                        ast_log(LOG_DEBUG, "ast_dsp_busydetect detected busy, avgtone: %d, avgsilence %d\n", avgtone, avgsilence);
        }
 #endif
+#endif
        return res;
 }
 #endif