From fc4f7417095597625c8fbeec44984e7d78439224 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 19 Apr 2009 22:27:02 +0000
Subject: cosmetics: reindent

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29198 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 osdep/timer-linux.c | 69 +++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 31 deletions(-)

(limited to 'osdep')

diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c
index 0304936bdd..8c1af557a0 100644
--- a/osdep/timer-linux.c
+++ b/osdep/timer-linux.c
@@ -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
-
-- 
cgit v1.2.3


From d9ded9284c43a311b8c2bed6e85466be4d465c0c Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 4 May 2009 17:35:26 +0000
Subject: Add missing 'void' to parameterless function declarations.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 osdep/timer-darwin.c | 8 ++++----
 osdep/timer.h        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'osdep')

diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c
index 4eb973a0c7..9c49cd0fc8 100644
--- a/osdep/timer-darwin.c
+++ b/osdep/timer-darwin.c
@@ -52,19 +52,19 @@ int usec_sleep(int usec_delay)
 
 
 /* current time in microseconds */
-unsigned int GetTimer()
+unsigned int GetTimer(void)
 {
   return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e6);
 }
 
 /* current time in milliseconds */
-unsigned int GetTimerMS()
+unsigned int GetTimerMS(void)
 {
   return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e3);
 }
 
 /* time spent between now and last call in seconds */
-float GetRelativeTime()
+float GetRelativeTime(void)
 {
   double last_time = relative_time;
   
@@ -77,7 +77,7 @@ float GetRelativeTime()
 }
 
 /* initialize timer, must be called at least once at start */
-void InitTimer()
+void InitTimer(void)
 {
   struct mach_timebase_info timebase;
 
diff --git a/osdep/timer.h b/osdep/timer.h
index b92fb46ca6..2e4f2fc8fe 100644
--- a/osdep/timer.h
+++ b/osdep/timer.h
@@ -24,7 +24,7 @@ extern const char *timer_name;
 void InitTimer(void);
 unsigned int GetTimer(void);
 unsigned int GetTimerMS(void);
-//int uGetTimer();
+//int uGetTimer(void);
 float GetRelativeTime(void);
 
 int usec_sleep(int usec_delay);
-- 
cgit v1.2.3