diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-19 19:48:00 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-19 19:48:00 +0000 |
| commit | f2eeca3bed9fef3110ee1946504e3b382341d7fc (patch) | |
| tree | f32d0af75adb1ba287d025ed312df096422a910a /codecs | |
| parent | a78774210ab8a62f2f675688748a02a227f67aef (diff) | |
(closes issue #13480)
Reported by: tzafrir
Replace a bunch of if defined checks for Zaptel/DAHDI through several new defines in dahdi_compat.h. This removes a lot of code duplication. Example from bug:
#ifdef HAVE_ZAPTEL
fd = open("/dev/zap/pseudo", O_RDWR);
#else
fd = open("/dev/dahdi/pseudo", O_RDWR);
#endif
is replaced with:
fd = open(DAHDI_FILE_PSEUDO, O_RDRW);
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@165991 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/codec_dahdi.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index a68b3dcab..347fc8012 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -230,17 +230,10 @@ 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)); + if ((fd = open(DAHDI_FILE_TRANSCODE, O_RDWR)) < 0) { + ast_log(LOG_ERROR, "Failed to open " DAHDI_FILE_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); @@ -422,17 +415,10 @@ 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)); + if ((fd = open(DAHDI_FILE_TRANSCODE, O_RDWR)) < 0) { + ast_log(LOG_ERROR, "Failed to open " DAHDI_FILE_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) |