Mercurial > mplayer.hg

changeset 99:fb1fc94eaff0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed redundancy...
author arpi_esp
date Tue, 13 Mar 2001 00:13:18 +0000
parents e4db2cbedf73
children 201c2f931497
files linux/timer-lx.c linux/timer.h
diffstat 2 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/linux/timer-lx.c	Mon Mar 12 20:07:50 2001 +0000
+++ b/linux/timer-lx.c	Tue Mar 13 00:13:18 2001 +0000
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-// Returns current time in seconds
+// Returns current time in microseconds
 unsigned int GetTimer(){
   struct timeval tv;
   struct timezone tz;
@@ -13,14 +13,6 @@
   return (tv.tv_sec*1000000+tv.tv_usec);
 }  
 
-// Returns current time in microseconds
-int uGetTimer(){
-  struct timeval tv;
-  struct timezone tz;
-  gettimeofday(&tv,&tz);
-  return (int)(tv.tv_usec+1000000*tv.tv_sec);
-}  
-
 static unsigned int RelativeTime=0;
 
 // Returns time spent between now and last call in seconds
--- a/linux/timer.h	Mon Mar 12 20:07:50 2001 +0000
+++ b/linux/timer.h	Tue Mar 13 00:13:18 2001 +0000
@@ -1,6 +1,6 @@
 
 void InitTimer();
-int GetTimer();
+unsigned int GetTimer();
 //int uGetTimer();
 float GetRelativeTime();