sync with upstream

2 files changed, 9 insertions, 2 deletions

diff --git a/xbmc/addons/include/xbmc_epg_types.h b/xbmc/addons/include/xbmc_epg_types.h
index ceac074..efd7d13 100644
--- a/xbmc/addons/include/xbmc_epg_types.h
+++ b/xbmc/addons/include/xbmc_epg_types.h
@@ -76,6 +76,12 @@ extern "C" {
     time_t        endTime;             /*!< @brief (required) end time in UTC */
     const char *  strPlotOutline;      /*!< @brief (optional) plot outline */
     const char *  strPlot;             /*!< @brief (optional) plot */
+    const char *  strOriginalTitle;    /*!< @brief (optional) originaltitle */
+    const char *  strCast;             /*!< @brief (optional) cast */
+    const char *  strDirector;         /*!< @brief (optional) director */
+    const char *  strWriter;           /*!< @brief (optional) writer */
+    int           iYear;               /*!< @brief (optional) year */
+    const char *  strIMDBNumber;       /*!< @brief (optional) IMDBNumber */
     const char *  strIconPath;         /*!< @brief (optional) icon path */
     int           iGenreType;          /*!< @brief (optional) genre type */
     int           iGenreSubType;       /*!< @brief (optional) genre sub type */
diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h
index 5716e51..a2e4882 100644
--- a/xbmc/addons/include/xbmc_pvr_types.h
+++ b/xbmc/addons/include/xbmc_pvr_types.h
@@ -75,10 +75,10 @@ struct DemuxPacket;
 #define PVR_STREAM_MAX_STREAMS 20
 
 /* current PVR API version */
-#define XBMC_PVR_API_VERSION "1.9.5"
+#define XBMC_PVR_API_VERSION "1.9.6"
 
 /* min. PVR API version */
-#define XBMC_PVR_MIN_API_VERSION "1.9.5"
+#define XBMC_PVR_MIN_API_VERSION "1.9.6"
 
 #ifdef __cplusplus
 extern "C" {
@@ -244,6 +244,7 @@ extern "C" {
   {
     char         strGroupName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (required) name of this channel group */
     bool         bIsRadio;                                   /*!< @brief (required) true if this is a radio channel group, false otherwise. */
+    unsigned int iPosition;                                  /*!< @brief (optional) sort position of the group (0 indicates that the backend doesn't support sorting of groups) */
   } ATTRIBUTE_PACKED PVR_CHANNEL_GROUP;
 
   typedef struct PVR_CHANNEL_GROUP_MEMBER