[svn-commits] file: trunk r58390 - in /trunk: ./ main/dsp.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Mar  8 10:09:23 2007
New Revision: 58390

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58390
Log:
Merged revisions 58389 via svnmerge from 
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)

........

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

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

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

Modified: trunk/main/dsp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dsp.c?view=diff&rev=58390&r1=58389&r2=58390
==============================================================================
--- trunk/main/dsp.c (original)
+++ trunk/main/dsp.c Thu Mar  8 10:09:23 2007
@@ -1335,11 +1335,13 @@
 		}
 	}
 #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;
 }