From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 2 Jul 2020 23:09:26 +0200 Subject: sync with upstream --- xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h') diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h b/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h index 0672002..c94e255 100644 --- a/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h +++ b/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h @@ -11,9 +11,15 @@ #define DVD_TIME_BASE 1000000 #define DVD_NOPTS_VALUE 0xFFF0000000000000 +#ifdef __cplusplus constexpr int DVD_TIME_TO_MSEC(double x) { return static_cast(x * 1000 / DVD_TIME_BASE); } constexpr double DVD_SEC_TO_TIME(double x) { return x * DVD_TIME_BASE; } constexpr double DVD_MSEC_TO_TIME(double x) { return x * DVD_TIME_BASE / 1000; } +#else +#define DVD_TIME_TO_MSEC(x) ((int)((double)(x) * 1000 / DVD_TIME_BASE)) +#define DVD_SEC_TO_TIME(x) ((double)(x) * DVD_TIME_BASE) +#define DVD_MSEC_TO_TIME(x) ((double)(x) * DVD_TIME_BASE / 1000) +#endif #define DVD_PLAYSPEED_PAUSE 0 // frame stepping #define DVD_PLAYSPEED_NORMAL 1000 -- cgit v1.2.3