[asterisk-commits] seanbright: branch 1.6.0 r206637 - in /branches/1.6.0: ./ codecs/codec_dahdi.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Jul 15 11:02:04 2009
New Revision: 206637

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206637
Log:
Merged revisions 206636 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r206636 | seanbright | 2009-07-15 12:00:24 -0400 (Wed, 15 Jul 2009) | 9 lines
  
  Merged revisions 206635 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r206635 | seanbright | 2009-07-15 11:57:51 -0400 (Wed, 15 Jul 2009) | 1 line
    
    Only print debug info in codec_dahdi if we are asking for it.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/codecs/codec_dahdi.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/codecs/codec_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/codecs/codec_dahdi.c?view=diff&rev=206637&r1=206636&r2=206637
==============================================================================
--- branches/1.6.0/codecs/codec_dahdi.c (original)
+++ branches/1.6.0/codecs/codec_dahdi.c Wed Jul 15 11:02:04 2009
@@ -394,7 +394,7 @@
 	dahdip->fmts.srcfmt = (1 << source);
 	dahdip->fmts.dstfmt = (1 << dest);
 
-	ast_log(LOG_DEBUG, "Opening transcoder channel from %d to %d.\n", source, dest);
+	ast_debug(1, "Opening transcoder channel from %d to %d.\n", source, dest);
 
 retry:
 	if (ioctl(fd, DAHDI_TC_ALLOCATE, &dahdip->fmts)) {
@@ -408,11 +408,11 @@
 			 * we'll just convert from ulaw to signed linear in
 			 * software. */
 			if (AST_FORMAT_SLINEAR == dahdip->fmts.srcfmt) {
-				ast_log(LOG_DEBUG, "Using soft_slin support on source\n");
+				ast_debug(1, "Using soft_slin support on source\n");
 				dahdip->softslin = 1;
 				dahdip->fmts.srcfmt = AST_FORMAT_ULAW;
 			} else if (AST_FORMAT_SLINEAR == dahdip->fmts.dstfmt) {
-				ast_log(LOG_DEBUG, "Using soft_slin support on destination\n");
+				ast_debug(1, "Using soft_slin support on destination\n");
 				dahdip->softslin = 1;
 				dahdip->fmts.dstfmt = AST_FORMAT_ULAW;
 			}