Mercurial > mplayer.hg
view osdep/timer-lx.c @ 18066:2ee39341b7a6
fix segfault in the skin browser when sbSelectedSkin gets dereferenced before setting, when no skin is selected in the skin list upon opening the browser,
and "Cancel" or "OK" buttons get clicked.
Noticed when runnig freshly compiled gmplayer on a system where the skins were still under the old location.
based on a combined patch by Stanislav Maslovski <stanislav POIS maslovski AH gmail POIS com>
author | gpoirier |
---|---|
date | Sun, 09 Apr 2006 13:52:45 +0000 |
parents | f580a7755ac5 |
children | 1f956f8f881e |
line wrap: on
line source
// 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; struct timezone tz; // float s; gettimeofday(&tv,&tz); // 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; struct timezone tz; // float s; gettimeofday(&tv,&tz); // 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(){ float t=0; InitTimer(); while(1){ t+=GetRelativeTime();printf("time= %10.6f\r",t);fflush(stdout); } } #endif