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 /main/file.c | |
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 'main/file.c')
-rw-r--r-- | main/file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/file.c b/main/file.c index 0bbadc0fc..a8e5a6569 100644 --- a/main/file.c +++ b/main/file.c @@ -659,11 +659,11 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) } } if (whennext != s->lasttimeout) { -#ifdef HAVE_ZAPTEL +#ifdef HAVE_DAHDI if (s->owner->timingfd > -1) { int zap_timer_samples = whennext; int rate; - /* whennext is in samples, but zaptel timers operate in 8 kHz samples. */ + /* whennext is in samples, but DAHDI timers operate in 8 kHz samples. */ if ((rate = ast_format_rate(s->fmt->format)) != 8000) { float factor; factor = ((float) rate) / ((float) 8000.0); @@ -681,7 +681,7 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) return_failure: s->owner->streamid = -1; -#ifdef HAVE_ZAPTEL +#ifdef HAVE_DAHDI ast_settimeout(s->owner, 0, NULL, NULL); #endif return FSREAD_FAILURE; @@ -792,7 +792,7 @@ int ast_closestream(struct ast_filestream *f) if (f->fmt->format & AST_FORMAT_AUDIO_MASK) { f->owner->stream = NULL; AST_SCHED_DEL(f->owner->sched, f->owner->streamid); -#ifdef HAVE_ZAPTEL +#ifdef HAVE_DAHDI ast_settimeout(f->owner, 0, NULL, NULL); #endif } else { |