Merged revisions 97491 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 9 Jan 2008 17:30:13 +0000 (17:30 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 9 Jan 2008 17:30:13 +0000 (17:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r97491 | kpfleming | 2008-01-09 11:21:14 -0600 (Wed, 09 Jan 2008) | 2 lines

report the same message whether Zaptel does not have transcoder support loaded or no transcoders were found

........

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

codecs/codec_zap.c

index b5b99d2..ee72146 100644 (file)
@@ -421,16 +421,18 @@ static int find_transcoders(void)
        int fd, res;
        unsigned int x, y;
 
-       info.op = ZT_TCOP_GETINFO;
        if ((fd = open("/dev/zap/transcode", O_RDWR)) < 0) {
-               ast_debug(1, "No Zaptel transcoder support!\n");
+               ast_verbose(VERBOSE_PREFIX_2 "No hardware transcoders found.\n");
                return 0;
        }
+
+       info.op = ZT_TCOP_GETINFO;
        for (info.tcnum = 0; !(res = ioctl(fd, ZT_TRANSCODE_OP, &info)); info.tcnum++) {
                ast_verb(2, "Found transcoder '%s'.\n", info.name);
                build_translators(&map, info.dstfmts, info.srcfmts);
                ast_atomic_fetchadd_int(&channels.total, info.numchannels / 2);
        }
+
        close(fd);
 
        if (!info.tcnum)