7 files changed, 57 insertions, 20 deletions

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 23a91e7..252edbf 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
@@ -120,6 +120,31 @@ extern "C" {
       FLAG_HEARING_IMPAIRED = 0x0080,
       FLAG_VISUAL_IMPAIRED = 0x0100
     };
+
+    enum INPUTSTREAM_COLORSPACE
+    {
+      COLORSPACE_UNKNOWN,
+      COLORSPACE_BT709,
+      COLORSPACE_BT470M,
+      COLORSPACE_BT470BG,
+      COLORSPACE_SMPTE170M,
+      COLORSPACE_SMPTE240M,
+      COLORSPACE_FILM,
+      COLORSPACE_BT2020,
+      COLORSPACE_SMPTE428,
+      COLORSPACE_SMPTEST428_1,
+      COLORSPACE_SMPTE431,
+      COLORSPACE_SMPTE432,
+      COLORSPACE_JEDEC_P22
+    };
+
+    enum INPUTSTREAM_COLORRANGE
+    {
+      COLORRANGE_UNKNOWN,
+      COLORRANGE_LIMITED,
+      COLORRANGE_FULLRANGE
+    };
+
     uint32_t m_flags;
 
     char m_name[256];                    /*!< @brief (optinal) name of the stream, \0 for default handling */
