5 files changed, 69 insertions, 13 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt
new file mode 100644
index 0000000..ba4f889
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(HEADERS AudioDSP.h
+            AudioDecoder.h
+            AudioEncoder.h
+            ImageDecoder.h
+            Inputstream.h
+            Peripheral.h
+            PeripheralUtils.h
+            Screensaver.h
+            VFS.h
+            VideoCodec.h
+            Visualization.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-addon-dev-kit_include_kodi_addon-instance)
+endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
index 8db17c0..08d01ad 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
@@ -29,9 +29,9 @@
 #include "../StreamCodec.h"
 
 #ifdef BUILD_KODI_ADDON
-#include "../DVDDemuxPacket.h"
+#include "../DemuxPacket.h"
 #else
-#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
+#include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
 #endif
 
 namespace kodi { namespace addon { class CInstanceInputStream; }}
@@ -41,7 +41,7 @@ extern "C" {
   /*!
    * @brief InputStream add-on capabilities. All capabilities are set to "false" as default.
    */
-  typedef struct INPUTSTREAM_CAPABILITIES
+  struct INPUTSTREAM_CAPABILITIES
   {
     enum MASKTYPE: uint32_t
     {
@@ -58,17 +58,20 @@ extern "C" {
       SUPPORTS_SEEK = (1 << 3),
 
       /// supports pause
-      SUPPORTS_PAUSE = (1 << 4)
+      SUPPORTS_PAUSE = (1 << 4),
+
+      /// supports interface ITime
+      SUPPORTS_ITIME = (1 << 5)
     };
 
     /// set of supported capabilities
     uint32_t m_mask;
-  } INPUTSTREAM_CAPABILITIES;
+  };
 
   /*!
    * @brief structure of key/value pairs passed to addon on Open()
    */
-  typedef struct INPUTSTREAM
+  struct INPUTSTREAM
   {
     static const unsigned int MAX_INFO_COUNT = 8;
 
@@ -83,22 +86,22 @@ extern "C" {
 
     const char *m_libFolder;
     const char *m_profileFolder;
-  } INPUTSTREAM;
+  };
 
   /*!
    * @brief Array of stream IDs
    */
-  typedef struct INPUTSTREAM_IDS
+  struct INPUTSTREAM_IDS
   {
     static const unsigned int MAX_STREAM_COUNT = 32;
     unsigned int m_streamCount;
     unsigned int m_streamIds[MAX_STREAM_COUNT];
-  } INPUTSTREAM_IDS;
+  };
 
   /*!
    * @brief stream properties
    */
-  typedef struct INPUTSTREAM_INFO
+  struct INPUTSTREAM_INFO
   {
     enum STREAM_TYPE
     {
@@ -130,6 +133,7 @@ extern "C" {
     };
     uint32_t m_flags;
 
+    char m_name[256];                    /*!< @brief (optinal) name of the stream, \0 for default handling */
     char m_codecName[32];                /*!< @brief (required) name of codec according to ffmpeg */
     char m_codecInternalName[32];        /*!< @brief (optional) internal name of codec (selectionstream info) */
     STREAMCODEC_PROFILE m_codecProfile;  /*!< @brief (optional) the profile of the codec */
@@ -153,7 +157,15 @@ extern "C" {
     unsigned int m_BlockAlign;
 
     CRYPTO_INFO m_cryptoInfo;
-  } INPUTSTREAM_INFO;
+  };
+
+  struct INPUTSTREAM_TIMES
+  {
+    time_t startTime;
+    double ptsStart;
+    double ptsBegin;
+    double ptsEnd;
+  };
 
   /*!
    * @brief Structure to transfer the methods from xbmc_inputstream_dll.h to XBMC
@@ -201,6 +213,9 @@ extern "C" {
     int (__cdecl* get_total_time)(const AddonInstance_InputStream* instance);
     int (__cdecl* get_time)(const AddonInstance_InputStream* instance);
 
+    // ITime
+    bool(__cdecl* get_times)(const AddonInstance_InputStream* instance, INPUTSTREAM_TIMES *times);
+
     // IPosTime
     bool (__cdecl* pos_time)(const AddonInstance_InputStream* instance, int ms);
 
@@ -364,6 +379,12 @@ namespace addon
     virtual int GetTime() { return -1; }
 
     /*!
+    * Get current timing values in PTS scale
+    * @remarks
+    */
+    virtual bool GetTimes(INPUTSTREAM_TIMES &times) { return false; }
+
+    /*!
      * Positions inputstream to playing time given in ms
      * @remarks
      */
@@ -483,6 +504,8 @@ namespace addon
       m_instanceData->toAddon.get_total_time = ADDON_GetTotalTime;
       m_instanceData->toAddon.get_time = ADDON_GetTime;
 
+      m_instanceData->toAddon.get_times = ADDON_GetTimes;
+
       m_instanceData->toAddon.pos_time = ADDON_PosTime;
 
       m_instanceData->toAddon.can_pause_stream = ADDON_CanPauseStream;
@@ -580,6 +603,11 @@ namespace addon
       return instance->toAddon.addonInstance->GetTime();
     }
 
+    // ITime
+    inline static bool ADDON_GetTimes(const AddonInstance_InputStream* instance, INPUTSTREAM_TIMES *times)
+    {
+      return instance->toAddon.addonInstance->GetTimes(*times);
+    }
 
     // IPosTime
     inline static bool ADDON_PosTime(const AddonInstance_InputStream* instance, int ms)
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
index c1a18e0..0dae06c 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
@@ -212,6 +212,8 @@ extern "C"
     JOYSTICK_FEATURE_TYPE_MOTOR,
     JOYSTICK_FEATURE_TYPE_RELPOINTER,
     JOYSTICK_FEATURE_TYPE_ABSPOINTER,
+    JOYSTICK_FEATURE_TYPE_WHEEL,
+    JOYSTICK_FEATURE_TYPE_THROTTLE,
   } JOYSTICK_FEATURE_TYPE;
 
   typedef enum JOYSTICK_FEATURE_PRIMITIVE
@@ -233,6 +235,14 @@ extern "C"
     // Motor
     JOYSTICK_MOTOR_PRIMITIVE = 0,
 
+    // Wheel
+    JOYSTICK_WHEEL_LEFT = 0,
+    JOYSTICK_WHEEL_RIGHT = 1,
+
+    // Throttle
+    JOYSTICK_THROTTLE_UP = 0,
+    JOYSTICK_THROTTLE_DOWN = 1,
+
     // Maximum number of primitives
     JOYSTICK_PRIMITIVE_MAX = 4,
   } JOYSTICK_FEATURE_PRIMITIVE;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
index ea70b30..3c4cab3 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
@@ -581,6 +581,9 @@ namespace addon
    *   3) accelerometer
    *   4) motor
    *   5) relative pointer[2]
+   *   6) absolute pointer
+   *   7) wheel
+   *   8) throttle
    *
    * [1] All three driver primitives (buttons, hats and axes) have a state that
    *     can be represented using a single scalar value. For this reason,
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
index 02d39c6..eb4351e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
@@ -25,9 +25,9 @@
 #include "../StreamCodec.h"
 
 #ifdef BUILD_KODI_ADDON
-#include "../DVDDemuxPacket.h"
+#include "../DemuxPacket.h"
 #else
-#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
+#include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
 #endif
 
 namespace kodi { namespace addon { class CInstanceVideoCodec; } }