[svn-commits] file: branch 1.4 r58389 - in /branches/1.4: ./ main/dsp.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Mar  8 10:07:10 2007
New Revision: 58389

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58389
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/main/dsp.c

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

Modified: branches/1.4/main/dsp.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/dsp.c?view=diff&rev=58389&r1=58388&r2=58389
==============================================================================
--- branches/1.4/main/dsp.c (original)
+++ branches/1.4/main/dsp.c Thu Mar  8 10:07:10 2007
@@ -1334,9 +1334,11 @@
 		}
 	}
 #endif
+#ifndef BUSYDETECT_TONEONLY
 #if 1
 	if (res)
 		ast_log(LOG_DEBUG, "ast_dsp_busydetect detected busy, avgtone: %d, avgsilence %d\n", avgtone, avgsilence);
+#endif
 #endif
 	return res;
 }