From 86b22151f0758311fd146ff508e7254337414bc1 Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 15 Aug 2017 17:40:26 +0200 Subject: sync with upstream --- .../kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/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 11e39f8..3dbf1c8 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 @@ -409,14 +409,6 @@ extern "C" */ long long LengthLiveStream(void); - /*! - * Switch to another channel. Only to be called when a live stream has already been opened. - * @param channel The channel to switch to. - * @return True if the switch was successful, false otherwise. - * @remarks Required if bHandlesInputStream or bHandlesDemuxing is set to true. Return false if this add-on won't provide this function. - */ - bool SwitchChannel(const PVR_CHANNEL& channel); - /*! * Get the signal status of the stream that's currently open. * @param signalStatus The signal status. @@ -434,12 +426,24 @@ extern "C" PVR_ERROR GetDescrambleInfo(PVR_DESCRAMBLE_INFO* descrambleInfo); /*! - * Get the stream URL for a channel from the backend. Used by the MediaPortal add-on. - * @param channel The channel to get the stream URL for. - * @return The requested URL. - * @remarks Optional, and only used if bHandlesInputStream is set to true. Return NULL if this add-on won't provide this function. + * Get the stream properties for a channel from the backend. + * @param[in] channel The channel 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. + * @remarks Required if PVR_ADDON_CAPABILITIES::bSupportsTV or PVR_ADDON_CAPABILITIES::bSupportsRadio are set to true and PVR_ADDON_CAPABILITIES::bHandlesInputStream is set to false. In this case the implementation must fill the property PVR_STREAM_PROPERTY_STREAMURL with the URL Kodi should resolve to playback the channel. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function. + */ + PVR_ERROR GetChannelStreamProperties(const PVR_CHANNEL* channel, PVR_NAMED_VALUE* properties, unsigned int* iPropertiesCount); + + /*! + * Get the stream properties for a recording from the backend. + * @param[in] channel 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. + * @remarks Required if PVR_ADDON_CAPABILITIES::bSupportsRecordings is set to true and the add-on does not implement recording stream functions (OpenRecordedStream, ...). In this case your implementation must fill the property PVR_STREAM_PROPERTY_STREAMURL with the URL Kodi should resolve to playback the recording. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function. */ - const char* GetLiveStreamURL(const PVR_CHANNEL& channel); + PVR_ERROR GetRecordingStreamProperties(const PVR_RECORDING* recording, PVR_NAMED_VALUE* properties, unsigned int* iPropertiesCount); /*! * Get the stream properties of the stream that's currently being read. @@ -536,14 +540,6 @@ extern "C" DemuxPacket* DemuxRead(void); //@} - /*! - * Delay to use when using switching channels for add-ons not providing an input stream. - * If the add-on does provide an input stream, then this method will not be called. - * Those add-ons can do that in OpenLiveStream() if needed. - * @return The delay in milliseconds. - */ - unsigned int GetChannelSwitchDelay(void); - /*! * Check if the backend support pausing the currently playing stream * This will enable/disable the pause button in XBMC based on the return value @@ -637,6 +633,11 @@ extern "C" void OnPowerSavingActivated(); void OnPowerSavingDeactivated(); + /*! + * Get stream times. Intermediate, will be moved to inputstream + */ + PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *times); + /*! * Called by XBMC to assign the function pointers of this add-on to pClient. * @param ptr The struct to assign the function pointers to. @@ -695,11 +696,10 @@ extern "C" pClient->toAddon.SeekLiveStream = SeekLiveStream; pClient->toAddon.PositionLiveStream = PositionLiveStream; pClient->toAddon.LengthLiveStream = LengthLiveStream; - pClient->toAddon.SwitchChannel = SwitchChannel; pClient->toAddon.SignalStatus = SignalStatus; pClient->toAddon.GetDescrambleInfo = GetDescrambleInfo; - pClient->toAddon.GetLiveStreamURL = GetLiveStreamURL; - pClient->toAddon.GetChannelSwitchDelay = GetChannelSwitchDelay; + pClient->toAddon.GetChannelStreamProperties = GetChannelStreamProperties; + pClient->toAddon.GetRecordingStreamProperties = GetRecordingStreamProperties; pClient->toAddon.CanPauseStream = CanPauseStream; pClient->toAddon.PauseStream = PauseStream; pClient->toAddon.CanSeekStream = CanSeekStream; @@ -733,6 +733,6 @@ extern "C" pClient->toAddon.OnSystemWake = OnSystemWake; pClient->toAddon.OnPowerSavingActivated = OnPowerSavingActivated; pClient->toAddon.OnPowerSavingDeactivated = OnPowerSavingDeactivated; + pClient->toAddon.GetStreamTimes = GetStreamTimes; }; }; - -- cgit v1.2.3