X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_mtime.h;h=0e623c2074de95daf30c59dee8b1970797d5610d;hb=245aa5862555d70e49c7d1659fee253ab3483465;hp=e51c639813068731612df4baf83110a10481a686;hpb=e516ddb1ca69202f576d6e7020c9f9b2c90b8890;p=vlc

diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h
index e51c639813..0e623c2074 100644
--- a/include/vlc_mtime.h
+++ b/include/vlc_mtime.h
@@ -51,77 +51,11 @@
  *****************************************************************************/
 #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
  *****************************************************************************/
-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 ) );
-
-#ifdef __GNUC__
-# ifdef __linux__
-#  define VLC_HARD_MIN_SLEEP 1000 /* Linux has 100, 250, 300 or 1000Hz */
-# else
-#  define VLC_HARD_MIN_SLEEP 0
-# endif
-#define VLC_SOFT_MIN_SLEEP 29000000
-
-static
-__attribute__((unused))
-__attribute__((noinline))
-__attribute__((error("sorry, cannot sleep for such short a time")))
-mtime_t impossible_delay( mtime_t delay )
-{
-    (void) delay;
-    return VLC_HARD_MIN_SLEEP;
-}
-
-static
-__attribute__((unused))
-__attribute__((noinline))
-__attribute__((warning("use proper event handling instead of short delay")))
-mtime_t harmful_delay( mtime_t delay )
-{
-    return delay;
-}
-
-# define check_delay( d ) \
-    ((__builtin_constant_p(d < VLC_HARD_MIN_SLEEP) \
-   && (d < VLC_HARD_MIN_SLEEP)) \
-       ? impossible_delay(d) \
-       : ((__builtin_constant_p(d < VLC_SOFT_MIN_SLEEP) \
-       && (d < VLC_SOFT_MIN_SLEEP)) \
-           ? harmful_delay(d) \
-           : d))
-
-static
-__attribute__((unused))
-__attribute__((noinline))
-__attribute__((error("deadlines can not be constant")))
-mtime_t impossible_deadline( mtime_t deadline )
-{
-    return deadline;
-}
-
-# define check_deadline( d ) \
-    (__builtin_constant_p(d) ? impossible_deadline(d) : d)
-#else
-# define check_delay(d) (d)
-# define check_deadline(d) (d)
-#endif
-
-#define msleep(d) msleep(check_delay(d))
-#define mwait(d) mwait(check_deadline(d))
+VLC_API char * mstrtime( char *psz_buffer, mtime_t date );
+VLC_API char * secstotimestr( char *psz_buffer, int32_t secs );
 
 /*****************************************************************************
  * date_t: date incrementation without long-term rounding errors
@@ -134,11 +68,12 @@ struct date_t
     uint32_t i_remainder;
 };
 
-VLC_EXPORT( void,    date_Init,      ( date_t *, uint32_t, uint32_t ) );
-VLC_EXPORT( void,    date_Change,    ( date_t *, uint32_t, uint32_t ) );
-VLC_EXPORT( void,    date_Set,       ( date_t *, mtime_t ) );
-VLC_EXPORT( mtime_t, date_Get,       ( const date_t * ) );
-VLC_EXPORT( void,    date_Move,      ( date_t *, mtime_t ) );
-VLC_EXPORT( mtime_t, date_Increment, ( date_t *, uint32_t ) );
-VLC_EXPORT( uint64_t, NTPtime64,     ( void ) );
+VLC_API void date_Init( date_t *, uint32_t, uint32_t );
+VLC_API void date_Change( date_t *, uint32_t, uint32_t );
+VLC_API void date_Set( date_t *, mtime_t );
+VLC_API mtime_t date_Get( const date_t * );
+VLC_API void date_Move( date_t *, mtime_t );
+VLC_API mtime_t date_Increment( date_t *, uint32_t );
+VLC_API mtime_t date_Decrement( date_t *, uint32_t );
+VLC_API uint64_t NTPtime64( void );
 #endif /* !__VLC_MTIME_ */