summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--osdep/timer-linux.c15
-rw-r--r--osdep/timer.h6
2 files changed, 0 insertions, 21 deletions
diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c
index efcc612627..f32f92f392 100644
--- a/osdep/timer-linux.c
+++ b/osdep/timer-linux.c
@@ -31,32 +31,17 @@ 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);
}
// 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);
}
// Initialize timer, must be called at least once at start
void InitTimer(void){
}
-
-
-#if 0
-#include <stdio.h>
-int main(void){
- float t=0;
- InitTimer();
- while(1){ t+=GetRelativeTime();printf("time= %10.6f\r",t);fflush(stdout); }
-}
-#endif
-
diff --git a/osdep/timer.h b/osdep/timer.h
index b0f289c00a..4ddac524ef 100644
--- a/osdep/timer.h
+++ b/osdep/timer.h
@@ -6,13 +6,7 @@ extern const char timer_name[];
void InitTimer(void);
unsigned int GetTimer(void);
unsigned int GetTimerMS(void);
-//int uGetTimer();
int usec_sleep(int usec_delay);
-/* timer's callback handling */
-typedef void timer_callback( void );
-extern unsigned set_timer_callback(unsigned ms,timer_callback func);
-extern void restore_timer(void);
-
#endif /* MPLAYER_TIMER_H */