diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:49:18 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:49:18 +0000 |
| commit | 02b6d501ac4ec8afa68343fd7eba07c871def467 (patch) | |
| tree | c260b454ee36057daa09da1d6ddef150eb246521 /main/file.c | |
| parent | 8c653dc5c125614f66b4d353e2187e3e0c4ea215 (diff) | |
Merged revisions 134086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r134086 | kpfleming | 2008-07-28 11:42:00 -0500 (Mon, 28 Jul 2008) | 3 lines
remove remaining Zaptel references in various places
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@134087 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/file.c')
| -rw-r--r-- | main/file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/file.c b/main/file.c index a8e5a6569..ca38d187d 100644 --- a/main/file.c +++ b/main/file.c @@ -661,15 +661,15 @@ static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) if (whennext != s->lasttimeout) { #ifdef HAVE_DAHDI if (s->owner->timingfd > -1) { - int zap_timer_samples = whennext; + int dahdi_timer_samples = whennext; int rate; /* 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); - zap_timer_samples = (int) ( ((float) zap_timer_samples) / factor ); + dahdi_timer_samples = (int) ( ((float) dahdi_timer_samples) / factor ); } - ast_settimeout(s->owner, zap_timer_samples, ast_fsread_audio, s); + ast_settimeout(s->owner, dahdi_timer_samples, ast_fsread_audio, s); } else #endif s->owner->streamid = ast_sched_add(s->owner->sched, |