From 54c8bb2a71a8115d4076d94f54ce0d5dba02603e Mon Sep 17 00:00:00 2001 From: kpfleming Date: Thu, 9 Jun 2005 14:39:34 +0000 Subject: move timeval-diff function into utils.h from app_alarmreceiver.c git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5882 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_alarmreceiver.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'apps/app_alarmreceiver.c') 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 @@ -218,20 +218,6 @@ static int send_tone_burst(struct ast_channel *chan, float freq, int duration, i return res; } -/* -* 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 @@ -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); -- cgit v1.2.3