1 files changed, 90 insertions, 124 deletions
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
@@ -34,40 +34,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.
   * Used to check which options should be presented in the UI, which methods to call, etc.
@@ -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;
+    AddonInstance_PVR* pClient = static_cast<AddonInstance_PVR*>(ptr);
-    pClient->GetMininumPVRAPIVersion        = GetMininumPVRAPIVersion;
-    pClient->GetGUIAPIVersion               = GetGUIAPIVersion;
+    pClient->toAddon.addonInstance = nullptr; // used in future
-    pClient->GetMininumGUIAPIVersion        = GetMininumGUIAPIVersion;
-    pClient->GetAddonCapabilities           = GetAddonCapabilities;
+    pClient->toAddon.GetAddonCapabilities           = GetAddonCapabilities;
-    pClient->GetStreamProperties            = GetStreamProperties;
+    pClient->toAddon.GetStreamProperties            = GetStreamProperties;
-    pClient->GetConnectionString            = GetConnectionString;
+    pClient->toAddon.GetConnectionString            = GetConnectionString;
-    pClient->GetBackendName                 = GetBackendName;
+    pClient->toAddon.GetBackendName                 = GetBackendName;
-    pClient->GetBackendVersion              = GetBackendVersion;
+    pClient->toAddon.GetBackendVersion              = GetBackendVersion;
-    pClient->GetDriveSpace                  = GetDriveSpace;
+    pClient->toAddon.GetDriveSpace                  = GetDriveSpace;
-    pClient->OpenDialogChannelScan          = OpenDialogChannelScan;
+    pClient->toAddon.OpenDialogChannelScan          = OpenDialogChannelScan;
-    pClient->MenuHook                       = CallMenuHook;
+    pClient->toAddon.MenuHook                       = CallMenuHook;
-    pClient->GetEpg                         = GetEPGForChannel;
+    pClient->toAddon.GetEpg                         = GetEPGForChannel;
-    pClient->GetChannelGroupsAmount         = GetChannelGroupsAmount;
+    pClient->toAddon.GetChannelGroupsAmount         = GetChannelGroupsAmount;
-    pClient->GetChannelGroups               = GetChannelGroups;
+    pClient->toAddon.GetChannelGroups               = GetChannelGroups;
-    pClient->GetChannelGroupMembers         = GetChannelGroupMembers;
+    pClient->toAddon.GetChannelGroupMembers         = GetChannelGroupMembers;
-    pClient->GetChannelsAmount              = GetChannelsAmount;
+    pClient->toAddon.GetChannelsAmount              = GetChannelsAmount;
-    pClient->GetChannels                    = GetChannels;
+    pClient->toAddon.GetChannels                    = GetChannels;
-    pClient->DeleteChannel                  = DeleteChannel;
+    pClient->toAddon.DeleteChannel                  = DeleteChannel;
-    pClient->RenameChannel                  = RenameChannel;
+    pClient->toAddon.RenameChannel                  = RenameChannel;
-    pClient->MoveChannel                    = MoveChannel;
+    pClient->toAddon.MoveChannel                    = MoveChannel;
-    pClient->OpenDialogChannelSettings      = OpenDialogChannelSettings;
+    pClient->toAddon.OpenDialogChannelSettings      = OpenDialogChannelSettings;
-    pClient->OpenDialogChannelAdd           = OpenDialogChannelAdd;
+    pClient->toAddon.OpenDialogChannelAdd           = OpenDialogChannelAdd;
-    pClient->GetRecordingsAmount            = GetRecordingsAmount;
+    pClient->toAddon.GetRecordingsAmount            = GetRecordingsAmount;
-    pClient->GetRecordings                  = GetRecordings;
+    pClient->toAddon.GetRecordings                  = GetRecordings;
-    pClient->DeleteRecording                = DeleteRecording;
+    pClient->toAddon.DeleteRecording                = DeleteRecording;
-    pClient->UndeleteRecording              = UndeleteRecording;
+    pClient->toAddon.UndeleteRecording              = UndeleteRecording;
-    pClient->DeleteAllRecordingsFromTrash   = DeleteAllRecordingsFromTrash;
+    pClient->toAddon.DeleteAllRecordingsFromTrash   = DeleteAllRecordingsFromTrash;
-    pClient->RenameRecording                = RenameRecording;
+    pClient->toAddon.RenameRecording                = RenameRecording;
-    pClient->SetRecordingPlayCount          = SetRecordingPlayCount;
+    pClient->toAddon.SetRecordingPlayCount          = SetRecordingPlayCount;
-    pClient->SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition;
+    pClient->toAddon.SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition;
-    pClient->GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition;
+    pClient->toAddon.GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition;
-    pClient->GetRecordingEdl                = GetRecordingEdl;
+    pClient->toAddon.GetRecordingEdl                = GetRecordingEdl;
-    pClient->GetTimerTypes                  = GetTimerTypes;
+    pClient->toAddon.GetTimerTypes                  = GetTimerTypes;
-    pClient->GetTimersAmount                = GetTimersAmount;
+    pClient->toAddon.GetTimersAmount                = GetTimersAmount;
-    pClient->GetTimers                      = GetTimers;
+    pClient->toAddon.GetTimers                      = GetTimers;
-    pClient->AddTimer                       = AddTimer;
+    pClient->toAddon.AddTimer                       = AddTimer;
-    pClient->DeleteTimer                    = DeleteTimer;
+    pClient->toAddon.DeleteTimer                    = DeleteTimer;
-    pClient->UpdateTimer                    = UpdateTimer;
+    pClient->toAddon.UpdateTimer                    = UpdateTimer;
-    pClient->OpenLiveStream                 = OpenLiveStream;
+    pClient->toAddon.OpenLiveStream                 = OpenLiveStream;
-    pClient->CloseLiveStream                = CloseLiveStream;
+    pClient->toAddon.CloseLiveStream                = CloseLiveStream;
-    pClient->ReadLiveStream                 = ReadLiveStream;
+    pClient->toAddon.ReadLiveStream                 = ReadLiveStream;
-    pClient->SeekLiveStream                 = SeekLiveStream;
+    pClient->toAddon.SeekLiveStream                 = SeekLiveStream;
-    pClient->PositionLiveStream             = PositionLiveStream;
+    pClient->toAddon.PositionLiveStream             = PositionLiveStream;
-    pClient->LengthLiveStream               = LengthLiveStream;
+    pClient->toAddon.LengthLiveStream               = LengthLiveStream;
-    pClient->SwitchChannel                  = SwitchChannel;
+    pClient->toAddon.SwitchChannel                  = SwitchChannel;
-    pClient->SignalStatus                   = SignalStatus;
+    pClient->toAddon.SignalStatus                   = SignalStatus;
-    pClient->GetLiveStreamURL               = GetLiveStreamURL;
+    pClient->toAddon.GetLiveStreamURL               = GetLiveStreamURL;
-    pClient->GetChannelSwitchDelay          = GetChannelSwitchDelay;
+    pClient->toAddon.GetChannelSwitchDelay          = GetChannelSwitchDelay;
-    pClient->CanPauseStream                 = CanPauseStream;
+    pClient->toAddon.CanPauseStream                 = CanPauseStream;
-    pClient->PauseStream                    = PauseStream;
+    pClient->toAddon.PauseStream                    = PauseStream;
-    pClient->CanSeekStream                  = CanSeekStream;
+    pClient->toAddon.CanSeekStream                  = CanSeekStream;
-    pClient->SeekTime                       = SeekTime;
+    pClient->toAddon.SeekTime                       = SeekTime;
-    pClient->SetSpeed                       = SetSpeed;
+    pClient->toAddon.SetSpeed                       = SetSpeed;
-    pClient->OpenRecordedStream             = OpenRecordedStream;
+    pClient->toAddon.OpenRecordedStream             = OpenRecordedStream;
-    pClient->CloseRecordedStream            = CloseRecordedStream;
+    pClient->toAddon.CloseRecordedStream            = CloseRecordedStream;
-    pClient->ReadRecordedStream             = ReadRecordedStream;
+    pClient->toAddon.ReadRecordedStream             = ReadRecordedStream;
-    pClient->SeekRecordedStream             = SeekRecordedStream;
+    pClient->toAddon.SeekRecordedStream             = SeekRecordedStream;
-    pClient->PositionRecordedStream         = PositionRecordedStream;
+    pClient->toAddon.PositionRecordedStream         = PositionRecordedStream;
-    pClient->LengthRecordedStream           = LengthRecordedStream;
+    pClient->toAddon.LengthRecordedStream           = LengthRecordedStream;
-    pClient->DemuxReset                     = DemuxReset;
+    pClient->toAddon.DemuxReset                     = DemuxReset;
-    pClient->DemuxAbort                     = DemuxAbort;
+    pClient->toAddon.DemuxAbort                     = DemuxAbort;
-    pClient->DemuxFlush                     = DemuxFlush;
+    pClient->toAddon.DemuxFlush                     = DemuxFlush;
-    pClient->DemuxRead                      = DemuxRead;
+    pClient->toAddon.DemuxRead                      = DemuxRead;
-    pClient->GetPlayingTime                 = GetPlayingTime;
+    pClient->toAddon.GetPlayingTime                 = GetPlayingTime;
-    pClient->GetBufferTimeStart             = GetBufferTimeStart;
+    pClient->toAddon.GetBufferTimeStart             = GetBufferTimeStart;
-    pClient->GetBufferTimeEnd               = GetBufferTimeEnd;
+    pClient->toAddon.GetBufferTimeEnd               = GetBufferTimeEnd;
-    pClient->GetBackendHostname             = GetBackendHostname;
+    pClient->toAddon.GetBackendHostname             = GetBackendHostname;
-    pClient->IsTimeshifting                 = IsTimeshifting;
+    pClient->toAddon.IsTimeshifting                 = IsTimeshifting;
-    pClient->IsRealTimeStream               = IsRealTimeStream;
+    pClient->toAddon.IsRealTimeStream               = IsRealTimeStream;
-    pClient->SetEPGTimeFrame                = SetEPGTimeFrame;
+    pClient->toAddon.SetEPGTimeFrame                = SetEPGTimeFrame;
-    pClient->OnSystemSleep                  = OnSystemSleep;
+    pClient->toAddon.OnSystemSleep                  = OnSystemSleep;
-    pClient->OnSystemWake                   = OnSystemWake;
+    pClient->toAddon.OnSystemWake                   = OnSystemWake;
-    pClient->OnPowerSavingActivated         = OnPowerSavingActivated;
+    pClient->toAddon.OnPowerSavingActivated         = OnPowerSavingActivated;
-    pClient->OnPowerSavingDeactivated       = OnPowerSavingDeactivated;
+    pClient->toAddon.OnPowerSavingDeactivated       = OnPowerSavingDeactivated;
  };
 };

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
@@ -34,40 +34,6 @@ extern "C"
34	/! @name PVR add-on methods /	34	/! @name PVR add-on methods /
35	//@{	35	//@{
36	/*!	36	/*!
37	* Get the XBMC_PVR_API_VERSION that was used to compile this add-on.
38	* Used to check if this add-on is compatible with XBMC.
39	* @return The XBMC_PVR_API_VERSION that was used to compile this add-on.
40	* @remarks Valid implementation required.
41	*/
42	const char* GetPVRAPIVersion(void);
43
44	/*!
45	* Get the XBMC_PVR_MIN_API_VERSION that was used to compile this add-on.
46	* Used to check if this add-on is compatible with XBMC.
47	* @return The XBMC_PVR_MIN_API_VERSION that was used to compile this add-on.
48	* @remarks Valid implementation required.
49	*/
50	const char* GetMininumPVRAPIVersion(void);
51
52	/*!
53	* Get the XBMC_GUI_API_VERSION that was used to compile this add-on.
54	* Used to check if this add-on is compatible with XBMC.
55	* @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.
56	* @remarks Valid implementation required.
57	* @note see libKODI_guilib.h about related parts
58	*/
59	const char* GetGUIAPIVersion(void);
60
61	/*!
62	* Get the XBMC_GUI_MIN_API_VERSION that was used to compile this add-on.
63	* Used to check if this add-on is compatible with XBMC.
64	* @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.
65	* @remarks Valid implementation required.
66	* @note see libKODI_guilib.h about related parts
67	*/
68	const char* GetMininumGUIAPIVersion(void);
69
70	/*!
71	* Get the list of features that this add-on provides.	37	* Get the list of features that this add-on provides.
72	* Called by XBMC to query the add-on's capabilities.	38	* Called by XBMC to query the add-on's capabilities.
73	* Used to check which options should be presented in the UI, which methods to call, etc.	39	* Used to check which options should be presented in the UI, which methods to call, etc.
@@ -657,98 +623,98 @@ extern "C"
657		623
658	/*!	624	/*!
659	* Called by XBMC to assign the function pointers of this add-on to pClient.	625	* Called by XBMC to assign the function pointers of this add-on to pClient.
660	* @param pClient The struct to assign the function pointers to.	626	* @param ptr The struct to assign the function pointers to.
661	*/	627	*/
662	void __declspec(dllexport) get_addon(struct PVRClient* pClient)	628	void __declspec(dllexport) get_addon(void* ptr)
663	{	629	{
664	pClient->GetPVRAPIVersion = GetPVRAPIVersion;	630	AddonInstance_PVR* pClient = static_cast<AddonInstance_PVR*>(ptr);
665	pClient->GetMininumPVRAPIVersion = GetMininumPVRAPIVersion;	631
666	pClient->GetGUIAPIVersion = GetGUIAPIVersion;	632	pClient->toAddon.addonInstance = nullptr; // used in future
667	pClient->GetMininumGUIAPIVersion = GetMininumGUIAPIVersion;	633
668	pClient->GetAddonCapabilities = GetAddonCapabilities;	634	pClient->toAddon.GetAddonCapabilities = GetAddonCapabilities;
669	pClient->GetStreamProperties = GetStreamProperties;	635	pClient->toAddon.GetStreamProperties = GetStreamProperties;
670	pClient->GetConnectionString = GetConnectionString;	636	pClient->toAddon.GetConnectionString = GetConnectionString;
671	pClient->GetBackendName = GetBackendName;	637	pClient->toAddon.GetBackendName = GetBackendName;
672	pClient->GetBackendVersion = GetBackendVersion;	638	pClient->toAddon.GetBackendVersion = GetBackendVersion;
673	pClient->GetDriveSpace = GetDriveSpace;	639	pClient->toAddon.GetDriveSpace = GetDriveSpace;
674	pClient->OpenDialogChannelScan = OpenDialogChannelScan;	640	pClient->toAddon.OpenDialogChannelScan = OpenDialogChannelScan;
675	pClient->MenuHook = CallMenuHook;	641	pClient->toAddon.MenuHook = CallMenuHook;
676		642
677	pClient->GetEpg = GetEPGForChannel;	643	pClient->toAddon.GetEpg = GetEPGForChannel;
678		644
679	pClient->GetChannelGroupsAmount = GetChannelGroupsAmount;	645	pClient->toAddon.GetChannelGroupsAmount = GetChannelGroupsAmount;
680	pClient->GetChannelGroups = GetChannelGroups;	646	pClient->toAddon.GetChannelGroups = GetChannelGroups;
681	pClient->GetChannelGroupMembers = GetChannelGroupMembers;	647	pClient->toAddon.GetChannelGroupMembers = GetChannelGroupMembers;
682		648
683	pClient->GetChannelsAmount = GetChannelsAmount;	649	pClient->toAddon.GetChannelsAmount = GetChannelsAmount;
684	pClient->GetChannels = GetChannels;	650	pClient->toAddon.GetChannels = GetChannels;
685	pClient->DeleteChannel = DeleteChannel;	651	pClient->toAddon.DeleteChannel = DeleteChannel;
686	pClient->RenameChannel = RenameChannel;	652	pClient->toAddon.RenameChannel = RenameChannel;
687	pClient->MoveChannel = MoveChannel;	653	pClient->toAddon.MoveChannel = MoveChannel;
688	pClient->OpenDialogChannelSettings = OpenDialogChannelSettings;	654	pClient->toAddon.OpenDialogChannelSettings = OpenDialogChannelSettings;
689	pClient->OpenDialogChannelAdd = OpenDialogChannelAdd;	655	pClient->toAddon.OpenDialogChannelAdd = OpenDialogChannelAdd;
690		656
691	pClient->GetRecordingsAmount = GetRecordingsAmount;	657	pClient->toAddon.GetRecordingsAmount = GetRecordingsAmount;
692	pClient->GetRecordings = GetRecordings;	658	pClient->toAddon.GetRecordings = GetRecordings;
693	pClient->DeleteRecording = DeleteRecording;	659	pClient->toAddon.DeleteRecording = DeleteRecording;
694	pClient->UndeleteRecording = UndeleteRecording;	660	pClient->toAddon.UndeleteRecording = UndeleteRecording;
695	pClient->DeleteAllRecordingsFromTrash = DeleteAllRecordingsFromTrash;	661	pClient->toAddon.DeleteAllRecordingsFromTrash = DeleteAllRecordingsFromTrash;
696	pClient->RenameRecording = RenameRecording;	662	pClient->toAddon.RenameRecording = RenameRecording;
697	pClient->SetRecordingPlayCount = SetRecordingPlayCount;	663	pClient->toAddon.SetRecordingPlayCount = SetRecordingPlayCount;
698	pClient->SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition;	664	pClient->toAddon.SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition;
699	pClient->GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition;	665	pClient->toAddon.GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition;
700	pClient->GetRecordingEdl = GetRecordingEdl;	666	pClient->toAddon.GetRecordingEdl = GetRecordingEdl;
701		667
702	pClient->GetTimerTypes = GetTimerTypes;	668	pClient->toAddon.GetTimerTypes = GetTimerTypes;
703	pClient->GetTimersAmount = GetTimersAmount;	669	pClient->toAddon.GetTimersAmount = GetTimersAmount;
704	pClient->GetTimers = GetTimers;	670	pClient->toAddon.GetTimers = GetTimers;
705	pClient->AddTimer = AddTimer;	671	pClient->toAddon.AddTimer = AddTimer;
706	pClient->DeleteTimer = DeleteTimer;	672	pClient->toAddon.DeleteTimer = DeleteTimer;
707	pClient->UpdateTimer = UpdateTimer;	673	pClient->toAddon.UpdateTimer = UpdateTimer;
708		674
709	pClient->OpenLiveStream = OpenLiveStream;	675	pClient->toAddon.OpenLiveStream = OpenLiveStream;
710	pClient->CloseLiveStream = CloseLiveStream;	676	pClient->toAddon.CloseLiveStream = CloseLiveStream;
711	pClient->ReadLiveStream = ReadLiveStream;	677	pClient->toAddon.ReadLiveStream = ReadLiveStream;
712	pClient->SeekLiveStream = SeekLiveStream;	678	pClient->toAddon.SeekLiveStream = SeekLiveStream;
713	pClient->PositionLiveStream = PositionLiveStream;	679	pClient->toAddon.PositionLiveStream = PositionLiveStream;
714	pClient->LengthLiveStream = LengthLiveStream;	680	pClient->toAddon.LengthLiveStream = LengthLiveStream;
715	pClient->SwitchChannel = SwitchChannel;	681	pClient->toAddon.SwitchChannel = SwitchChannel;
716	pClient->SignalStatus = SignalStatus;	682	pClient->toAddon.SignalStatus = SignalStatus;
717	pClient->GetLiveStreamURL = GetLiveStreamURL;	683	pClient->toAddon.GetLiveStreamURL = GetLiveStreamURL;
718	pClient->GetChannelSwitchDelay = GetChannelSwitchDelay;	684	pClient->toAddon.GetChannelSwitchDelay = GetChannelSwitchDelay;
719	pClient->CanPauseStream = CanPauseStream;	685	pClient->toAddon.CanPauseStream = CanPauseStream;
720	pClient->PauseStream = PauseStream;	686	pClient->toAddon.PauseStream = PauseStream;
721	pClient->CanSeekStream = CanSeekStream;	687	pClient->toAddon.CanSeekStream = CanSeekStream;
722	pClient->SeekTime = SeekTime;	688	pClient->toAddon.SeekTime = SeekTime;
723	pClient->SetSpeed = SetSpeed;	689	pClient->toAddon.SetSpeed = SetSpeed;
724		690
725	pClient->OpenRecordedStream = OpenRecordedStream;	691	pClient->toAddon.OpenRecordedStream = OpenRecordedStream;
726	pClient->CloseRecordedStream = CloseRecordedStream;	692	pClient->toAddon.CloseRecordedStream = CloseRecordedStream;
727	pClient->ReadRecordedStream = ReadRecordedStream;	693	pClient->toAddon.ReadRecordedStream = ReadRecordedStream;
728	pClient->SeekRecordedStream = SeekRecordedStream;	694	pClient->toAddon.SeekRecordedStream = SeekRecordedStream;
729	pClient->PositionRecordedStream = PositionRecordedStream;	695	pClient->toAddon.PositionRecordedStream = PositionRecordedStream;
730	pClient->LengthRecordedStream = LengthRecordedStream;	696	pClient->toAddon.LengthRecordedStream = LengthRecordedStream;
731		697
732	pClient->DemuxReset = DemuxReset;	698	pClient->toAddon.DemuxReset = DemuxReset;
733	pClient->DemuxAbort = DemuxAbort;	699	pClient->toAddon.DemuxAbort = DemuxAbort;
734	pClient->DemuxFlush = DemuxFlush;	700	pClient->toAddon.DemuxFlush = DemuxFlush;
735	pClient->DemuxRead = DemuxRead;	701	pClient->toAddon.DemuxRead = DemuxRead;
736		702
737	pClient->GetPlayingTime = GetPlayingTime;	703	pClient->toAddon.GetPlayingTime = GetPlayingTime;
738	pClient->GetBufferTimeStart = GetBufferTimeStart;	704	pClient->toAddon.GetBufferTimeStart = GetBufferTimeStart;
739	pClient->GetBufferTimeEnd = GetBufferTimeEnd;	705	pClient->toAddon.GetBufferTimeEnd = GetBufferTimeEnd;
740		706
741	pClient->GetBackendHostname = GetBackendHostname;	707	pClient->toAddon.GetBackendHostname = GetBackendHostname;
742		708
743	pClient->IsTimeshifting = IsTimeshifting;	709	pClient->toAddon.IsTimeshifting = IsTimeshifting;
744	pClient->IsRealTimeStream = IsRealTimeStream;	710	pClient->toAddon.IsRealTimeStream = IsRealTimeStream;
745		711
746	pClient->SetEPGTimeFrame = SetEPGTimeFrame;	712	pClient->toAddon.SetEPGTimeFrame = SetEPGTimeFrame;
747		713
748	pClient->OnSystemSleep = OnSystemSleep;	714	pClient->toAddon.OnSystemSleep = OnSystemSleep;
749	pClient->OnSystemWake = OnSystemWake;	715	pClient->toAddon.OnSystemWake = OnSystemWake;
750	pClient->OnPowerSavingActivated = OnPowerSavingActivated;	716	pClient->toAddon.OnPowerSavingActivated = OnPowerSavingActivated;
751	pClient->OnPowerSavingDeactivated = OnPowerSavingDeactivated;	717	pClient->toAddon.OnPowerSavingDeactivated = OnPowerSavingDeactivated;
752	};	718	};
753	};	719	};
754		720