diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-06-09 14:39:34 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-06-09 14:39:34 +0000 |
commit | e18a7471729855f1b5aee3fe4aa279da1297d48f (patch) | |
tree | 63859a8a4348b4a0ac78e2f5e78deac39117daf5 /apps/app_alarmreceiver.c | |
parent | f70c5e190b1cbd2e4ff6a18770253f2cd207af41 (diff) |
move timeval-diff function into utils.h from app_alarmreceiver.c
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5882 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_alarmreceiver.c')
-rwxr-xr-x | apps/app_alarmreceiver.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c index 324d656ce..bdf264ea5 100755 --- a/apps/app_alarmreceiver.c +++ b/apps/app_alarmreceiver.c @@ -219,20 +219,6 @@ static int send_tone_burst(struct ast_channel *chan, float freq, int duration, i } /* -* Return the difference in milliseconds between two timeval structs -*/ - -static int ms_diff(struct timeval *tv1, struct timeval *tv2){ - - int ms; - - ms = (tv1->tv_sec - tv2->tv_sec) * 1000; - ms += (tv1->tv_usec - tv2->tv_usec) / 1000; - - return(ms); -} - -/* * Receive a string of DTMF digits where the length of the digit string is known in advance. Do not give preferential * treatment to any digit value, and allow separate time out values to be specified for the first digit and all subsequent * digits. @@ -256,7 +242,7 @@ static int receive_dtmf_digits(struct ast_channel *chan, char *digit_string, int gettimeofday(&now,NULL); /* if outa time, leave */ - if (ms_diff(&now,&lastdigittime) > + if (ast_tvdiff_ms(&lastdigittime, &now) > ((i > 0) ? sdto : fdto)){ if(option_verbose >= 4) ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: DTMF Digit Timeout on %s\n", chan->name); |