From f800a42e45fe47fa9c5ad51094adebb5ea662a0d Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 28 Apr 2008 12:12:56 +0300 Subject: osdep: Remove cruft Delete some commented out or otherwise unused lines. --- osdep/timer-linux.c | 15 --------------- osdep/timer.h | 6 ------ 2 files changed, 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 -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 */ -- cgit v1.2.3