From c05df66e7fddc46306d2022761f141e7179954aa Mon Sep 17 00:00:00 2001 From: manuel Date: Wed, 9 Mar 2016 11:28:40 +0100 Subject: sync with upstream --- xbmc/addons/addon-bindings.mk | 12 ++++---- .../include/kodi/kodi_vfs_types.h | 32 ++++++++++++++++++++++ .../kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h | 4 +-- .../include/kodi/xbmc_pvr_types.h | 20 +++++++++++--- 4 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h (limited to 'xbmc') diff --git a/xbmc/addons/addon-bindings.mk b/xbmc/addons/addon-bindings.mk index 49978b7..319185a 100644 --- a/xbmc/addons/addon-bindings.mk +++ b/xbmc/addons/addon-bindings.mk @@ -3,29 +3,29 @@ BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h +BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h +BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h +BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_codec_types.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h +BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_stream_utils.hpp BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h +BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h +BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h BINDINGS+=xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h BINDINGS+=xbmc/cores/AudioEngine/Utils/AEChannelData.h BINDINGS+=xbmc/filesystem/IFileTypes.h diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h new file mode 100644 index 0000000..b62c7b0 --- /dev/null +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2015 Team Kodi + * + * This Program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This Program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Kodi; see the file COPYING. If not, see + * . + * + */ +#pragma once + +#include + +extern "C" +{ + struct VFSDirEntry + { + char* label; //!< item label + char* path; //!< item path + bool folder; //!< Item is a folder + uint64_t size; //!< Size of file represented by item + }; +} 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 8b54ea6..5cb6075 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 @@ -639,8 +639,8 @@ extern "C" /*! * Tell the client the time frame to use when notifying epg events back to Kodi. The client might push epg events asynchronously * to Kodi using the callback function EpgEventStateChange. To be able to only push events that are actually of interest for Kodi, - * client needs to know about the epg time frame Kodi uses. Kodi calls this function once after the client add-on has been sucessfully - * initialized and then everytime the time frame value changes. + * client needs to know about the epg time frame Kodi uses. Kodi supplies the current epg time frame value in PVR_PROPERTIES.iEpgMaxDays + * when creating the addon and calls SetEPGTimeFrame later whenever Kodi's epg time frame value changes. * @param iDays number of days from "now". EPG_TIMEFRAME_UNLIMITED means that Kodi is interested in all epg events, regardless of event times. * @return PVR_ERROR_NO_ERROR if new value was successfully set. * @remarks Required if bSupportsEPG is set to true. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function. 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 83bb13a..8d73310 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 @@ -77,10 +77,10 @@ struct DemuxPacket; #define PVR_STREAM_MAX_STREAMS 20 /* current PVR API version */ -#define XBMC_PVR_API_VERSION "5.0.0" +#define XBMC_PVR_API_VERSION "5.1.0" /* min. PVR API version */ -#define XBMC_PVR_MIN_API_VERSION "5.0.0" +#define XBMC_PVR_MIN_API_VERSION "5.1.0" #ifdef __cplusplus extern "C" { @@ -230,6 +230,16 @@ extern "C" { PVR_CONNECTION_STATE_DISCONNECTED = 6, /*!< @brief no connection to backend server (e.g. due to network errors or client initiated disconnect)*/ } PVR_CONNECTION_STATE; + /*! + * @brief PVR recording channel types + */ + typedef enum + { + PVR_RECORDING_CHANNEL_TYPE_UNKNOWN = 0, /*!< @brief unknown */ + PVR_RECORDING_CHANNEL_TYPE_TV = 1, /*!< @brief TV channel */ + PVR_RECORDING_CHANNEL_TYPE_RADIO = 2, /*!< @brief radio channel */ + } PVR_RECORDING_CHANNEL_TYPE; + /*! * @brief Properties passed to the Create() method of an add-on. */ @@ -237,6 +247,7 @@ extern "C" { { const char* strUserPath; /*!< @brief path to the user profile */ const char* strClientPath; /*!< @brief path to this add-on */ + int iEpgMaxDays; /*!< @brief if > EPG_TIMEFRAME_UNLIMITED, in async epg mode, deliver only events in the range from 'end time > now' to 'start time < now + iEpgMaxDays. EPG_TIMEFRAME_UNLIMITED, notify all events. */ } PVR_PROPERTIES; /*! @@ -269,11 +280,11 @@ extern "C" { unsigned int iStreamCount; struct PVR_STREAM { - unsigned int iPhysicalId; /*!< @brief (required) physical index */ + unsigned int iPID; /*!< @brief (required) PID */ xbmc_codec_type_t iCodecType; /*!< @brief (required) codec type this stream */ xbmc_codec_id_t iCodecId; /*!< @brief (required) codec id of this stream */ char strLanguage[4]; /*!< @brief (required) language id */ - int iIdentifier; /*!< @brief (required) stream id */ + int iSubtitleInfo; /*!< @brief (required) Subtitle Info */ int iFPSScale; /*!< @brief (required) scale of 1000 and a rate of 29970 will result in 29.97 fps */ int iFPSRate; /*!< @brief (required) FPS rate */ int iHeight; /*!< @brief (required) height of the stream reported by the demuxer */ @@ -479,6 +490,7 @@ extern "C" { 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. Valid ids must be greater than EPG_TAG_INVALID_UID. */ int iChannelUid; /*!< @brief (optional) unique identifier of the channel for this recording. PVR_CHANNEL_INVALID_UID denotes that channel uid is not available. */ + PVR_RECORDING_CHANNEL_TYPE channelType; /*!< @brief (optional) channel type. Set to PVR_RECORDING_CHANNEL_TYPE_UNKNOWN if the type cannot be determined. */ } ATTRIBUTE_PACKED PVR_RECORDING; /*! -- cgit v1.2.3