@@ -139,6 +164,7 @@ extern "C" {
     unsigned int m_Width;                /*!< @brief width of the stream reported by the demuxer */
     float m_Aspect;                      /*!< @brief display aspect of stream */
 
+
     unsigned int m_Channels;             /*!< @brief (required) amount of channels */
     unsigned int m_SampleRate;           /*!< @brief (required) sample rate */
     unsigned int m_BitRate;              /*!< @brief (required) bit rate */
@@ -146,6 +172,11 @@ extern "C" {
     unsigned int m_BlockAlign;
 
     CRYPTO_INFO m_cryptoInfo;
+
+    // new in API version 2.0.8
+    unsigned int m_codecFourCC;          /*!< @brief Codec If available, the fourcc code codec */
+    INPUTSTREAM_COLORSPACE m_colorSpace; /*!< @brief definition of colorspace */
+    INPUTSTREAM_COLORRANGE m_colorRange; /*!< @brief color range if available */
   };
 
   struct INPUTSTREAM_TIMES
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 78e572b..2df8a36 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
@@ -531,8 +531,7 @@ namespace addon
     virtual void FreeEvents(unsigned int event_count, PERIPHERAL_EVENT* events) { }
 
     /*!
-     * @brief Send an input event to the specified peripheral
-     * @param peripheralIndex The index of the device receiving the input event
+     * @brief Send an input event to the peripheral
      * @param event The input event
      * @return true if the event was handled, false otherwise
      */
@@ -677,9 +676,9 @@ namespace addon
      * @param[optional] deviceName The name of the device to refresh, or empty/null for all devices
      * @param[optional] controllerId The controller ID to refresh, or empty/null for all controllers
      */
-    void RefreshButtonMaps(const std::string& strDeviceName = "", const std::string& strControllerId = "")
+    void RefreshButtonMaps(const std::string& deviceName = "", const std::string& controllerId = "")
     {
-      return m_instanceData->toKodi.refresh_button_maps(m_instanceData->toKodi.kodiInstance, strDeviceName.c_str(), strControllerId.c_str());
+      return m_instanceData->toKodi.refresh_button_maps(m_instanceData->toKodi.kodiInstance, deviceName.c_str(), controllerId.c_str());
     }
 
     /*!
@@ -690,9 +689,9 @@ namespace addon
      *
      * @return The number of features matching the request parameters
      */
-    unsigned int FeatureCount(const std::string& strControllerId, JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN)
+    unsigned int FeatureCount(const std::string& controllerId, JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN)
     {
-      return m_instanceData->toKodi.feature_count(m_instanceData->toKodi.kodiInstance, strControllerId.c_str(), type);
+      return m_instanceData->toKodi.feature_count(m_instanceData->toKodi.kodiInstance, controllerId.c_str(), type);
     }
 
     /*!
@@ -704,9 +703,9 @@ namespace addon
      * @return The type of the specified feature, or JOYSTICK_FEATURE_TYPE_UNKNOWN
      * if unknown
      */
-    JOYSTICK_FEATURE_TYPE FeatureType(const std::string& strControllerId, const std::string &featureName)
+    JOYSTICK_FEATURE_TYPE FeatureType(const std::string& controllerId, const std::string &featureName)
     {
-      return m_instanceData->toKodi.feature_type(m_instanceData->toKodi.kodiInstance, strControllerId.c_str(), featureName.c_str());
+      return m_instanceData->toKodi.feature_type(m_instanceData->toKodi.kodiInstance, controllerId.c_str(), featureName.c_str());
     }
 
   private:
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
index 40979e5..478f81b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
@@ -59,7 +59,7 @@ GAME_ERROR UnloadGame(void);
 /*!
  * \brief Get timing information about the loaded game
  *
- * \param info The info structure to fill
+ * \param[out] timing_info The info structure to fill
  *
  * \return the error, or GAME_ERROR_NO_ERROR if info was filled
  */
@@ -176,8 +176,9 @@ bool EnableMouse(bool enable, const game_controller* controller);
  * \brief Connect/disconnect a controller to a port on the virtual game console
  *
  * \param connect True to connect a controller, false to disconnect
- * \param address The address of the port
+ * \param port_address The address of the port
  * \param controller The controller info if connecting, or unused if disconnecting
+ * \return True if the \p controller was (dis-)connected to the port, false otherwise
  *
  * The address is a string that allows traversal of the controller topology.
  * It is formed by alternating port IDs and controller IDs separated by "/".
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h
index ca8cba9..b518c28 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h
@@ -123,7 +123,7 @@ public:
   /*!
    * \brief Get a symbol from the hardware context
    *
-   * \param symbol The symbol's name
+   * \param sym The symbol's name
    *
    * \return A function pointer for the specified symbol
    */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
index 227717c..5127f7e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
@@ -87,7 +87,7 @@
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_XML_ID    "kodi.binary.instance.imagedecoder"
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "addon-instance/ImageDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.0.7"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.0.8"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "2.0.7"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID     "kodi.binary.instance.inputstream"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "addon-instance/Inputstream.h"
@@ -98,7 +98,7 @@
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "addon-instance/Peripheral.h" \
                                                       "addon-instance/PeripheralUtils.h"
 
-#define ADDON_INSTANCE_VERSION_PVR                    "5.10.1"
+#define ADDON_INSTANCE_VERSION_PVR                    "5.10.3"
 #define ADDON_INSTANCE_VERSION_PVR_MIN                "5.10.0"
 #define ADDON_INSTANCE_VERSION_PVR_XML_ID             "kodi.binary.instance.pvr"
 #define ADDON_INSTANCE_VERSION_PVR_DEPENDS            "xbmc_pvr_dll.h" \
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
index 8c509ac..27fa800 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
@@ -316,7 +316,7 @@ extern "C"
   /*!
    * Set the last watched position of a recording on the backend.
    * @param recording The recording.
-   * @param position The last watched position in seconds
+   * @param lastplayedposition The last watched position in seconds
    * @return PVR_ERROR_NO_ERROR if the position has been stored successfully.
    * @remarks Required if bSupportsLastPlayedPosition is set to true.
    *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
@@ -483,7 +483,7 @@ extern "C"
 
   /*!
    * Get the stream properties for a recording from the backend.
-   * @param[in] channel The recording to get the stream properties for.
+   * @param[in] recording The recording to get the stream properties for.
    * @param[inout] properties in: an array for the properties to return, out: the properties required to play the stream.
    * @param[inout] iPropertiesCount in: the size of the properties array, out: the number of properties returned.
    * @return PVR_ERROR_NO_ERROR if the stream is available.
@@ -676,7 +676,9 @@ extern "C"
   void OnPowerSavingDeactivated();
 
   /*!
-   * Get stream times. Intermediate, will be moved to inputstream
+   * Get stream times.
+   * @param times A pointer to the data to be filled by the implementation.
+   * @return PVR_ERROR_NO_ERROR on success.
    */
   PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *times);
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
index 2a89fef..f1562b6 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
@@ -153,6 +153,7 @@ extern "C" {
   const unsigned int PVR_TIMER_TYPE_REQUIRES_EPG_SERIES_ON_CREATE     = 0x00800000; /*!< @brief this type should not appear on any create menus unless associated with an EPG tag with 'series' attributes (EPG_TAG.iFlags & EPG_TAG_FLAG_IS_SERIES || EPG_TAG.iSeriesNumber > 0 || EPG_TAG.iEpisodeNumber > 0 || EPG_TAG.iEpisodePartNumber > 0). Implies PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE */
   const unsigned int PVR_TIMER_TYPE_SUPPORTS_ANY_CHANNEL              = 0x01000000; /*!< @brief this type supports 'any channel', for example when defining a timer rule that should match any channel instaed of a particular channel */
   const unsigned int PVR_TIMER_TYPE_REQUIRES_EPG_SERIESLINK_ON_CREATE = 0x02000000; /*!< @brief this type should not appear on any create menus which don't provide an associated EPG tag with a series link */
+  const unsigned int PVR_TIMER_TYPE_SUPPORTS_READONLY_DELETE          = 0x04000000; /*!< @brief this type allows deletion of an otherwise read-only timer */
 
   /*!
    * @brief PVR timer weekdays (PVR_TIMER.iWeekdays values)
@@ -312,6 +313,9 @@ extern "C" {
 
     unsigned int iRecordingsLifetimesSize; /*!< @brief (required) Count of possible values for PVR_RECORDING.iLifetime. 0 means lifetime is not supported for recordings or no own value definition wanted, but to use Kodi defaults of 1..365. */
     PVR_ATTRIBUTE_INT_VALUE recordingsLifetimeValues[PVR_ADDON_ATTRIBUTE_VALUES_ARRAY_SIZE]; /*!< @brief (optional) Array containing the possible values for PVR_RECORDING.iLifetime. Must be filled if iLifetimesSize > 0 */
+
+    // TODO: cleanup: move this member up after the other bools with the next incompatible pvr addon api change.
+    bool bSupportsAsyncEPGTransfer;     /*!< @brief true if this addon-on supports asynchronous transfer of epg events to Kodi using the callback function EpgEventStateChange. */
   } ATTRIBUTE_PACKED PVR_ADDON_CAPABILITIES;
 
   /*!
@@ -501,7 +505,7 @@ extern "C" {
     int             iMaxRecordings;                            /*!< @brief (optional) maximum number of recordings this timer shall create. > 0 number of recordings, < 0 addon defined integer list reference, == 0 disabled */
     unsigned int    iRecordingGroup;                           /*!< @brief (optional) integer ref to addon/backend defined list of recording groups*/
     time_t          firstDay;                                  /*!< @brief (optional) the first day this timer is active, for repeating timers */
