e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Minor simplification (use GetTime in stead of gettimeofday). 

SVN revision: 48558
This commit is contained in:
Kim Woelders 2010-05-02 20:26:43 +00:00
parent e1d5c8b5bd
commit 88fc01d84a
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/misc.c
View File

@ -24,6 +24,7 @@
#include "E.h"
#include "eobj.h"
#include "xwin.h"
#include "timers.h"
#include <sys/time.h>
#include <time.h>
@ -100,25 +101,10 @@ Quicksort(void **a, int l, int r, int (*CompareFunc) (void *d1, void *d2))
/*
* Stuff to make loops for animated effects.
*/
struct timeval etl_tv_start;
static double etl_t_start;
static int etl_k1, etl_k2;
static double etl_k, etl_fac;
/*
* Return elapsed time in seconds since t0
*/
static double
ETimeElapsed(struct timeval *t0)
{
struct timeval tv;
int sec, usec;
gettimeofday(&tv, NULL);
sec = tv.tv_sec - t0->tv_sec;
usec = tv.tv_usec - t0->tv_usec;
return (double)sec + (((double)usec) / 1000000);
}
#include <math.h>
static float
@ -157,7 +143,8 @@ ETimedLoopInit(int k1, int k2, int speed)
/* When speed is 1000 the loop will take one sec. */
etl_fac = (k2 - k1) * (double)speed / 1000.;
gettimeofday(&etl_tv_start, NULL);
etl_t_start = GetTime();
ESync(ESYNC_TLOOP);
}
@ -170,7 +157,7 @@ ETimedLoopNext(void)
usleep(5000);
/* Find elapsed time since loop start */
tm = ETimeElapsed(&etl_tv_start);
tm = GetTime() - etl_t_start;
etl_k = etl_k1 + tm * etl_fac;
#if 0
Eprintf("ETimedLoopNext k=%4f tm=%.3f\n", etl_k, tm);