diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-06-29 20:32:26 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-06-29 20:32:26 +0000 |
commit | ce56e9aea71fb712d1b859f1c9903dd06032034d (patch) | |
tree | 860e56e0ecfd14cc8e477185e8c7f1d9ba86efd2 /channel.c | |
parent | 04e30543dbf48e9041213f637bab8832761ac27c (diff) |
Properly implement using zaptel for timing of file playback
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1137 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rwxr-xr-x | channel.c | 30 |
1 files changed, 24 insertions, 6 deletions
@@ -938,13 +938,19 @@ char ast_waitfordigit(struct ast_channel *c, int ms) return result; } -int ast_settimeout(struct ast_channel *c, int ms) +int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), void *data) { int res = -1; #ifdef ZAPTEL_OPTIMIZATIONS if (c->timingfd > -1) { - ms *= 8; - res = ioctl(c->timingfd, ZT_TIMERCONFIG, &ms); + if (!func) { + samples = 0; + data = 0; + } + ast_log(LOG_DEBUG, "Scheduling timer at %d sample intervals\n", samples); + res = ioctl(c->timingfd, ZT_TIMERCONFIG, &samples); + c->timingfunc = func; + c->timingdata = data; } #endif return res; @@ -983,6 +989,10 @@ struct ast_frame *ast_read(struct ast_channel *chan) { struct ast_frame *f = NULL; int blah; +#ifdef ZAPTEL_OPTIMIZATIONS + int (*func)(void *); + void *data; +#endif static struct ast_frame null_frame = { AST_FRAME_NULL, @@ -1027,10 +1037,18 @@ struct ast_frame *ast_read(struct ast_channel *chan) chan->exception = 0; blah = -1; ioctl(chan->timingfd, ZT_TIMERACK, &blah); - blah = 0; - ioctl(chan->timingfd, ZT_TIMERCONFIG, &blah); - f = &null_frame; + func = chan->timingfunc; + data = chan->timingdata; pthread_mutex_unlock(&chan->lock); + if (func) { + func(data); + } else { + blah = 0; + pthread_mutex_lock(&chan->lock); + ioctl(chan->timingfd, ZT_TIMERCONFIG, &blah); + pthread_mutex_unlock(&chan->lock); + } + f = &null_frame; return f; } #endif |