From 96fb8d016fe50ba67d830ce6a965b988b8fea942 Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 10 Mar 2015 00:33:13 +0100 Subject: sync with upstream --- xbmc/addons/addon-bindings.mk | 2 +- xbmc/addons/include/xbmc_epg_types.h | 1 - xbmc/addons/include/xbmc_pvr_dll.h | 6 +++--- xbmc/addons/include/xbmc_pvr_types.h | 5 +++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'xbmc') diff --git a/xbmc/addons/addon-bindings.mk b/xbmc/addons/addon-bindings.mk index 4a33cfd..e7185a7 100644 --- a/xbmc/addons/addon-bindings.mk +++ b/xbmc/addons/addon-bindings.mk @@ -15,7 +15,7 @@ BINDINGS+=xbmc/addons/include/xbmc_vis_dll.h BINDINGS+=xbmc/addons/include/xbmc_vis_types.h BINDINGS+=xbmc/addons/include/xbmc_stream_utils.hpp BINDINGS+=addons/library.xbmc.addon/libXBMC_addon.h -BINDINGS+=addons/library.xbmc.gui/libXBMC_gui.h +BINDINGS+=addons/library.kodi.guilib/libKODI_guilib.h BINDINGS+=addons/library.xbmc.pvr/libXBMC_pvr.h BINDINGS+=addons/library.xbmc.codec/libXBMC_codec.h BINDINGS+=xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h diff --git a/xbmc/addons/include/xbmc_epg_types.h b/xbmc/addons/include/xbmc_epg_types.h index 97cea40..ceac074 100644 --- a/xbmc/addons/include/xbmc_epg_types.h +++ b/xbmc/addons/include/xbmc_epg_types.h @@ -88,7 +88,6 @@ extern "C" { int iEpisodeNumber; /*!< @brief (optional) episode number */ int iEpisodePartNumber; /*!< @brief (optional) episode part number */ const char * strEpisodeName; /*!< @brief (optional) episode name */ - const char * strRecordingId; /*!< @brief (optional) unique id of the recording on the client which represents this event */ } ATTRIBUTE_PACKED EPG_TAG; #ifdef __cplusplus diff --git a/xbmc/addons/include/xbmc_pvr_dll.h b/xbmc/addons/include/xbmc_pvr_dll.h index 3ad46fc..5280399 100644 --- a/xbmc/addons/include/xbmc_pvr_dll.h +++ b/xbmc/addons/include/xbmc_pvr_dll.h @@ -176,7 +176,7 @@ extern "C" * Show the channel scan dialog if this backend supports it. * @return PVR_ERROR_NO_ERROR if the dialog was displayed successfully. * @remarks Required if bSupportsChannelScan is set to true. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function. - * @note see libXBMC_gui.h about related parts + * @note see libKODI_guilib.h about related parts */ PVR_ERROR OpenDialogChannelScan(void); @@ -227,7 +227,7 @@ extern "C" * @param channel The channel to show the dialog for. * @return PVR_ERROR_NO_ERROR if the dialog has been displayed successfully. * @remarks Required if bSupportsChannelSettings is set to true. - * @note see libXBMC_gui.h about related parts + * @note see libKODI_guilib.h about related parts */ PVR_ERROR OpenDialogChannelSettings(const PVR_CHANNEL& channel); @@ -236,7 +236,7 @@ extern "C" * @param channel The channel to add. * @return PVR_ERROR_NO_ERROR if the channel has been added successfully. * @remarks Required if bSupportsChannelSettings is set to true. - * @note see libXBMC_gui.h about related parts + * @note see libKODI_guilib.h about related parts */ PVR_ERROR OpenDialogChannelAdd(const PVR_CHANNEL& channel); //@} diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h index 5285bd1..5716e51 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.4" +#define XBMC_PVR_API_VERSION "1.9.5" /* min. PVR API version */ -#define XBMC_PVR_MIN_API_VERSION "1.9.4" +#define XBMC_PVR_MIN_API_VERSION "1.9.5" #ifdef __cplusplus extern "C" { @@ -299,6 +299,7 @@ extern "C" { int iPlayCount; /*!< @brief (optional) play count of this recording on the client */ int iLastPlayedPosition; /*!< @brief (optional) last played position of this recording on the client */ bool bIsDeleted; /*!< @brief (optional) shows this recording is deleted and can be undelete */ + unsigned int iEpgEventId; /*!< @brief (optional) EPG event id associated with this recording */ } ATTRIBUTE_PACKED PVR_RECORDING; /*! -- cgit v1.2.3