X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_mtime.h;h=8d51250dab38177845a3c4ff2fab79e30128506c;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=0a75dacdf964f4c3a19c47f709ff2ec6eaa6abec;hpb=0b033e01399b7630e6e040a054144892fb458f00;p=vlc diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h index 0a75dacdf9..8d51250dab 100644 --- a/include/vlc_mtime.h +++ b/include/vlc_mtime.h @@ -51,14 +51,6 @@ *****************************************************************************/ #define MSTRTIME_MAX_SIZE 22 -/* Well, Duh? But it does clue us in that we are converting from - millisecond quantity to a second quantity or vice versa. -*/ -#define MILLISECONDS_PER_SEC 1000 - -#define msecstotimestr(psz_buffer, msecs) \ - secstotimestr( psz_buffer, (msecs / (int) MILLISECONDS_PER_SEC) ) - /***************************************************************************** * Prototypes *****************************************************************************/ @@ -66,11 +58,17 @@ VLC_EXPORT( char *, mstrtime, ( char *psz_buffer, mtime_t date ) ); VLC_EXPORT( mtime_t, mdate, ( void ) ); VLC_EXPORT( void, mwait, ( mtime_t date ) ); VLC_EXPORT( void, msleep, ( mtime_t delay ) ); -VLC_EXPORT( char *, secstotimestr, ( char *psz_buffer, int secs ) ); +VLC_EXPORT( char *, secstotimestr, ( char *psz_buffer, int32_t secs ) ); -#if defined (__GNUC__) && defined (__linux__) -# define VLC_HARD_MIN_SLEEP 1000 /* Linux has 100, 250, 300 or 1000Hz */ -# define VLC_SOFT_MIN_SLEEP 9000000 +# define VLC_HARD_MIN_SLEEP 10000 /* 10 milliseconds = 1 tick at 100Hz */ + +#if defined (__GNUC__) \ + && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) +/* Linux has 100, 250, 300 or 1000Hz + * + * HZ=100 by default on FreeBSD, but some architectures use a 1000Hz timer + */ +# define VLC_SOFT_MIN_SLEEP 9000000 /* 9 seconds */ static __attribute__((unused))