[MPlayer-cvslog] r29198 - trunk/osdep/timer-linux.c

[diego]

Author: diego
Date: Mon Apr 20 00:27:02 2009
New Revision: 29198

Log:
cosmetics: reindent

Modified:
   trunk/osdep/timer-linux.c

Modified: trunk/osdep/timer-linux.c
==============================================================================
--- trunk/osdep/timer-linux.c	Sun Apr 19 17:54:48 2009	(r29197)
+++ trunk/osdep/timer-linux.c	Mon Apr 20 00:27:02 2009	(r29198)
@@ -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 @@ int usec_sleep(int usec_delay)
 }
 
 // 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
-