diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2008-06-12 17:27:55 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2008-06-12 17:27:55 +0000 |
| commit | ef3b21472889eff8e88f7e83afb2251ef54722ce (patch) | |
| tree | 4732aea57767a39cd0efe083ba0119911ee976a3 /main/file.c | |
| parent | 6ac8ccaba45c9c11fefe853d0c83a92e881c2abf (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: https://origsvn.digium.com/svn/asterisk/trunk@122234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 86efb6000..15b6a5d88 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 { |