Merge pull request xbmc#17461 from AlwinEsch/few-changes

[addons][inputstream] addon "C" style fixes and doxygen define add
Maven85 · Mar 12, 2020 · 0fabe98 · 0fabe98
1 parent 271b7be
commit 0fabe98
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/docs/doxygen/Doxyfile.doxy b/docs/doxygen/Doxyfile.doxy
@@ -2108,7 +2108,8 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
-                         DOXYGEN_SHOULD_USE_THIS
+                         DOXYGEN_SHOULD_USE_THIS \
+                         __cplusplus
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
@@ -828,6 +828,9 @@ INPUT                  = main.txt \
                          Modules/modules_python.dox \
                          Skin/skin.dox \
                          ../../../../cmake/scripts/common/AddonHelpers.dox \
+                         ../../../cores/VideoPlayer/Interface/Addon/DemuxPacket.h \
+                         ../../../cores/VideoPlayer/Interface/Addon/InputStreamConstants.h \
+                         ../../../cores/VideoPlayer/Interface/Addon/TimingConstants.h \
                          ../../../guilib/GUIRenderingControl.dox \
                          ../../../guilib/GUIButtonControl.dox \
                          ../../../guilib/GUIEditControl.dox \
@@ -2208,7 +2211,8 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
-                         DOXYGEN_SHOULD_USE_THIS
+                         DOXYGEN_SHOULD_USE_THIS \
+                         __cplusplus
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h
@@ -8,6 +8,9 @@
 
 #pragma once
 
+#include <inttypes.h>
+#include <string.h>
+
 typedef struct CRYPTO_INFO
 {
   enum CRYPTO_KEY_SYSTEM : uint8_t

diff --git 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<int>(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