Mercurial > mplayer.hg
changeset 29157:e67f8e8d2e74
cosmetics: reindent
author | diego |
---|---|
date | Sun, 19 Apr 2009 22:27:02 +0000 |
parents | 15c34dd9583f |
children | 2966d20b6be5 |
files | osdep/timer-linux.c |
diffstat | 1 files changed, 38 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/osdep/timer-linux.c Sun Apr 19 15:54:48 2009 +0000 +++ b/osdep/timer-linux.c Sun Apr 19 22:27:02 2009 +0000 @@ -30,9 +30,9 @@ const char *timer_name = #ifdef HAVE_NANOSLEEP - "nanosleep()"; + "nanosleep()"; #else - "usleep()"; + "usleep()"; #endif int usec_sleep(int usec_delay) @@ -48,47 +48,54 @@ } // Returns current time in microseconds -unsigned int GetTimer(void){ - struct timeval tv; -// float s; - gettimeofday(&tv,NULL); -// s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec; - return tv.tv_sec * 1000000 + tv.tv_usec; -} +unsigned int GetTimer(void) +{ + struct timeval tv; + //float s; + gettimeofday(&tv,NULL); + //s = tv.tv_usec; s *= 0.000001; s += tv.tv_sec; + return tv.tv_sec * 1000000 + tv.tv_usec; +} // Returns current time in milliseconds -unsigned int GetTimerMS(void){ - struct timeval tv; -// float s; - gettimeofday(&tv,NULL); -// s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec; - return tv.tv_sec * 1000 + tv.tv_usec / 1000; -} +unsigned int GetTimerMS(void) +{ + struct timeval tv; + //float s; + gettimeofday(&tv,NULL); + //s = tv.tv_usec; s *= 0.000001; s += tv.tv_sec; + return tv.tv_sec * 1000 + tv.tv_usec / 1000; +} -static unsigned int RelativeTime=0; +static unsigned int RelativeTime = 0; // Returns time spent between now and last call in seconds -float GetRelativeTime(void){ -unsigned int t,r; - t=GetTimer(); -// t*=16;printf("time=%ud\n",t); - r=t-RelativeTime; - RelativeTime=t; - return (float)r * 0.000001F; +float GetRelativeTime(void) +{ + unsigned int t,r; + t = GetTimer(); + //t *= 16; printf("time = %ud\n", t); + r = t - RelativeTime; + RelativeTime = t; + return (float) r * 0.000001F; } // Initialize timer, must be called at least once at start -void InitTimer(void){ - GetRelativeTime(); +void InitTimer(void) +{ + GetRelativeTime(); } #if 0 #include <stdio.h> -int main(void){ - float t=0; - InitTimer(); - while(1){ t+=GetRelativeTime();printf("time= %10.6f\r",t);fflush(stdout); } +int main(void) +{ + float t = 0; + InitTimer(); + while (1) { + t += GetRelativeTime(); + printf("time = %10.6f\r", t); + fflush(stdout); } } #endif -