From f44ecaa4f27e7538ddcad66d40e543bffa2d2d86 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 4 Jun 2017 16:57:49 +0200 Subject: sync with upstream --- .../kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h | 214 +++++++++------------ 1 file changed, 90 insertions(+), 124 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 57bb129..d504f4b 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 @@ -33,40 +33,6 @@ extern "C" { /*! @name PVR add-on methods */ //@{ - /*! - * Get the XBMC_PVR_API_VERSION that was used to compile this add-on. - * Used to check if this add-on is compatible with XBMC. - * @return The XBMC_PVR_API_VERSION that was used to compile this add-on. - * @remarks Valid implementation required. - */ - const char* GetPVRAPIVersion(void); - - /*! - * Get the XBMC_PVR_MIN_API_VERSION that was used to compile this add-on. - * Used to check if this add-on is compatible with XBMC. - * @return The XBMC_PVR_MIN_API_VERSION that was used to compile this add-on. - * @remarks Valid implementation required. - */ - const char* GetMininumPVRAPIVersion(void); - - /*! - * Get the XBMC_GUI_API_VERSION that was used to compile this add-on. - * Used to check if this add-on is compatible with XBMC. - * @return The XBMC_GUI_API_VERSION that was used to compile this add-on or empty string if this add-on does not depend on Kodi GUI API. - * @remarks Valid implementation required. - * @note see libKODI_guilib.h about related parts - */ - const char* GetGUIAPIVersion(void); - - /*! - * Get the XBMC_GUI_MIN_API_VERSION that was used to compile this add-on. - * Used to check if this add-on is compatible with XBMC. - * @return The XBMC_GUI_MIN_API_VERSION that was used to compile this add-on or empty string if this add-on does not depend on Kodi GUI API. - * @remarks Valid implementation required. - * @note see libKODI_guilib.h about related parts - */ - const char* GetMininumGUIAPIVersion(void); - /*! * Get the list of features that this add-on provides. * Called by XBMC to query the add-on's capabilities. @@ -657,98 +623,98 @@ extern "C" /*! * Called by XBMC to assign the function pointers of this add-on to pClient. - * @param pClient The struct to assign the function pointers to. + * @param ptr The struct to assign the function pointers to. */ - void __declspec(dllexport) get_addon(struct PVRClient* pClient) + void __declspec(dllexport) get_addon(void* ptr) { - pClient->GetPVRAPIVersion = GetPVRAPIVersion; - pClient->GetMininumPVRAPIVersion = GetMininumPVRAPIVersion; - pClient->GetGUIAPIVersion = GetGUIAPIVersion; - pClient->GetMininumGUIAPIVersion = GetMininumGUIAPIVersion; - pClient->GetAddonCapabilities = GetAddonCapabilities; - pClient->GetStreamProperties = GetStreamProperties; - pClient->GetConnectionString = GetConnectionString; - pClient->GetBackendName = GetBackendName; - pClient->GetBackendVersion = GetBackendVersion; - pClient->GetDriveSpace = GetDriveSpace; - pClient->OpenDialogChannelScan = OpenDialogChannelScan; - pClient->MenuHook = CallMenuHook; - - pClient->GetEpg = GetEPGForChannel; - - pClient->GetChannelGroupsAmount = GetChannelGroupsAmount; - pClient->GetChannelGroups = GetChannelGroups; - pClient->GetChannelGroupMembers = GetChannelGroupMembers; - - pClient->GetChannelsAmount = GetChannelsAmount; - pClient->GetChannels = GetChannels; - pClient->DeleteChannel = DeleteChannel; - pClient->RenameChannel = RenameChannel; - pClient->MoveChannel = MoveChannel; - pClient->OpenDialogChannelSettings = OpenDialogChannelSettings; - pClient->OpenDialogChannelAdd = OpenDialogChannelAdd; - - pClient->GetRecordingsAmount = GetRecordingsAmount; - pClient->GetRecordings = GetRecordings; - pClient->DeleteRecording = DeleteRecording; - pClient->UndeleteRecording = UndeleteRecording; - pClient->DeleteAllRecordingsFromTrash = DeleteAllRecordingsFromTrash; - pClient->RenameRecording = RenameRecording; - pClient->SetRecordingPlayCount = SetRecordingPlayCount; - pClient->SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition; - pClient->GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition; - pClient->GetRecordingEdl = GetRecordingEdl; - - pClient->GetTimerTypes = GetTimerTypes; - pClient->GetTimersAmount = GetTimersAmount; - pClient->GetTimers = GetTimers; - pClient->AddTimer = AddTimer; - pClient->DeleteTimer = DeleteTimer; - pClient->UpdateTimer = UpdateTimer; - - pClient->OpenLiveStream = OpenLiveStream; - pClient->CloseLiveStream = CloseLiveStream; - pClient->ReadLiveStream = ReadLiveStream; - pClient->SeekLiveStream = SeekLiveStream; - pClient->PositionLiveStream = PositionLiveStream; - pClient->LengthLiveStream = LengthLiveStream; - pClient->SwitchChannel = SwitchChannel; - pClient->SignalStatus = SignalStatus; - pClient->GetLiveStreamURL = GetLiveStreamURL; - pClient->GetChannelSwitchDelay = GetChannelSwitchDelay; - pClient->CanPauseStream = CanPauseStream; - pClient->PauseStream = PauseStream; - pClient->CanSeekStream = CanSeekStream; - pClient->SeekTime = SeekTime; - pClient->SetSpeed = SetSpeed; - - pClient->OpenRecordedStream = OpenRecordedStream; - pClient->CloseRecordedStream = CloseRecordedStream; - pClient->ReadRecordedStream = ReadRecordedStream; - pClient->SeekRecordedStream = SeekRecordedStream; - pClient->PositionRecordedStream = PositionRecordedStream; - pClient->LengthRecordedStream = LengthRecordedStream; - - pClient->DemuxReset = DemuxReset; - pClient->DemuxAbort = DemuxAbort; - pClient->DemuxFlush = DemuxFlush; - pClient->DemuxRead = DemuxRead; - - pClient->GetPlayingTime = GetPlayingTime; - pClient->GetBufferTimeStart = GetBufferTimeStart; - pClient->GetBufferTimeEnd = GetBufferTimeEnd; - - pClient->GetBackendHostname = GetBackendHostname; - - pClient->IsTimeshifting = IsTimeshifting; - pClient->IsRealTimeStream = IsRealTimeStream; - - pClient->SetEPGTimeFrame = SetEPGTimeFrame; - - pClient->OnSystemSleep = OnSystemSleep; - pClient->OnSystemWake = OnSystemWake; - pClient->OnPowerSavingActivated = OnPowerSavingActivated; - pClient->OnPowerSavingDeactivated = OnPowerSavingDeactivated; + AddonInstance_PVR* pClient = static_cast(ptr); + + pClient->toAddon.addonInstance = nullptr; // used in future + + pClient->toAddon.GetAddonCapabilities = GetAddonCapabilities; + pClient->toAddon.GetStreamProperties = GetStreamProperties; + pClient->toAddon.GetConnectionString = GetConnectionString; + pClient->toAddon.GetBackendName = GetBackendName; + pClient->toAddon.GetBackendVersion = GetBackendVersion; + pClient->toAddon.GetDriveSpace = GetDriveSpace; + pClient->toAddon.OpenDialogChannelScan = OpenDialogChannelScan; + pClient->toAddon.MenuHook = CallMenuHook; + + pClient->toAddon.GetEpg = GetEPGForChannel; + + pClient->toAddon.GetChannelGroupsAmount = GetChannelGroupsAmount; + pClient->toAddon.GetChannelGroups = GetChannelGroups; + pClient->toAddon.GetChannelGroupMembers = GetChannelGroupMembers; + + pClient->toAddon.GetChannelsAmount = GetChannelsAmount; + pClient->toAddon.GetChannels = GetChannels; + pClient->toAddon.DeleteChannel = DeleteChannel; + pClient->toAddon.RenameChannel = RenameChannel; + pClient->toAddon.MoveChannel = MoveChannel; + pClient->toAddon.OpenDialogChannelSettings = OpenDialogChannelSettings; + pClient->toAddon.OpenDialogChannelAdd = OpenDialogChannelAdd; + + pClient->toAddon.GetRecordingsAmount = GetRecordingsAmount; + pClient->toAddon.GetRecordings = GetRecordings; + pClient->toAddon.DeleteRecording = DeleteRecording; + pClient->toAddon.UndeleteRecording = UndeleteRecording; + pClient->toAddon.DeleteAllRecordingsFromTrash = DeleteAllRecordingsFromTrash; + pClient->toAddon.RenameRecording = RenameRecording; + pClient->toAddon.SetRecordingPlayCount = SetRecordingPlayCount; + pClient->toAddon.SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition; + pClient->toAddon.GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition; + pClient->toAddon.GetRecordingEdl = GetRecordingEdl; + + pClient->toAddon.GetTimerTypes = GetTimerTypes; + pClient->toAddon.GetTimersAmount = GetTimersAmount; + pClient->toAddon.GetTimers = GetTimers; + pClient->toAddon.AddTimer = AddTimer; + pClient->toAddon.DeleteTimer = DeleteTimer; + pClient->toAddon.UpdateTimer = UpdateTimer; + + pClient->toAddon.OpenLiveStream = OpenLiveStream; + pClient->toAddon.CloseLiveStream = CloseLiveStream; + pClient->toAddon.ReadLiveStream = ReadLiveStream; + pClient->toAddon.SeekLiveStream = SeekLiveStream; + pClient->toAddon.PositionLiveStream = PositionLiveStream; + pClient->toAddon.LengthLiveStream = LengthLiveStream; + pClient->toAddon.SwitchChannel = SwitchChannel; + pClient->toAddon.SignalStatus = SignalStatus; + pClient->toAddon.GetLiveStreamURL = GetLiveStreamURL; + pClient->toAddon.GetChannelSwitchDelay = GetChannelSwitchDelay; + pClient->toAddon.CanPauseStream = CanPauseStream; + pClient->toAddon.PauseStream = PauseStream; + pClient->toAddon.CanSeekStream = CanSeekStream; + pClient->toAddon.SeekTime = SeekTime; + pClient->toAddon.SetSpeed = SetSpeed; + + pClient->toAddon.OpenRecordedStream = OpenRecordedStream; + pClient->toAddon.CloseRecordedStream = CloseRecordedStream; + pClient->toAddon.ReadRecordedStream = ReadRecordedStream; + pClient->toAddon.SeekRecordedStream = SeekRecordedStream; + pClient->toAddon.PositionRecordedStream = PositionRecordedStream; + pClient->toAddon.LengthRecordedStream = LengthRecordedStream; + + pClient->toAddon.DemuxReset = DemuxReset; + pClient->toAddon.DemuxAbort = DemuxAbort; + pClient->toAddon.DemuxFlush = DemuxFlush; + pClient->toAddon.DemuxRead = DemuxRead; + + pClient->toAddon.GetPlayingTime = GetPlayingTime; + pClient->toAddon.GetBufferTimeStart = GetBufferTimeStart; + pClient->toAddon.GetBufferTimeEnd = GetBufferTimeEnd; + + pClient->toAddon.GetBackendHostname = GetBackendHostname; + + pClient->toAddon.IsTimeshifting = IsTimeshifting; + pClient->toAddon.IsRealTimeStream = IsRealTimeStream; + + pClient->toAddon.SetEPGTimeFrame = SetEPGTimeFrame; + + pClient->toAddon.OnSystemSleep = OnSystemSleep; + pClient->toAddon.OnSystemWake = OnSystemWake; + pClient->toAddon.OnPowerSavingActivated = OnPowerSavingActivated; + pClient->toAddon.OnPowerSavingDeactivated = OnPowerSavingDeactivated; }; }; -- cgit v1.2.3