diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-17 18:08:09 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-17 18:08:09 +0000 |
| commit | 2f30a3a6e7ae5721ed086155a63f22c33c495382 (patch) | |
| tree | f7eb76f243ca169acc08d6d90b25b1c191e421e3 /res | |
| parent | 2ee27fd87f55632e832d749c5fe6739a68aeb913 (diff) | |
Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123332 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index f24d3ed27..79f9de8f7 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -27,7 +27,7 @@ /*** MODULEINFO <conflict>win32</conflict> - <use>zaptel</use> + <use>dahdi</use> ***/ #include "asterisk.h" @@ -46,7 +46,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <thread.h> #endif -#include "asterisk/zapata.h" +#include "asterisk/dahdi.h" #include "asterisk/lock.h" #include "asterisk/file.h" @@ -997,7 +997,7 @@ static int moh_diff(struct mohclass *old, struct mohclass *new) static int moh_register(struct mohclass *moh, int reload) { -#ifdef HAVE_ZAPTEL +#ifdef HAVE_DAHDI int x; #endif struct mohclass *mohclass = NULL; @@ -1041,15 +1041,15 @@ static int moh_register(struct mohclass *moh, int reload) ast_set_flag(moh, MOH_QUIET); moh->srcfd = -1; -#ifdef HAVE_ZAPTEL - /* Open /dev/zap/pseudo for timing... Is +#ifdef HAVE_DAHDI + /* Open /dev/dahdi/pseudo for timing... Is there a better, yet reliable way to do this? */ - moh->pseudofd = open("/dev/zap/pseudo", O_RDONLY); + moh->pseudofd = open("/dev/dahdi/pseudo", O_RDONLY); if (moh->pseudofd < 0) { ast_log(LOG_WARNING, "Unable to open pseudo channel for timing... Sound may be choppy.\n"); } else { x = 320; - ioctl(moh->pseudofd, ZT_SET_BLOCKSIZE, &x); + ioctl(moh->pseudofd, DAHDI_SET_BLOCKSIZE, &x); } #else moh->pseudofd = -1; @@ -1118,7 +1118,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con struct ast_variable *var = NULL; struct ast_variable *tmp = NULL; struct moh_files_state *state = chan->music_state; -#ifdef HAVE_ZAPTEL +#ifdef HAVE_DAHDI int x; #endif @@ -1241,15 +1241,15 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con ast_set_flag(mohclass, MOH_QUIET); mohclass->srcfd = -1; -#ifdef HAVE_ZAPTEL - /* Open /dev/zap/pseudo for timing... Is +#ifdef HAVE_DAHDI + /* Open /dev/dahdi/pseudo for timing... Is there a better, yet reliable way to do this? */ - mohclass->pseudofd = open("/dev/zap/pseudo", O_RDONLY); + mohclass->pseudofd = open("/dev/dahdi/pseudo", O_RDONLY); if (mohclass->pseudofd < 0) { ast_log(LOG_WARNING, "Unable to open pseudo channel for timing... Sound may be choppy.\n"); } else { x = 320; - ioctl(mohclass->pseudofd, ZT_SET_BLOCKSIZE, &x); + ioctl(mohclass->pseudofd, DAHDI_SET_BLOCKSIZE, &x); } #else mohclass->pseudofd = -1; |