-    unsigned int    iWeekdays;                                 /*!< @brief (optional) week days, for repeating timers */
+    unsigned int    iWeekdays;                                 /*!< @brief (optional) week days, for repeating timers (see PVR_WEEKDAY_* constant values) */
     unsigned int    iPreventDuplicateEpisodes;                 /*!< @brief (optional) 1 if backend should only record new episodes in case of a repeating epg-based timer, 0 if all episodes shall be recorded (no duplicate detection). Actual algorithm for
                                                                     duplicate detection is defined by the backend. Addons may define own values for different duplicate detection algorithms, thus this is not just a bool.*/
     unsigned int    iEpgUid;                                   /*!< @brief (optional) EPG event id associated with this timer. Event ids must be unique for a channel. Valid ids must be greater than EPG_TAG_INVALID_UID. */
@@ -528,7 +532,7 @@ extern "C" {
     char   strPlot[PVR_ADDON_DESC_STRING_LENGTH];         /*!< @brief (optional) plot */
     char   strGenreDescription[PVR_ADDON_DESC_STRING_LENGTH]; /*!< @brief (optional) genre. Will be used only when iGenreType = EPG_GENRE_USE_STRING */
     char   strChannelName[PVR_ADDON_NAME_STRING_LENGTH];  /*!< @brief (optional) channel name */
-    char   strIconPath[PVR_ADDON_URL_STRING_LENGTH];      /*!< @brief (optional) icon path */
+    char   strIconPath[PVR_ADDON_URL_STRING_LENGTH];      /*!< @brief (optional) channel logo (icon) path */
     char   strThumbnailPath[PVR_ADDON_URL_STRING_LENGTH]; /*!< @brief (optional) thumbnail path */
     char   strFanartPath[PVR_ADDON_URL_STRING_LENGTH];    /*!< @brief (optional) fanart path */
     time_t recordingTime;                                 /*!< @brief (optional) start time of the recording */
@@ -584,8 +588,8 @@ extern "C" {
   {
     time_t startTime; /*!< @brief For recordings, this must be zero. For Live TV, this is a reference time in units of time_t (UTC) from which time elapsed starts. Ideally start of tv show, but can be any other value. */
     int64_t ptsStart; /*!< @brief the pts of startTime */
-    int64_t ptsBegin; /*!< @brief earliest pts player can seek back. Value is seconds, relative to ptsStart. For recordings, this must be zero. For Live TV, this must be zero if not timeshifting and must point to begin of the timeshift buffer, otherwise. */
-    int64_t ptsEnd;   /*!< @brief latest pts player can seek forward. Value is seconds, relative to ptsStart. For recordings, this must be the total length in seconds. For Live TV, this must be zero if not timeshifting and must point to end of the timeshift buffer, otherwise. */
+    int64_t ptsBegin; /*!< @brief earliest pts player can seek back. Value is in micro seconds, relative to ptsStart. For recordings, this must be zero. For Live TV, this must be zero if not timeshifting and must point to begin of the timeshift buffer, otherwise. */
+    int64_t ptsEnd;   /*!< @brief latest pts player can seek forward. Value is in micro seconds, relative to ptsStart. For recordings, this must be the total length. For Live TV, this must be zero if not timeshifting and must point to end of the timeshift buffer, otherwise. */
   } ATTRIBUTE_PACKED PVR_STREAM_TIMES;
 
   typedef struct AddonToKodiFuncTable_PVR