X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_mtime.h;h=8d51250dab38177845a3c4ff2fab79e30128506c;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=8c86e2f5c8f1b55f6bc9ca52f2cc3f12b8a4d6b0;hpb=4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b;p=vlc diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h index 8c86e2f5c8..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__) && (__GNUC__ >= 4) && 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))