From a80b002687a0eb6fcf4bd3550e9c58dcaa00be73 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 21 Nov 2007 09:25:10 +0000
Subject: Rename timer-lx.c --> timer-linux.c.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25129 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 osdep/Makefile      |  2 +-
 osdep/timer-linux.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 osdep/timer-lx.c    | 74 -----------------------------------------------------
 3 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 osdep/timer-linux.c
 delete mode 100644 osdep/timer-lx.c

(limited to 'osdep')

diff --git a/osdep/Makefile b/osdep/Makefile
index be05a06998..d2af3b8e61 100644
--- a/osdep/Makefile
+++ b/osdep/Makefile
@@ -14,7 +14,7 @@ SRCS_COMMON-$(NEED_SWAB)             += swab.c
 SRCS_COMMON-$(NEED_VSSCANF)          += vsscanf.c
 
 getch = getch2.c
-timer = timer-lx.c
+timer = timer-linux.c
 ifeq ($(TARGET_WIN32),yes)
 timer = timer-win2.c
 endif
diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c
new file mode 100644
index 0000000000..5b6010b154
--- /dev/null
+++ b/osdep/timer-linux.c
@@ -0,0 +1,74 @@
+// Precise timer routines for LINUX  (C) LGB & A'rpi/ASTRAL
+
+#include <unistd.h>
+#ifdef __BEOS__
+#define usleep(t) snooze(t)
+#endif
+#include <stdlib.h>
+#include <time.h>
+#include <sys/time.h>
+#include "config.h"
+
+const char *timer_name =
+#ifdef HAVE_NANOSLEEP
+  "nanosleep()";
+#else
+  "usleep()";
+#endif
+
+int usec_sleep(int usec_delay)
+{
+#ifdef HAVE_NANOSLEEP
+    struct timespec ts;
+    ts.tv_sec  =  usec_delay / 1000000;
+    ts.tv_nsec = (usec_delay % 1000000) * 1000;
+    return nanosleep(&ts, NULL);
+#else
+    return usleep(usec_delay);
+#endif
+}
+
+// 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);
+}  
+
+// 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);
+}  
+
+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;
+}
+
+// Initialize timer, must be called at least once at start
+void InitTimer(void){
+  GetRelativeTime();
+}
+
+
+#if 0
+void main(void){
+  float t=0;
+  InitTimer();
+  while(1){ t+=GetRelativeTime();printf("time= %10.6f\r",t);fflush(stdout); }
+}
+#endif
+
diff --git a/osdep/timer-lx.c b/osdep/timer-lx.c
deleted file mode 100644
index 5b6010b154..0000000000
--- a/osdep/timer-lx.c
+++ /dev/null
@@ -1,74 +0,0 @@
-// Precise timer routines for LINUX  (C) LGB & A'rpi/ASTRAL
-
-#include <unistd.h>
-#ifdef __BEOS__
-#define usleep(t) snooze(t)
-#endif
-#include <stdlib.h>
-#include <time.h>
-#include <sys/time.h>
-#include "config.h"
-
-const char *timer_name =
-#ifdef HAVE_NANOSLEEP
-  "nanosleep()";
-#else
-  "usleep()";
-#endif
-
-int usec_sleep(int usec_delay)
-{
-#ifdef HAVE_NANOSLEEP
-    struct timespec ts;
-    ts.tv_sec  =  usec_delay / 1000000;
-    ts.tv_nsec = (usec_delay % 1000000) * 1000;
-    return nanosleep(&ts, NULL);
-#else
-    return usleep(usec_delay);
-#endif
-}
-
-// 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);
-}  
-
-// 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);
-}  
-
-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;
-}
-
-// Initialize timer, must be called at least once at start
-void InitTimer(void){
-  GetRelativeTime();
-}
-
-
-#if 0
-void main(void){
-  float t=0;
-  InitTimer();
-  while(1){ t+=GetRelativeTime();printf("time= %10.6f\r",t);fflush(stdout); }
-}
-#endif
-
-- 
cgit v1.2.3