aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-09 17:30:13 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-09 17:30:13 +0000
commitbf8028a2c8013348216ed1a1426a3fd8fab01398 (patch)
tree3cca775820477c7aeb363dec5b2bae37345cd201 /codecs
parent52031edff5c1279f1fe864421cc1bbf6e871dbd9 (diff)
Merged revisions 97491 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@97495 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/codec_zap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c
index b5b99d29a..ee7214613 100644
--- a/codecs/codec_zap.c
+++ b/codecs/codec_zap.c
@@ -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)