From: Sean Bright <sean@malleable.com>
Date: Wed, 15 Jul 2009 16:03:42 +0000 (+0000)
Subject: Merged revisions 206636 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9721392623b1a9171e15a43a3f67a86aa0b5f2f;p=thirdparty%2Fasterisk.git

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.
  ........
................


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

diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index ddb6c1a8d3..2f1bc31803 100644
--- a/codecs/codec_dahdi.c
+++ b/codecs/codec_dahdi.c
@@ -398,7 +398,7 @@ static int dahdi_translate(struct ast_trans_pvt *pvt, int dest, int source)
 	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)) {
@@ -412,11 +412,11 @@ retry:
 			 * 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;
 			}