[asterisk-commits] kpfleming: branch 1.4 r138663 - /branches/1.4/codecs/codec_dahdi.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Aug 18 11:57:27 2008
New Revision: 138663

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138663
Log:
look for transcoder in proper place based on build against Zaptel or DAHDI

Modified:
    branches/1.4/codecs/codec_dahdi.c

Modified: branches/1.4/codecs/codec_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/codecs/codec_dahdi.c?view=diff&rev=138663&r1=138662&r2=138663
==============================================================================
--- branches/1.4/codecs/codec_dahdi.c (original)
+++ branches/1.4/codecs/codec_dahdi.c Mon Aug 18 11:57:27 2008
@@ -139,7 +139,7 @@
 		/* Give the frame to the hardware transcoder... */
 		res = write(ztp->fd, f->data, f->datalen); 
 		if (-1 == res) {
-			ast_log(LOG_ERROR, "Failed to write to /dev/dahdi/transcode: %s\n", strerror(errno));
+			ast_log(LOG_ERROR, "Failed to write to transcoder: %s\n", strerror(errno));
 		}
 		if (f->datalen != res) {
 			ast_log(LOG_ERROR, "Requested write of %d bytes, but only wrote %d bytes.\n", f->datalen, res);
@@ -168,7 +168,7 @@
 				/* Nothing waiting... */
 				return NULL;
 			} else {
-				ast_log(LOG_ERROR, "Failed to read from /dev/dahdi/transcode: %s\n", strerror(errno));
+				ast_log(LOG_ERROR, "Failed to read from transcoder: %s\n", strerror(errno));
 				return NULL;
 			}
 		} else {
@@ -234,10 +234,17 @@
 	struct pvt *ztp = pvt->pvt;
 	int flags;
 	
+#ifdef HAVE_ZAPTEL
+	if ((fd = open("/dev/zap/transcode", O_RDWR)) < 0) {
+		ast_log(LOG_ERROR, "Failed to open /dev/zap/transcode: %s\n", strerror(errno));
+		return -1;
+	}
+#else
 	if ((fd = open("/dev/dahdi/transcode", O_RDWR)) < 0) {
 		ast_log(LOG_ERROR, "Failed to open /dev/dahdi/transcode: %s\n", strerror(errno));
 		return -1;
 	}
+#endif
 	
 	ztp->fmts.srcfmt = (1 << source);
 	ztp->fmts.dstfmt = (1 << dest);
@@ -405,10 +412,17 @@
 	int fd, res;
 	unsigned int x, y;
 
+#ifdef HAVE_ZAPTEL
+	if ((fd = open("/dev/zap/transcode", O_RDWR)) < 0) {
+		ast_log(LOG_ERROR, "Failed to open /dev/zap/transcode: %s\n", strerror(errno));
+		return 0;
+	}
+#else
 	if ((fd = open("/dev/dahdi/transcode", O_RDWR)) < 0) {
 		ast_log(LOG_ERROR, "Failed to open /dev/dahdi/transcode: %s\n", strerror(errno));
 		return 0;
 	}
+#endif
 
 	for (info.tcnum = 0; !(res = ioctl(fd, DAHDI_TC_GETINFO, &info)); info.tcnum++) {
 		if (option_verbose > 1)