look for transcoder in proper place based on build against Zaptel or DAHDI

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

diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index 00dd94bb2e8c39022436f7581df5b6717ea2834c..321dac4d7bb75eee25863427ccdd38ad0215ed4d 100644 (file)
--- a/codecs/codec_dahdi.c
+++ b/codecs/codec_dahdi.c
@@ -139,7 +139,7 @@ static int zap_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
                /* 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 @@ static struct ast_frame *zap_frameout(struct ast_trans_pvt *pvt)
                                /* 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 @@ static int zap_translate(struct ast_trans_pvt *pvt, int dest, int source)
        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 @@ static int find_transcoders(void)
        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)