kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 04:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

- add get_max_rate timing API call

Browse Source 
- change ast_settimeout() to honor max rate in edge cases of file playback
  (this will make some warning messages go away at the end of playing back
   a file)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125332 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-06-26 15:37:01 +00:00
parent b71f8ac66a
commit 02b1317d0f
5 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/channel.c
View File

@@ -2174,6 +2174,7 @@ int ast_waitfordigit(struct ast_channel *c, int ms)
int ast_settimeout(struct ast_channel *c, unsigned int rate, int (*func)(const void *data), void *data)
{
int res;
unsigned int real_rate = rate, max_rate;
if (c->timingfd == -1) {
return -1;
@@ -2184,9 +2185,13 @@ int ast_settimeout(struct ast_channel *c, unsigned int rate, int (*func)(const v
data = NULL;
}
ast_debug(1, "Scheduling timer at %u timer ticks per second\n", rate);
if (rate && rate > (max_rate = ast_timer_get_max_rate(c->timingfd))) {
real_rate = max_rate;
}
res = ast_timer_set_rate(c->timingfd, rate);
ast_debug(1, "Scheduling timer at (%u requested / %u actual) timer ticks per second\n", rate, real_rate);
res = ast_timer_set_rate(c->timingfd, real_rate);
c->timingfunc = func;
c->timingdata = data;

14
main/timing.c
View File

@@ -46,6 +46,7 @@ void *ast_install_timing_functions(struct ast_timing_functions *funcs)
!funcs->timer_set_rate ||
!funcs->timer_ack ||
!funcs->timer_get_event ||
!funcs->timer_get_max_rate ||
!funcs->timer_enable_continuous ||
!funcs->timer_disable_continuous) {
return NULL;
@@ -198,6 +199,19 @@ enum ast_timing_event ast_timer_get_event(int handle)
return result;
}
unsigned int ast_timer_get_max_rate(int handle)
{
unsigned int res;
ast_rwlock_rdlock(&lock);
res = timer_funcs.timer_get_max_rate(handle);
ast_rwlock_unlock(&lock);
return res;
}
static char *timing_test(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int fd, count = 0;