sync with upstreamHEADmaster

23 files changed, 11957 insertions, 1179 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDecoder.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDecoder.h
index 7407830..25e39e2 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDecoder.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDecoder.h
@@ -16,45 +16,51 @@
 #endif
 #include <stdint.h>
 
-namespace kodi { namespace addon { class CInstanceAudioDecoder; }}
+namespace kodi
+{
+namespace addon
+{
+  class CInstanceAudioDecoder;
+} /* namespace addon */
+} /* namespace kodi */
 
 extern "C"
 {
 
-  typedef struct AddonProps_AudioDecoder
-  {
-    int dummy;
-  } AddonProps_AudioDecoder;
+typedef struct AddonProps_AudioDecoder
+{
+  int dummy;
+} AddonProps_AudioDecoder;
 
-  typedef struct AddonToKodiFuncTable_AudioDecoder
-  {
-    void* kodiInstance;
-  } AddonToKodiFuncTable_AudioDecoder;
+typedef struct AddonToKodiFuncTable_AudioDecoder
+{
+  void* kodiInstance;
+} AddonToKodiFuncTable_AudioDecoder;
 
-  struct AddonInstance_AudioDecoder;
-  typedef struct KodiToAddonFuncTable_AudioDecoder
-  {
-    kodi::addon::CInstanceAudioDecoder* addonInstance;
-    bool (__cdecl* init) (const AddonInstance_AudioDecoder* instance,
-                          const char* file, unsigned int filecache,
-                          int* channels, int* samplerate,
-                          int* bitspersample, int64_t* totaltime,
-                          int* bitrate, AEDataFormat* format,
-                          const AEChannel** info);
-    int  (__cdecl* read_pcm) (const AddonInstance_AudioDecoder* instance, uint8_t* buffer, int size, int* actualsize);
-    int64_t  (__cdecl* seek) (const AddonInstance_AudioDecoder* instance, int64_t time);
-    bool (__cdecl* read_tag) (const AddonInstance_AudioDecoder* instance,
-                              const char* file, char* title,
-                              char* artist, int* length);
-    int  (__cdecl* track_count) (const AddonInstance_AudioDecoder* instance, const char* file);
-  } KodiToAddonFuncTable_AudioDecoder;
-
-  typedef struct AddonInstance_AudioDecoder
-  {
-    AddonProps_AudioDecoder props;
-    AddonToKodiFuncTable_AudioDecoder toKodi;
-    KodiToAddonFuncTable_AudioDecoder toAddon;
-  } AddonInstance_AudioDecoder;
+struct AddonInstance_AudioDecoder;
+typedef struct KodiToAddonFuncTable_AudioDecoder
+{
+  kodi::addon::CInstanceAudioDecoder* addonInstance;
+  bool (__cdecl* init)(const AddonInstance_AudioDecoder* instance,
+                       const char* file, unsigned int filecache,
+                       int* channels, int* samplerate,
+                       int* bitspersample, int64_t* totaltime,
+                       int* bitrate, AEDataFormat* format,
+                       const AEChannel** info);
+  int  (__cdecl* read_pcm)(const AddonInstance_AudioDecoder* instance, uint8_t* buffer, int size, int* actualsize);
+  int64_t  (__cdecl* seek)(const AddonInstance_AudioDecoder* instance, int64_t time);
+  bool (__cdecl* read_tag)(const AddonInstance_AudioDecoder* instance,
+                           const char* file, char* title,
+                           char* artist, int* length);
+  int  (__cdecl* track_count)(const AddonInstance_AudioDecoder* instance, const char* file);
+} KodiToAddonFuncTable_AudioDecoder;
+
+typedef struct AddonInstance_AudioDecoder
+{
+  AddonProps_AudioDecoder props;
+  AddonToKodiFuncTable_AudioDecoder toKodi;
+  KodiToAddonFuncTable_AudioDecoder toAddon;
+} AddonInstance_AudioDecoder;
 
 } /* extern "C" */
 
@@ -63,167 +69,295 @@ namespace kodi
 namespace addon
 {
 
-  class CInstanceAudioDecoder : public IAddonInstance
+//==============================================================================
+///
+/// \addtogroup cpp_kodi_addon_audiodecoder
+/// @brief \cpp_class{ kodi::addon::CInstanceAudioDecoder }
+/// **Audio decoder add-on instance**
+///
+/// For audio decoders as binary add-ons. This class implements a way to handle
+/// special types of audio files.
+///
+/// The add-on handles loading of the source file and outputting the audio stream
+/// for consumption by the player.
+///
+/// The addon.xml defines the capabilities of this add-on.
+///
+/// @note The option to have multiple instances is possible with audio-decoder
+/// add-ons. This is useful, since some playback engines are riddled by global
+/// variables, making decoding of multiple streams using the same instance
+/// impossible.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Here's an example on addon.xml:**
+/// ~~~~~~~~~~~~~{.xml}
+///   <extension
+///     point="kodi.audiodecoder"
+///     name="2sf"
+///     extension=".2sf|.mini2sf"
+///     tags="true"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+/// ~~~~~~~~~~~~~
+///
+/// Description to audio decoder related addon.xml values:
+/// | Name                          | Description
+/// |:------------------------------|----------------------------------------
+/// | <b>`point`</b>                | Addon type specification<br>At all addon types and for this kind always <b>"kodi.audiodecoder"</b>.
+/// | <b>`library_@PLATFORM@`</b>   | Sets the used library name, which is automatically set by cmake at addon build.
+/// | <b>`name`</b>                 | The name of the decoder used in Kodi for display.
+/// | <b>`extension`</b>            | The file extensions / styles supported by this addon.
+/// | <b>`tags`</b>                 | Boolean to point out that addon can bring own information to replayed file, if <b>`false`</b> only the file name is used as info.<br>If <b>`true`</b>, \ref CInstanceAudioDecoder::ReadTag is used and must be implemented.
+///
+/// --------------------------------------------------------------------------
+///
+/// **Here is a code example how this addon is used:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/AudioDecoder.h>
+///
+/// class CMyAudioDecoder : public ::kodi::addon::CInstanceAudioDecoder
+/// {
+/// public:
+///   CMyAudioDecoder(KODI_HANDLE instance);
+///
+///   bool Init(const std::string& filename, unsigned int filecache,
+///             int& channels, int& samplerate,
+///             int& bitspersample, int64_t& totaltime,
+///             int& bitrate, AEDataFormat& format,
+///             std::vector<AEChannel>& channellist) override;
+///   int ReadPCM(uint8_t* buffer, int size, int& actualsize) override;
+/// };
+///
+/// CMyAudioDecoder::CMyAudioDecoder(KODI_HANDLE instance)
+///   : CInstanceAudioDecoder(instance)
+/// {
+///   ...
+/// }
+///
+/// bool CMyAudioDecoder::Init(const std::string& filename, unsigned int filecache,
+///                            int& channels, int& samplerate,
+///                            int& bitspersample, int64_t& totaltime,
+///                            int& bitrate, AEDataFormat& format,
+///                            std::vector<AEChannel>& channellist)
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// int CMyAudioDecoder::ReadPCM(uint8_t* buffer, int size, int& actualsize)
+/// {
+///   ...
+///   return 0;
+/// }
+///
+///
+/// /*----------------------------------------------------------------------*/
+///
+/// class CMyAddon : public ::kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() { }
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               std::string instanceID,
+///                               KODI_HANDLE instance,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// /* If you use only one instance in your add-on, can be instanceType and
+///  * instanceID ignored */
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       std::string instanceID,
+///                                       KODI_HANDLE instance,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_AUDIODECODER)
+///   {
+///     kodi::Log(ADDON_LOG_NOTICE, "Creating my audio decoder");
+///     addonInstance = new CMyAudioDecoder(instance);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyAudioDecoder` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+class ATTRIBUTE_HIDDEN CInstanceAudioDecoder : public IAddonInstance
+{
+public:
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Class constructor
+  ///
+  /// @param[in] instance The addon instance class handler given by Kodi
+  ///                     at \ref kodi::addon::CAddonBase::CreateInstance(...)
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///                        @note Recommended to set.
+  ///
+  explicit CInstanceAudioDecoder(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_AUDIODECODER,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_AUDIODECODER))
   {
-  public:
-    //==========================================================================
-    /// @brief Class constructor
-    ///
-    /// @param[in] instance             The from Kodi given instance given be
-    ///                                 add-on CreateInstance call with instance
-    ///                                 id ADDON_INSTANCE_AUDIODECODER.
-    explicit CInstanceAudioDecoder(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_AUDIODECODER)
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceAudioDecoder: Creation of multiple together with single instance way is not allowed!");
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceAudioDecoder: Creation of multiple together with single instance way is not allowed!");
 
-      SetAddonStruct(instance);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// @ingroup cpp_kodi_addon_audiodecoder
-    /// @brief Initialize a decoder
-    ///
-    /// @param[in] filename             The file to read
-    /// @param[in] filecache            The file cache size
-    /// @param[out] channels            Number of channels in output stream
-    /// @param[out] samplerate          Samplerate of output stream
-    /// @param[out] bitspersample       Bits per sample in output stream
-    /// @param[out] totaltime           Total time for stream
-    /// @param[out] bitrate             Average bitrate of input stream
-    /// @param[out] format              Data format for output stream
-    /// @param[out] channellist         Channel mapping for output stream
-    /// @return                         true if successfully done, otherwise
-    ///                                 false
-    ///
-    virtual bool Init(const std::string& filename, unsigned int filecache,
-                      int& channels, int& samplerate,
-                      int& bitspersample, int64_t& totaltime,
-                      int& bitrate, AEDataFormat& format,
-                      std::vector<AEChannel>& channellist) = 0;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// @ingroup cpp_kodi_addon_audiodecoder
-    /// @brief Produce some noise
-    ///
-    /// @param[in] buffer               Output buffer
-    /// @param[in] size                 Size of output buffer
-    /// @param[out] actualsize          Actual number of bytes written to output buffer
-    /// @return                         Return with following possible values:
-    ///                                 | Value | Description                  |
-    ///                                 |:-----:|:-----------------------------|
-    ///                                 |   0   | on success
-    ///                                 |  -1   | on end of stream
-    ///                                 |   1   | on failure
-    ///
-    virtual int ReadPCM(uint8_t* buffer, int size, int& actualsize) = 0;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// @ingroup cpp_kodi_addon_audiodecoder
-    /// @brief Seek in output stream
-    ///
-    /// @param[in] time                 Time position to seek to in milliseconds
-    /// @return                         Time position seek ended up on
-    ///
-    virtual int64_t Seek(int64_t time) { return time; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// @ingroup cpp_kodi_addon_audiodecoder
-    /// @brief Read tag of a file
-    ///
-    /// @param[in] file                 File to read tag for
-    /// @param[out] title               Title of file
-    /// @param[out] artist              Artist of file
-    /// @param[out] length              Length of file
-    /// @return                         True on success, false on failure
-    ///
-    virtual bool ReadTag(const std::string& file, std::string& title, std::string& artist, int& length) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// @ingroup cpp_kodi_addon_audiodecoder
-    /// @brief Get number of tracks in a file
-    ///
-    /// @param[in] file                 File to read tag for
-    /// @return                         Number of tracks in file
-    ///
-    virtual int TrackCount(const std::string& file) { return 1; }
-    //--------------------------------------------------------------------------
-
-  private:
-    void SetAddonStruct(KODI_HANDLE instance)
-    {
-      if (instance == nullptr)
-        throw std::logic_error("kodi::addon::CInstanceAudioDecoder: Creation with empty addon structure not allowed, table must be given from Kodi!");
+    SetAddonStruct(instance);
+  }
+  //--------------------------------------------------------------------------
 
-      m_instanceData = static_cast<AddonInstance_AudioDecoder*>(instance);
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Initialize a decoder
+  ///
+  /// @param[in] filename             The file to read
+  /// @param[in] filecache            The file cache size
+  /// @param[out] channels            Number of channels in output stream
+  /// @param[out] samplerate          Samplerate of output stream
+  /// @param[out] bitspersample       Bits per sample in output stream
+  /// @param[out] totaltime           Total time for stream
+  /// @param[out] bitrate             Average bitrate of input stream
+  /// @param[out] format              Data format for output stream
+  /// @param[out] channellist         Channel mapping for output stream
+  /// @return                         true if successfully done, otherwise
+  ///                                 false
+  ///
+  virtual bool Init(const std::string& filename, unsigned int filecache,
+                    int& channels, int& samplerate,
+                    int& bitspersample, int64_t& totaltime,
+                    int& bitrate, AEDataFormat& format,
+                    std::vector<AEChannel>& channellist) = 0;
+  //--------------------------------------------------------------------------
 
-      m_instanceData->toAddon.addonInstance = this;
-      m_instanceData->toAddon.init = ADDON_Init;
-      m_instanceData->toAddon.read_pcm = ADDON_ReadPCM;
-      m_instanceData->toAddon.seek = ADDON_Seek;
-      m_instanceData->toAddon.read_tag = ADDON_ReadTag;
-      m_instanceData->toAddon.track_count = ADDON_TrackCount;
-    }
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Produce some noise
+  ///
+  /// @param[in] buffer               Output buffer
+  /// @param[in] size                 Size of output buffer
+  /// @param[out] actualsize          Actual number of bytes written to output buffer
+  /// @return                         Return with following possible values:
+  ///                                 | Value | Description                  |
+  ///                                 |:-----:|:-----------------------------|
+  ///                                 |   0   | on success
+  ///                                 |  -1   | on end of stream
+  ///                                 |   1   | on failure
+  ///
+  virtual int ReadPCM(uint8_t* buffer, int size, int& actualsize) = 0;
+  //--------------------------------------------------------------------------
 
-    inline static bool ADDON_Init(const AddonInstance_AudioDecoder* instance, const char* file, unsigned int filecache,
-                                  int* channels, int* samplerate,
-                                  int* bitspersample, int64_t* totaltime,
-                                  int* bitrate, AEDataFormat* format,
-                                  const AEChannel** info)
-    {
-      instance->toAddon.addonInstance->m_channelList.clear();
-      bool ret = instance->toAddon.addonInstance->Init(file, filecache, *channels,
-                                                           *samplerate, *bitspersample,
-                                                           *totaltime, *bitrate, *format,
-                                                           instance->toAddon.addonInstance->m_channelList);
-      if (!instance->toAddon.addonInstance->m_channelList.empty())
-      {
-        if (instance->toAddon.addonInstance->m_channelList.back() != AE_CH_NULL)
-          instance->toAddon.addonInstance->m_channelList.push_back(AE_CH_NULL);
-        *info = instance->toAddon.addonInstance->m_channelList.data();
-      }
-      else
-        *info = nullptr;
-      return ret;
-    }
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Seek in output stream
+  ///
+  /// @param[in] time                 Time position to seek to in milliseconds
+  /// @return                         Time position seek ended up on
+  ///
+  virtual int64_t Seek(int64_t time) { return time; }
+  //--------------------------------------------------------------------------
 
-    inline static int ADDON_ReadPCM(const AddonInstance_AudioDecoder* instance, uint8_t* buffer, int size, int* actualsize)
-    {
-      return instance->toAddon.addonInstance->ReadPCM(buffer, size, *actualsize);
-    }
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Read tag of a file
+  ///
+  /// @param[in] file                 File to read tag for
+  /// @param[out] title               Title of file
+  /// @param[out] artist              Artist of file
+  /// @param[out] length              Length of file
+  /// @return                         True on success, false on failure
+  ///
+  virtual bool ReadTag(const std::string& file, std::string& title, std::string& artist, int& length) { return false; }
+  //--------------------------------------------------------------------------
 
-    inline static int64_t ADDON_Seek(const AddonInstance_AudioDecoder* instance, int64_t time)
-    {
-      return instance->toAddon.addonInstance->Seek(time);
-    }
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_audiodecoder
+  /// @brief Get number of tracks in a file
+  ///
+  /// @param[in] file                 File to read tag for
+  /// @return                         Number of tracks in file
+  ///
+  virtual int TrackCount(const std::string& file) { return 1; }
+  //--------------------------------------------------------------------------
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceAudioDecoder: Creation with empty addon structure not allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_AudioDecoder*>(instance);
 
-    inline static bool ADDON_ReadTag(const AddonInstance_AudioDecoder* instance, const char* file, char* title, char* artist, int* length)
+    m_instanceData->toAddon.addonInstance = this;
+    m_instanceData->toAddon.init = ADDON_Init;
+    m_instanceData->toAddon.read_pcm = ADDON_ReadPCM;
+    m_instanceData->toAddon.seek = ADDON_Seek;
+    m_instanceData->toAddon.read_tag = ADDON_ReadTag;
+    m_instanceData->toAddon.track_count = ADDON_TrackCount;
+  }
+
+  inline static bool ADDON_Init(const AddonInstance_AudioDecoder* instance, const char* file, unsigned int filecache,
+                                int* channels, int* samplerate,
+                                int* bitspersample, int64_t* totaltime,
+                                int* bitrate, AEDataFormat* format,
+                                const AEChannel** info)
+  {
+    instance->toAddon.addonInstance->m_channelList.clear();
+    bool ret = instance->toAddon.addonInstance->Init(file, filecache, *channels,
+                                                          *samplerate, *bitspersample,
+                                                          *totaltime, *bitrate, *format,
+                                                          instance->toAddon.addonInstance->m_channelList);
+    if (!instance->toAddon.addonInstance->m_channelList.empty())
     {
-      std::string intTitle;
-      std::string intArtist;
-      bool ret = instance->toAddon.addonInstance->ReadTag(file, intTitle, intArtist, *length);
-      if (ret)
-      {
-        strncpy(title, intTitle.c_str(), ADDON_STANDARD_STRING_LENGTH_SMALL-1);
-        strncpy(artist, intArtist.c_str(), ADDON_STANDARD_STRING_LENGTH_SMALL-1);
-      }
-      return ret;
+      if (instance->toAddon.addonInstance->m_channelList.back() != AE_CH_NULL)
+        instance->toAddon.addonInstance->m_channelList.push_back(AE_CH_NULL);
+      *info = instance->toAddon.addonInstance->m_channelList.data();
     }
+    else
+      *info = nullptr;
+    return ret;
+  }
 
-    inline static int ADDON_TrackCount(const AddonInstance_AudioDecoder* instance, const char* file)
+  inline static int ADDON_ReadPCM(const AddonInstance_AudioDecoder* instance, uint8_t* buffer, int size, int* actualsize)
+  {
+    return instance->toAddon.addonInstance->ReadPCM(buffer, size, *actualsize);
+  }
+
+  inline static int64_t ADDON_Seek(const AddonInstance_AudioDecoder* instance, int64_t time)
+  {
+    return instance->toAddon.addonInstance->Seek(time);
+  }
+
+  inline static bool ADDON_ReadTag(const AddonInstance_AudioDecoder* instance, const char* file, char* title, char* artist, int* length)
+  {
+    std::string intTitle;
+    std::string intArtist;
+    bool ret = instance->toAddon.addonInstance->ReadTag(file, intTitle, intArtist, *length);
+    if (ret)
     {
-      return instance->toAddon.addonInstance->TrackCount(file);
+      strncpy(title, intTitle.c_str(), ADDON_STANDARD_STRING_LENGTH_SMALL-1);
+      strncpy(artist, intArtist.c_str(), ADDON_STANDARD_STRING_LENGTH_SMALL-1);
     }
+    return ret;
+  }
+
+  inline static int ADDON_TrackCount(const AddonInstance_AudioDecoder* instance, const char* file)
+  {
+    return instance->toAddon.addonInstance->TrackCount(file);
+  }
 
-    std::vector<AEChannel> m_channelList;
-    AddonInstance_AudioDecoder* m_instanceData;
-  };
+  std::vector<AEChannel> m_channelList;
+  AddonInstance_AudioDecoder* m_instanceData;
+};
 
 } /* namespace addon */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
index b98884e..36257e1 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
@@ -55,7 +55,7 @@ namespace kodi
 namespace addon
 {
 
-  class CInstanceAudioEncoder : public IAddonInstance
+  class ATTRIBUTE_HIDDEN CInstanceAudioEncoder : public IAddonInstance
   {
   public:
     //==========================================================================
@@ -64,8 +64,14 @@ namespace addon
     /// @param[in] instance             The from Kodi given instance given be
     ///                                 add-on CreateInstance call with instance
     ///                                 id ADDON_INSTANCE_AUDIOENCODER.
-    explicit CInstanceAudioEncoder(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_AUDIOENCODER)
+    /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+    ///                        allow compatibility to older Kodi versions.
+    ///                        @note Recommended to set.
+    ///
+    explicit CInstanceAudioEncoder(KODI_HANDLE instance, const std::string& kodiVersion = "")
+      : IAddonInstance(ADDON_INSTANCE_AUDIOENCODER,
+                       !kodiVersion.empty() ? kodiVersion
+                                            : GetKodiTypeVersion(ADDON_INSTANCE_AUDIOENCODER))
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstanceAudioEncoder: Creation of multiple together with single instance way is not allowed!");
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt
index 44aaf05..8fa6e05 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/CMakeLists.txt
@@ -1,9 +1,11 @@
 set(HEADERS AudioDecoder.h
             AudioEncoder.h
+            Game.h
             ImageDecoder.h
             Inputstream.h
             Peripheral.h
             PeripheralUtils.h
+            PVR.h
             Screensaver.h
             VFS.h
             VideoCodec.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Game.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Game.h
new file mode 100644
index 0000000..a53f1e7
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Game.h
@@ -0,0 +1,2360 @@
+/*
+ *  Copyright (C) 2014-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+
+#ifdef BUILD_KODI_ADDON
+#include "XBMC_vkeys.h"
+#else
+#include "input/XBMC_vkeys.h"
+#endif
+
+//==============================================================================
+/// @addtogroup cpp_kodi_addon_game
+///
+/// To use on Libretro and for stand-alone games or emulators that does not use
+/// the Libretro API.
+///
+/// Possible examples could be, Nvidia GameStream via Limelight or WINE capture
+/// could possible through the Game API.
+///
+
+namespace kodi
+{
+namespace addon
+{
+class CInstanceGame;
+}
+} // namespace kodi
+
+extern "C"
+{
+
+//==============================================================================
+/// \defgroup cpp_kodi_addon_game_Defs Definitions, structures and enumerators
+/// \ingroup cpp_kodi_addon_game
+/// @brief **Game add-on instance definition values**
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **Port ID used when topology is unknown**
+#define DEFAULT_PORT_ID "1"
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **Game add-on error codes**
+///
+/// Used as return values on most Game related functions.
+///
+typedef enum GAME_ERROR
+{
+  /// @brief no error occurred
+  GAME_ERROR_NO_ERROR,
+
+  /// @brief an unknown error occurred
+  GAME_ERROR_UNKNOWN,
+
+  /// @brief the method that the frontend called is not implemented
+  GAME_ERROR_NOT_IMPLEMENTED,
+
+  /// @brief the command was rejected by the game client
+  GAME_ERROR_REJECTED,
+
+  /// @brief the parameters of the method that was called are invalid for this operation
+  GAME_ERROR_INVALID_PARAMETERS,
+
+  /// @brief the command failed
+  GAME_ERROR_FAILED,
+
+  /// @brief no game is loaded
+  GAME_ERROR_NOT_LOADED,
+
+  /// @brief game requires restricted resources
+  GAME_ERROR_RESTRICTED,
+} GAME_ERROR;
+//------------------------------------------------------------------------------
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+/// \defgroup cpp_kodi_addon_game_Defs_AudioStream 1. Audio stream
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **The for Audio stream used data system**
+///
+/// Used to give Addon currently used audio stream configuration on Kodi and
+/// arrays to give related data to Kodi on callbacks.
+///
+//@{
+
+//==============================================================================
+/// @brief **Stream Format**
+///
+/// From Kodi requested specified audio sample format.
+///
+typedef enum GAME_PCM_FORMAT
+{
+  GAME_PCM_FORMAT_UNKNOWN,
+
+  /// @brief S16NE sample format
+  GAME_PCM_FORMAT_S16NE,
+} GAME_PCM_FORMAT;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Audio channel**
+///
+/// Channel identification flags.
+///
+typedef enum GAME_AUDIO_CHANNEL
+{
+  /// @brief Channel list terminator
+  GAME_CH_NULL,
+
+  /// @brief Channel front left
+  GAME_CH_FL,
+
+  /// @brief Channel front right
+  GAME_CH_FR,
+
+  /// @brief Channel front center
+  GAME_CH_FC,
+
+  /// @brief Channel Low Frequency Effects / Subwoofer
+  GAME_CH_LFE,
+
+  /// @brief Channel back left
+  GAME_CH_BL,
+
+  /// @brief Channel back right
+  GAME_CH_BR,
+
+  /// @brief Channel front left over center
+  GAME_CH_FLOC,
+
+  /// @brief Channel front right over center
+  GAME_CH_FROC,
+
+  /// @brief Channel back center
+  GAME_CH_BC,
+
+  /// @brief Channel surround/side left
+  GAME_CH_SL,
+
+  /// @brief Channel surround/side right
+  GAME_CH_SR,
+
+  /// @brief Channel top front left
+  GAME_CH_TFL,
+
+  /// @brief Channel top front right
+  GAME_CH_TFR,
+
+  /// @brief Channel top front center
+  GAME_CH_TFC,
+
+  /// @brief Channel top center
+  GAME_CH_TC,
+
+  /// @brief Channel top back left
+  GAME_CH_TBL,
+
+  /// @brief Channel top back right
+  GAME_CH_TBR,
+
+  /// @brief Channel top back center
+  GAME_CH_TBC,
+
+  /// @brief Channel bacl left over center
+  GAME_CH_BLOC,
+
+  /// @brief Channel back right over center
+  GAME_CH_BROC,
+} GAME_AUDIO_CHANNEL;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Game audio stream properties**
+///
+/// Used by Kodi to pass the currently required audio stream settings to the addon
+///
+typedef struct game_stream_audio_properties
+{
+  GAME_PCM_FORMAT format;
+  const GAME_AUDIO_CHANNEL* channel_map;
+} ATTRIBUTE_PACKED game_stream_audio_properties;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Audio stream packet**
+///
+/// This packet contains audio stream data passed to Kodi.
+///
+typedef struct game_stream_audio_packet
+{
+  /// @brief Pointer for audio stream data given to Kodi
+  const uint8_t *data;
+
+  /// @brief Size of data array
+  size_t size;
+} ATTRIBUTE_PACKED game_stream_audio_packet;
+//------------------------------------------------------------------------------
+
+//@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+/// \defgroup cpp_kodi_addon_game_Defs_VideoStream 2. Video stream
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **The for Video stream used data system**
+///
+/// Used to give Addon currently used video stream configuration on Kodi and
+/// arrays to give related data to Kodi on callbacks.
+///
+//@{
+
+//==============================================================================
+/// @brief **Pixel format**
+///
+/// From Kodi requested specified video RGB color model format.
+///
+typedef enum GAME_PIXEL_FORMAT
+{
+  GAME_PIXEL_FORMAT_UNKNOWN,
+
+  /// @brief 0RGB8888 Format
+  GAME_PIXEL_FORMAT_0RGB8888,
+
+  /// @brief RGB565 Format
+  GAME_PIXEL_FORMAT_RGB565,
+
+  /// @brief 0RGB1555 Format
+  GAME_PIXEL_FORMAT_0RGB1555,
+} GAME_PIXEL_FORMAT;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Video rotation position**
+///
+/// To define position how video becomes shown.
+///
+typedef enum GAME_VIDEO_ROTATION
+{
+  /// @brief 0° and Without rotation
+  GAME_VIDEO_ROTATION_0,
+
+  /// @brief rotate 90° counterclockwise
+  GAME_VIDEO_ROTATION_90_CCW,
+
+  /// @brief rotate 180° counterclockwise
+  GAME_VIDEO_ROTATION_180_CCW,
+
+  /// @brief rotate 270° counterclockwise
+  GAME_VIDEO_ROTATION_270_CCW,
+} GAME_VIDEO_ROTATION;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Game video stream properties**
+///
+/// Used by Kodi to pass the currently required video stream settings to the addon
+///
+typedef struct game_stream_video_properties
+{
+  /// @brief The to used pixel format
+  GAME_PIXEL_FORMAT format;
+
+  /// @brief The nominal used width
+  unsigned int nominal_width;
+
+  /// @brief The nominal used height
+  unsigned int nominal_height;
+
+  /// @brief The maximal used width
+  unsigned int max_width;
+
+  /// @brief The maximal used height
+  unsigned int max_height;
+
+  /// @brief On video stream used aspect ration
+  ///
+  /// @note If aspect_ratio is <= 0.0, an aspect ratio of nominal_width / nominal_height is assumed
+  float aspect_ratio;
+} ATTRIBUTE_PACKED game_stream_video_properties;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Video stream packet**
+///
+/// This packet contains video stream data passed to Kodi.
+///
+typedef struct game_stream_video_packet
+{
+  /// @brief Video height
+  unsigned int width;
+
+  /// @brief Video width
+  unsigned int height;
+
+  /// @brief Width @ref GAME_VIDEO_ROTATION defined rotation angle.
+  GAME_VIDEO_ROTATION rotation;
+
+  /// @brief Pointer for video stream data given to Kodi
+  const uint8_t *data;
+
+  /// @brief Size of data array
+  size_t size;
+} ATTRIBUTE_PACKED game_stream_video_packet;
+//------------------------------------------------------------------------------
+
+//@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+/// \defgroup cpp_kodi_addon_game_Defs_HardwareFramebuffer 3. Hardware framebuffer stream
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **Hardware framebuffer stream data**
+///
+//@{
+
+//==============================================================================
+/// @brief **Hardware framebuffer type**
+///
+typedef enum GAME_HW_CONTEXT_TYPE
+{
+  /// @brief None context
+  GAME_HW_CONTEXT_NONE,
+
+  /// @brief OpenGL 2.x. Driver can choose to use latest compatibility context
+  GAME_HW_CONTEXT_OPENGL,
+
+  /// @brief OpenGL ES 2.0
+  GAME_HW_CONTEXT_OPENGLES2,
+
+  /// @brief Modern desktop core GL context. Use major/minor fields to set GL version
+  GAME_HW_CONTEXT_OPENGL_CORE,
+
+  /// @brief OpenGL ES 3.0
+  GAME_HW_CONTEXT_OPENGLES3,
+
+  /// @brief OpenGL ES 3.1+. Set major/minor fields.
+  GAME_HW_CONTEXT_OPENGLES_VERSION,
+
+  /// @brief Vulkan
+  GAME_HW_CONTEXT_VULKAN
+} GAME_HW_CONTEXT_TYPE;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Hardware framebuffer properties**
+///
+typedef struct game_stream_hw_framebuffer_properties
+{
+  /// @brief The API to use.
+  ///
+  GAME_HW_CONTEXT_TYPE context_type;
+
+  /// @brief Set if render buffers should have depth component attached.
+  ///
+  /// @todo: Obsolete
+  ///
+  bool depth;
+
+  /// @brief Set if stencil buffers should be attached.
+  ///
+  /// If depth and stencil are true, a packed 24/8 buffer will be added.
+  /// Only attaching stencil is invalid and will be ignored.
+  ///
+  /// @todo: Obsolete.
+  ///
+  bool stencil;
+
+  /// @brief Use conventional bottom-left origin convention.
+  ///
+  /// If false, standard top-left origin semantics are used.
+  ///
+  /// @todo: Move to GL specific interface
+  ///
+  bool bottom_left_origin;
+
+  /// @brief Major version number for core GL context or GLES 3.1+.
+  unsigned int version_major;
+
+  /// @brief Minor version number for core GL context or GLES 3.1+.
+  unsigned int version_minor;
+
+  /// @brief If this is true, the frontend will go very far to avoid resetting context
+  /// in scenarios like toggling fullscreen, etc.
+  ///
+  /// @todo: Obsolete? Maybe frontend should just always assume this...
+  ///
+  /// The reset callback might still be called in extreme situations such as if
+  /// the context is lost beyond recovery.
+  ///
+  /// For optimal stability, set this to false, and allow context to be reset at
+  /// any time.
+  ///
+  bool cache_context;
+
+  /// @brief Creates a debug context.
+  bool debug_context;
+} ATTRIBUTE_PACKED game_stream_hw_framebuffer_properties;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Hardware framebuffer buffer**
+///
+typedef struct game_stream_hw_framebuffer_buffer
+{
+  /// @brief
+  uintptr_t framebuffer;
+} ATTRIBUTE_PACKED game_stream_hw_framebuffer_buffer;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Hardware framebuffer packet**
+///
+typedef struct game_stream_hw_framebuffer_packet
+{
+  /// @brief
+  uintptr_t framebuffer;
+} ATTRIBUTE_PACKED game_stream_hw_framebuffer_packet;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Hardware framebuffer process function address**
+///
+typedef void (*game_proc_address_t)(void);
+//------------------------------------------------------------------------------
+
+//@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+/// \defgroup cpp_kodi_addon_game_Defs_SoftwareFramebuffer 4. Software framebuffer stream
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **Software framebuffer stream data**
+///
+//@{
+
+//==============================================================================
+/// @brief **Game video stream properties**
+///
+/// Used by Kodi to pass the currently required video stream settings to the addon
+///
+typedef game_stream_video_properties game_stream_sw_framebuffer_properties;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Hardware framebuffer type**
+///
+typedef struct game_stream_sw_framebuffer_buffer
+{
+  GAME_PIXEL_FORMAT format;
+  uint8_t *data;
+  size_t size;
+} ATTRIBUTE_PACKED game_stream_sw_framebuffer_buffer;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Video stream packet**
+///
+/// This packet contains video stream data passed to Kodi.
+///
+typedef game_stream_video_packet game_stream_sw_framebuffer_packet;
+//------------------------------------------------------------------------------
+
+//@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+/// \defgroup cpp_kodi_addon_game_Defs_StreamTypes 5. Stream types
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **Stream types data**
+///
+//@{
+
+//==============================================================================
+/// @brief **Game stream types**
+///
+typedef enum GAME_STREAM_TYPE
+{
+  /// @brief Unknown
+  GAME_STREAM_UNKNOWN,
+
+  /// @brief Audio stream
+  GAME_STREAM_AUDIO,
+
+  /// @brief Video stream
+  GAME_STREAM_VIDEO,
+
+  /// @brief Hardware framebuffer
+  GAME_STREAM_HW_FRAMEBUFFER,
+
+  /// @brief Software framebuffer
+  GAME_STREAM_SW_FRAMEBUFFER,
+} GAME_STREAM_TYPE;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Immutable stream metadata**
+///
+/// This metadata is provided when the stream is opened. If any stream
+/// properties change, a new stream must be opened.
+///
+typedef struct game_stream_properties
+{
+  /// @brief
+  GAME_STREAM_TYPE type;
+  union
+  {
+    /// @brief
+    game_stream_audio_properties audio;
+
+    /// @brief
+    game_stream_video_properties video;
+
+    /// @brief
+    game_stream_hw_framebuffer_properties hw_framebuffer;
+
+    /// @brief
+    game_stream_sw_framebuffer_properties sw_framebuffer;
+  };
+} ATTRIBUTE_PACKED game_stream_properties;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Stream buffers for hardware rendering and zero-copy support**
+///
+typedef struct game_stream_buffer
+{
+  /// @brief
+  GAME_STREAM_TYPE type;
+  union
+  {
+    /// @brief
+    game_stream_hw_framebuffer_buffer hw_framebuffer;
+
+    /// @brief
+    game_stream_sw_framebuffer_buffer sw_framebuffer;
+  };
+} ATTRIBUTE_PACKED game_stream_buffer;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Stream packet and ephemeral metadata**
+///
+/// This packet contains stream data and accompanying metadata. The metadata
+/// is ephemeral, meaning it only applies to the current packet and can change
+/// from packet to packet in the same stream.
+///
+typedef struct game_stream_packet
+{
+  /// @brief
+  GAME_STREAM_TYPE type;
+  union
+  {
+    /// @brief
+    game_stream_audio_packet audio;
+
+    /// @brief
+    game_stream_video_packet video;
+
+    /// @brief
+    game_stream_hw_framebuffer_packet hw_framebuffer;
+
+    /// @brief
+    game_stream_sw_framebuffer_packet sw_framebuffer;
+  };
+} ATTRIBUTE_PACKED game_stream_packet;
+//------------------------------------------------------------------------------
+
+//@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+/// \defgroup cpp_kodi_addon_game_Defs_GameTypes 6. Game types
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **Game types data**
+///
+//@{
+
+//==============================================================================
+/// @brief **Game reguin definition**
+///
+/// Returned from game_get_region()
+typedef enum GAME_REGION
+{
+  /// @brief Game region unknown
+  GAME_REGION_UNKNOWN,
+
+  /// @brief Game region NTSC
+  GAME_REGION_NTSC,
+
+  /// @brief Game region PAL
+  GAME_REGION_PAL,
+} GAME_REGION;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Special game types passed into game_load_game_special().**
+///
+/// @remark Only used when multiple ROMs are required.
+///
+typedef enum SPECIAL_GAME_TYPE
+{
+  /// @brief Game Type BSX
+  SPECIAL_GAME_TYPE_BSX,
+
+  /// @brief Game Type BSX slotted
+  SPECIAL_GAME_TYPE_BSX_SLOTTED,
+
+  /// @brief Game Type sufami turbo
+  SPECIAL_GAME_TYPE_SUFAMI_TURBO,
+
+  /// @brief Game Type super game boy
+  SPECIAL_GAME_TYPE_SUPER_GAME_BOY,
+} SPECIAL_GAME_TYPE;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **Game Memory**
+///
+typedef enum GAME_MEMORY
+{
+  /// @brief Passed to game_get_memory_data/size(). If the memory type doesn't apply
+  /// to the implementation NULL/0 can be returned.
+  GAME_MEMORY_MASK = 0xff,
+
+  /// @brief Regular save ram.
+  ///
+  /// This ram is usually found on a game cartridge, backed
+  /// up by a battery. If save game data is too complex for a single memory
+  /// buffer, the SYSTEM_DIRECTORY environment callback can be used.
+  GAME_MEMORY_SAVE_RAM = 0,
+
+  /// @brief Some games have a built-in clock to keep track of time.
+  ///
+  /// This memory is usually just a couple of bytes to keep track of time.
+  GAME_MEMORY_RTC = 1,
+
+  /// @brief System ram lets a frontend peek into a game systems main RAM
+  GAME_MEMORY_SYSTEM_RAM = 2,
+
+  /// @brief Video ram lets a frontend peek into a game systems video RAM (VRAM)
+  GAME_MEMORY_VIDEO_RAM = 3,
+
+  /// @brief Special memory type
+  GAME_MEMORY_SNES_BSX_RAM = ((1 << 8) | GAME_MEMORY_SAVE_RAM),
+
+  /// @brief Special memory type
+  GAME_MEMORY_SNES_BSX_PRAM = ((2 << 8) | GAME_MEMORY_SAVE_RAM),
+
+  /// @brief Special memory type
+  GAME_MEMORY_SNES_SUFAMI_TURBO_A_RAM = ((3 << 8) | GAME_MEMORY_SAVE_RAM),
+
+  /// @brief Special memory type
+  GAME_MEMORY_SNES_SUFAMI_TURBO_B_RAM = ((4 << 8) | GAME_MEMORY_SAVE_RAM),
+
+  /// @brief Special memory type
+  GAME_MEMORY_SNES_GAME_BOY_RAM = ((5 << 8) | GAME_MEMORY_SAVE_RAM),
+
+  /// @brief Special memory type
+  GAME_MEMORY_SNES_GAME_BOY_RTC = ((6 << 8) | GAME_MEMORY_RTC),
+} GAME_MEMORY;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief **ID values for SIMD CPU features**
+typedef enum GAME_SIMD
+{
+  /// @brief SIMD CPU SSE
+  GAME_SIMD_SSE = (1 << 0),
+
+  /// @brief SIMD CPU SSE2
+  GAME_SIMD_SSE2 = (1 << 1),
+
+  /// @brief SIMD CPU VMX
+  GAME_SIMD_VMX = (1 << 2),
+
+  /// @brief SIMD CPU VMX128
+  GAME_SIMD_VMX128 = (1 << 3),
+
+  /// @brief SIMD CPU AVX
+  GAME_SIMD_AVX = (1 << 4),
+
+  /// @brief SIMD CPU NEON
+  GAME_SIMD_NEON = (1 << 5),
+
+  /// @brief SIMD CPU SSE3
+  GAME_SIMD_SSE3 = (1 << 6),
+
+  /// @brief SIMD CPU SSSE3
+  GAME_SIMD_SSSE3 = (1 << 7),
+
+  /// @brief SIMD CPU MMX
+  GAME_SIMD_MMX = (1 << 8),
+
+  /// @brief SIMD CPU MMXEXT
+  GAME_SIMD_MMXEXT = (1 << 9),
+
+  /// @brief SIMD CPU SSE4
+  GAME_SIMD_SSE4 = (1 << 10),
+
+  /// @brief SIMD CPU SSE42
+  GAME_SIMD_SSE42 = (1 << 11),
+
+  /// @brief SIMD CPU AVX2
+  GAME_SIMD_AVX2 = (1 << 12),
+
+  /// @brief SIMD CPU VFPU
+  GAME_SIMD_VFPU = (1 << 13),
+} GAME_SIMD;
+//------------------------------------------------------------------------------
+
+//@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+/// \defgroup cpp_kodi_addon_game_Defs_InputTypes 7. Input types
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **Input types**
+///
+//@{
+
+//==============================================================================
+/// @brief
+typedef enum GAME_INPUT_EVENT_SOURCE
+{
+  /// @brief
+  GAME_INPUT_EVENT_DIGITAL_BUTTON,
+
+  /// @brief
+  GAME_INPUT_EVENT_ANALOG_BUTTON,
+
+  /// @brief
+  GAME_INPUT_EVENT_AXIS,
+
+  /// @brief
+  GAME_INPUT_EVENT_ANALOG_STICK,
+
+  /// @brief
+  GAME_INPUT_EVENT_ACCELEROMETER,
+
+  /// @brief
+  GAME_INPUT_EVENT_KEY,
+
+  /// @brief
+  GAME_INPUT_EVENT_RELATIVE_POINTER,
+
+  /// @brief
+  GAME_INPUT_EVENT_ABSOLUTE_POINTER,
+
+  /// @brief
+  GAME_INPUT_EVENT_MOTOR,
+} GAME_INPUT_EVENT_SOURCE;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef enum GAME_KEY_MOD
+{
+  /// @brief
+  GAME_KEY_MOD_NONE = 0x0000,
+
+  /// @brief
+  GAME_KEY_MOD_SHIFT = 0x0001,
+
+  /// @brief
+  GAME_KEY_MOD_CTRL = 0x0002,
+
+  /// @brief
+  GAME_KEY_MOD_ALT = 0x0004,
+
+  /// @brief
+  GAME_KEY_MOD_META = 0x0008,
+
+  /// @brief
+  GAME_KEY_MOD_SUPER = 0x0010,
+
+  /// @brief
+  GAME_KEY_MOD_NUMLOCK = 0x0100,
+
+  /// @brief
+  GAME_KEY_MOD_CAPSLOCK = 0x0200,
+
+  /// @brief
+  GAME_KEY_MOD_SCROLLOCK = 0x0400,
+} GAME_KEY_MOD;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief Type of port on the virtual game console
+typedef enum GAME_PORT_TYPE
+{
+  /// @brief Game port unknown
+  GAME_PORT_UNKNOWN,
+
+  /// @brief Game port Keyboard
+  GAME_PORT_KEYBOARD,
+
+  /// @brief Game port mouse
+  GAME_PORT_MOUSE,
+
+  /// @brief Game port controller
+  GAME_PORT_CONTROLLER,
+} GAME_PORT_TYPE;
+//------------------------------------------------------------------------------
+
+/*! \cond PRIVATE */
+/*!
+  * @brief "C" Game add-on controller layout.
+  *
+  * Structure used to interface in "C" between Kodi and Addon.
+  *
+  * See @ref AddonGameControllerLayout for description of values.
+  */
+typedef struct game_controller_layout
+{
+  char* controller_id;
+  bool provides_input; // False for multitaps
+  char** digital_buttons;
+  unsigned int digital_button_count;
+  char** analog_buttons;
+  unsigned int analog_button_count;
+  char** analog_sticks;
+  unsigned int analog_stick_count;
+  char** accelerometers;
+  unsigned int accelerometer_count;
+  char** keys;
+  unsigned int key_count;
+  char** rel_pointers;
+  unsigned int rel_pointer_count;
+  char** abs_pointers;
+  unsigned int abs_pointer_count;
+  char** motors;
+  unsigned int motor_count;
+} ATTRIBUTE_PACKED game_controller_layout;
+ /*! \endcond */
+
+//==============================================================================
+/// @brief
+struct AddonGameControllerLayout
+{
+  /*! \cond PRIVATE */
+  explicit AddonGameControllerLayout() = default;
+  AddonGameControllerLayout(const game_controller_layout& layout)
+  {
+    controller_id = layout.controller_id;
+    provides_input = layout.provides_input;
+    for (unsigned int i = 0; i < layout.digital_button_count; ++i)
+      digital_buttons.push_back(layout.digital_buttons[i]);
+    for (unsigned int i = 0; i < layout.analog_button_count; ++i)
+      analog_buttons.push_back(layout.analog_buttons[i]);
+    for (unsigned int i = 0; i < layout.analog_stick_count; ++i)
+      analog_sticks.push_back(layout.analog_sticks[i]);
+    for (unsigned int i = 0; i < layout.accelerometer_count; ++i)
+      accelerometers.push_back(layout.accelerometers[i]);
+    for (unsigned int i = 0; i < layout.key_count; ++i)
+      keys.push_back(layout.keys[i]);
+    for (unsigned int i = 0; i < layout.rel_pointer_count; ++i)
+      rel_pointers.push_back(layout.rel_pointers[i]);
+    for (unsigned int i = 0; i < layout.abs_pointer_count; ++i)
+      abs_pointers.push_back(layout.abs_pointers[i]);
+    for (unsigned int i = 0; i < layout.motor_count; ++i)
+      motors.push_back(layout.motors[i]);
+  }
+  /*! \endcond */
+
+  /// @brief
+  std::string controller_id;
+
+  /// @brief False for multitaps
+  bool provides_input;
+
+  /// @brief
+  std::vector<std::string> digital_buttons;
+
+  /// @brief
+  std::vector<std::string> analog_buttons;
+
+  /// @brief
+  std::vector<std::string> analog_sticks;
+
+  /// @brief
+  std::vector<std::string> accelerometers;
+
+  /// @brief
+  std::vector<std::string> keys;
+
+  /// @brief
+  std::vector<std::string> rel_pointers;
+
+  /// @brief
+  std::vector<std::string> abs_pointers;
+
+  /// @brief
+  std::vector<std::string> motors;
+};
+//------------------------------------------------------------------------------
+
+struct game_input_port;
+
+//==============================================================================
+/// @brief Device that can provide input
+typedef struct game_input_device
+{
+  /// @brief ID used in the Kodi controller API
+  const char* controller_id;
+
+  /// @brief
+  const char* port_address;
+
+  /// @brief
+  game_input_port* available_ports;
+
+  /// @brief
+  unsigned int port_count;
+} ATTRIBUTE_PACKED game_input_device;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief Port that can provide input
+///
+/// Ports can accept multiple devices and devices can have multiple ports, so
+/// the topology of possible configurations is a tree structure of alternating
+/// port and device nodes.
+///
+typedef struct game_input_port
+{
+  /// @brief
+  GAME_PORT_TYPE type;
+
+  /// @brief Required for GAME_PORT_CONTROLLER type
+  const char* port_id;
+
+  /// @brief
+  game_input_device* accepted_devices;
+
+  /// @brief
+  unsigned int device_count;
+} ATTRIBUTE_PACKED game_input_port;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief The input topology is the possible ways to connect input devices
+///
+/// This represents the logical topology, which is the possible connections that
+/// the game client's logic can handle. It is strictly a subset of the physical
+/// topology. Loops are not allowed.
+///
+typedef struct game_input_topology
+{
+  /// @brief The list of ports on the virtual game console
+  game_input_port *ports;
+
+  /// @brief The number of ports
+  unsigned int port_count;
+
+  /// @brief A limit on the number of input-providing devices, or -1 for no limit
+  int player_limit;
+} ATTRIBUTE_PACKED game_input_topology;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_digital_button_event
+{
+  /// @brief
+  bool pressed;
+} ATTRIBUTE_PACKED game_digital_button_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_analog_button_event
+{
+  /// @brief
+  float magnitude;
+} ATTRIBUTE_PACKED game_analog_button_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_axis_event
+{
+  /// @brief
+  float position;
+} ATTRIBUTE_PACKED game_axis_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_analog_stick_event
+{
+  /// @brief
+  float x;
+
+  /// @brief
+  float y;
+} ATTRIBUTE_PACKED game_analog_stick_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_accelerometer_event
+{
+  /// @brief
+  float x;
+
+  /// @brief
+  float y;
+
+  /// @brief
+  float z;
+} ATTRIBUTE_PACKED game_accelerometer_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_key_event
+{
+  /// @brief
+  bool pressed;
+
+  /// @brief If the keypress generates a printing character
+  ///
+  /// The unicode value contains the character generated. If the key is a
+  /// non-printing character, e.g. a function or arrow key, the unicode value
+  /// is zero.
+  uint32_t unicode;
+
+  /// @brief
+  GAME_KEY_MOD modifiers;
+} ATTRIBUTE_PACKED game_key_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_rel_pointer_event
+{
+  /// @brief
+  int x;
+
+  /// @brief
+  int y;
+} ATTRIBUTE_PACKED game_rel_pointer_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_abs_pointer_event
+{
+  /// @brief
+  bool pressed;
+
+  /// @brief
+  float x;
+
+  /// @brief
+  float y;
+} ATTRIBUTE_PACKED game_abs_pointer_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_motor_event
+{
+  /// @brief
+  float magnitude;
+} ATTRIBUTE_PACKED game_motor_event;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief
+typedef struct game_input_event
+{
+  /// @brief
+  GAME_INPUT_EVENT_SOURCE type;
+
+  /// @brief
+  const char* controller_id;
+
+  /// @brief
+  GAME_PORT_TYPE port_type;
+
+  /// @brief
+  const char* port_address;
+
+  /// @brief
+  const char* feature_name;
+  union {
+    /// @brief
+    struct game_digital_button_event digital_button;
+
+    /// @brief
+    struct game_analog_button_event analog_button;
+
+    /// @brief
+    struct game_axis_event axis;
+
+    /// @brief
+    struct game_analog_stick_event analog_stick;
+
+    /// @brief
+    struct game_accelerometer_event accelerometer;
+
+    /// @brief
+    struct game_key_event key;
+
+    /// @brief
+    struct game_rel_pointer_event rel_pointer;
+
+    /// @brief
+    struct game_abs_pointer_event abs_pointer;
+
+    /// @brief
+    struct game_motor_event motor;
+  };
+} ATTRIBUTE_PACKED game_input_event;
+//------------------------------------------------------------------------------
+
+//@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+/// \defgroup cpp_kodi_addon_game_Defs_EnvironmentTypes 8. Environment types
+/// \ingroup cpp_kodi_addon_game_Defs
+/// @brief **Environment types**
+///
+//@{
+
+//==============================================================================
+/// @brief Game system timing
+///
+struct game_system_timing
+{
+  /// @brief FPS of video content.
+  double fps;
+
+  /// @brief Sampling rate of audio.
+  double sample_rate;
+};
+//------------------------------------------------------------------------------
+
+//@}
+
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+/*!
+ * @brief Game properties
+ *
+  * Not to be used outside this header.
+ */
+typedef struct AddonProps_Game
+{
+  /*!
+    * The path of the game client being loaded.
+    */
+  const char* game_client_dll_path;
+
+  /*!
+    * Paths to proxy DLLs used to load the game client.
+    */
+  const char** proxy_dll_paths;
+
+  /*!
+    * Number of proxy DLL paths provided.
+    */
+  unsigned int proxy_dll_count;
+
+  /*!
+  * The "system" directories of the frontend. These directories can be used to
+  * store system-specific ROMs such as BIOSes, configuration data, etc.
+  */
+  const char** resource_directories;
+
+  /*!
+   * Number of resource directories provided
+   */
+  unsigned int resource_directory_count;
+
+  /*!
+   * The writable directory of the frontend. This directory can be used to store
+   * SRAM, memory cards, high scores, etc, if the game client cannot use the
+   * regular memory interface, GetMemoryData().
+   */
+  const char* profile_directory;
+
+  /*!
+   * The value of the <supports_vfs> property from addon.xml
+   */
+  bool supports_vfs;
+
+  /*!
+   * The extensions in the <extensions> property from addon.xml
+   */
+  const char** extensions;
+
+  /*!
+   * Number of extensions provided
+   */
+  unsigned int extension_count;
+} AddonProps_Game;
+
+typedef AddonProps_Game game_client_properties;
+
+/*! Structure to transfer the methods from kodi_game_dll.h to Kodi */
+
+struct AddonInstance_Game;
+
+/*!
+ * @brief Game callbacks
+ *
+ * Not to be used outside this header.
+ */
+typedef struct AddonToKodiFuncTable_Game
+{
+  KODI_HANDLE kodiInstance;
+
+  void (*CloseGame)(void* kodiInstance);
+  void* (*OpenStream)(void*, const game_stream_properties*);
+  bool (*GetStreamBuffer)(void*, void*, unsigned int, unsigned int, game_stream_buffer*);
+  void (*AddStreamData)(void*, void*, const game_stream_packet*);
+  void (*ReleaseStreamBuffer)(void*, void*, game_stream_buffer*);
+  void (*CloseStream)(void*, void*);
+  game_proc_address_t (*HwGetProcAddress)(void* kodiInstance, const char* symbol);
+  bool (*InputEvent)(void* kodiInstance, const game_input_event* event);
+} AddonToKodiFuncTable_Game;
+
+/*!
+ * @brief Game function hooks
+ *
+ * Not to be used outside this header.
+ */
+typedef struct KodiToAddonFuncTable_Game
+{
+  kodi::addon::CInstanceGame* addonInstance;
+
+  GAME_ERROR(__cdecl* LoadGame)(const AddonInstance_Game*, const char*);
+  GAME_ERROR(__cdecl* LoadGameSpecial)
+  (const AddonInstance_Game*, SPECIAL_GAME_TYPE, const char**, size_t);
+  GAME_ERROR(__cdecl* LoadStandalone)(const AddonInstance_Game*);
+  GAME_ERROR(__cdecl* UnloadGame)(const AddonInstance_Game*);
+  GAME_ERROR(__cdecl* GetGameTiming)(const AddonInstance_Game*, game_system_timing*);
+  GAME_REGION(__cdecl* GetRegion)(const AddonInstance_Game*);
+  bool(__cdecl* RequiresGameLoop)(const AddonInstance_Game*);
+  GAME_ERROR(__cdecl* RunFrame)(const AddonInstance_Game*);
+  GAME_ERROR(__cdecl* Reset)(const AddonInstance_Game*);
+  GAME_ERROR(__cdecl* HwContextReset)(const AddonInstance_Game*);
+  GAME_ERROR(__cdecl* HwContextDestroy)(const AddonInstance_Game*);
+  bool(__cdecl* HasFeature)(const AddonInstance_Game*, const char*, const char*);
+  game_input_topology*(__cdecl* GetTopology)(const AddonInstance_Game*);
+  void(__cdecl* FreeTopology)(const AddonInstance_Game*, game_input_topology*);
+  void(__cdecl* SetControllerLayouts)(const AddonInstance_Game*,
+                                      const game_controller_layout*,
+                                      unsigned int);
+  bool(__cdecl* EnableKeyboard)(const AddonInstance_Game*, bool, const char*);
+  bool(__cdecl* EnableMouse)(const AddonInstance_Game*, bool, const char*);
+  bool(__cdecl* ConnectController)(const AddonInstance_Game*, bool, const char*, const char*);
+  bool(__cdecl* InputEvent)(const AddonInstance_Game*, const game_input_event*);
+  size_t(__cdecl* SerializeSize)(const AddonInstance_Game*);
+  GAME_ERROR(__cdecl* Serialize)(const AddonInstance_Game*, uint8_t*, size_t);
+  GAME_ERROR(__cdecl* Deserialize)(const AddonInstance_Game*, const uint8_t*, size_t);
+  GAME_ERROR(__cdecl* CheatReset)(const AddonInstance_Game*);
+  GAME_ERROR(__cdecl* GetMemory)(const AddonInstance_Game*, GAME_MEMORY, uint8_t**, size_t*);
+  GAME_ERROR(__cdecl* SetCheat)(const AddonInstance_Game*, unsigned int, bool, const char*);
+} KodiToAddonFuncTable_Game;
+
+/*!
+ * @brief Game instance
+ *
+ * Not to be used outside this header.
+ */
+typedef struct AddonInstance_Game
+{
+  AddonProps_Game props;
+  AddonToKodiFuncTable_Game toKodi;
+  KodiToAddonFuncTable_Game toAddon;
+} AddonInstance_Game;
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+///
+/// \addtogroup cpp_kodi_addon_game
+/// @brief \cpp_class{ kodi::addon::CInstanceGame }
+/// **Game add-on instance**
+///
+/// This class is created at addon by Kodi.
+///
+//------------------------------------------------------------------------------
+class ATTRIBUTE_HIDDEN CInstanceGame : public IAddonInstance
+{
+public:
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_Base 1. Basic functions
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Functions to manage the addon and get basic information about it**
+  ///
+  ///
+  //@{
+
+  //============================================================================
+  ///
+  /// @brief Game class constructor
+  ///
+  /// Used by an add-on that only supports only Game and only in one instance.
+  ///
+  /// This class is created at addon by Kodi.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/Game.h>
+  /// ...
+  ///
+  /// class ATTRIBUTE_HIDDEN CGameExample
+  ///   : public kodi::addon::CAddonBase,
+  ///     public kodi::addon::CInstanceGame
+  /// {
+  /// public:
+  ///   CGameExample()
+  ///   {
+  ///   }
+  ///
+  ///   virtual ~CGameExample();
+  ///   {
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDONCREATOR(CGameExample)
+  /// ~~~~~~~~~~~~~
+  ///
+  CInstanceGame() : IAddonInstance(ADDON_INSTANCE_GAME, GetKodiTypeVersion(ADDON_INSTANCE_GAME))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceGame: Creation of more as one in single "
+                             "instance way is not allowed!");
+
+    SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
+    CAddonBase::m_interface->globalSingleInstance = this;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Destructor
+  ///
+  ~CInstanceGame() override = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>The path of the game client being loaded.
+  ///
+  /// @return the used game client Dll path
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  std::string GameClientDllPath() const
+  {
+    return m_instanceData->props.game_client_dll_path;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>Paths to proxy DLLs used to load the game client.
+  ///
+  /// @param[out] paths vector list to store available dll paths
+  /// @return true if success and dll paths present
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool ProxyDllPaths(std::vector<std::string>& paths)
+  {
+    for (unsigned int i = 0; i < m_instanceData->props.proxy_dll_count; ++i)
+    {
+      if (m_instanceData->props.proxy_dll_paths[i] != nullptr)
+        paths.push_back(m_instanceData->props.proxy_dll_paths[i]);
+    }
+    return !paths.empty();
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>The "system" directories of the frontend
+  ///
+  /// These directories can be used to store system-specific ROMs such as
+  /// BIOSes, configuration data, etc.
+  ///
+  /// @return the used resource directory
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool ResourceDirectories(std::vector<std::string>& dirs)
+  {
+    for (unsigned int i = 0; i < m_instanceData->props.resource_directory_count; ++i)
+    {
+      if (m_instanceData->props.resource_directories[i] != nullptr)
+        dirs.push_back(m_instanceData->props.resource_directories[i]);
+    }
+    return !dirs.empty();
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>The writable directory of the frontend
+  ///
+  /// This directory can be used to store SRAM, memory cards, high scores,
+  /// etc, if the game client cannot use the regular memory interface,
+  /// GetMemoryData().
+  ///
+  /// @return the used profile directory
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  std::string ProfileDirectory() const
+  {
+    return m_instanceData->props.profile_directory;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>The value of the <supports_vfs> property from addon.xml
+  ///
+  /// @return true if VFS is supported
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool SupportsVFS() const
+  {
+    return m_instanceData->props.supports_vfs;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>The extensions in the <extensions> property from addon.xml
+  ///
+  /// @param[out] extensions vector list to store available extension
+  /// @return true if success and extensions present
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool Extensions(std::vector<std::string>& extensions)
+  {
+    for (unsigned int i = 0; i < m_instanceData->props.extension_count; ++i)
+    {
+      if (m_instanceData->props.extensions[i] != nullptr)
+        extensions.push_back(m_instanceData->props.extensions[i]);
+    }
+    return !extensions.empty();
+  }
+  //----------------------------------------------------------------------------
+
+  //@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_Operation 2. Game operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Game operations**
+  ///
+  /// These are mandatory functions for using this addon to get the available
+  /// channels.
+  ///
+  //@{
+
+  //============================================================================
+  ///
+  /// @brief Load a game
+  ///
+  /// @param[in] url The URL to load
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was loaded
+  ///
+  virtual GAME_ERROR LoadGame(const std::string& url)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Load a game that requires multiple files
+  ///
+  /// @param[in] type The game type
+  /// @param[in] urls An array of urls
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was loaded
+  ///
+  virtual GAME_ERROR LoadGameSpecial(SPECIAL_GAME_TYPE type, const std::vector<std::string>& urls)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Begin playing without a game file
+  ///
+  /// If the add-on supports standalone mode, it must add the <supports_standalone>
+  /// tag to the extension point in addon.xml:
+  ///
+  ///     <supports_no_game>false</supports_no_game>
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game add-on was loaded
+  ///
+  virtual GAME_ERROR LoadStandalone()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Unload the current game
+  ///
+  /// Unloads a currently loaded game
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was unloaded
+  ///
+  virtual GAME_ERROR UnloadGame()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Get timing information about the loaded game
+  ///
+  /// @param[out] timing_info The info structure to fill
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if info was filled
+  ///
+  virtual GAME_ERROR GetGameTiming(game_system_timing& timing_info)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Get region of the loaded game
+  ///
+  /// @return the region, or @ref GAME_REGION_UNKNOWN if unknown or no game is loaded
+  ///
+  virtual GAME_REGION GetRegion()
+  {
+    return GAME_REGION_UNKNOWN;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Return true if the client requires the frontend to provide a game loop
+  ///
+  /// The game loop is a thread that calls RunFrame() in a loop at a rate
+  /// determined by the playback speed and the client's FPS.
+  ///
+  /// @return true if the frontend should provide a game loop, false otherwise
+  ///
+  virtual bool RequiresGameLoop()
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Run a single frame for add-ons that use a game loop
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if there was no error
+  ///
+  virtual GAME_ERROR RunFrame()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Reset the current game
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was reset
+  ///
+  virtual GAME_ERROR Reset()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>Requests the frontend to stop the current game
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  void CloseGame(void) { m_instanceData->toKodi.CloseGame(m_instanceData->toKodi.kodiInstance); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_Operation_CStream Class: CStream
+  /// @ingroup cpp_kodi_addon_game_Operation
+  /// @brief \cpp_class{ kodi::addon::CInstanceGame::CStream }
+  /// **Game stream handler**
+  ///
+  /// This class will be integrated into the addon, which can then open it if
+  /// necessary for the processing of an audio or video stream.
+  ///
+  ///
+  /// @note Callback to Kodi class
+  //@{
+  class CStream
+  {
+  public:
+    CStream() = default;
+
+    CStream(const game_stream_properties& properties)
+    {
+      Open(properties);
+    }
+
+    ~CStream()
+    {
+      Close();
+    }
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Create a stream for gameplay data
+    ///
+    /// @param[in] properties The stream properties
+    /// @return A stream handle, or `nullptr` on failure
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    bool Open(const game_stream_properties& properties)
+    {
+      if (!CAddonBase::m_interface->globalSingleInstance)
+        return false;
+
+      if (m_handle)
+      {
+        kodi::Log(ADDON_LOG_INFO, "kodi::addon::CInstanceGame::CStream already becomes reopened");
+        Close();
+      }
+
+      AddonToKodiFuncTable_Game& cb =
+          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+              ->m_instanceData->toKodi;
+      m_handle = cb.OpenStream(cb.kodiInstance, &properties);
+      return m_handle != nullptr;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Free the specified stream
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    void Close()
+    {
+      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
+        return;
+
+      AddonToKodiFuncTable_Game& cb =
+          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+              ->m_instanceData->toKodi;
+      cb.CloseStream(cb.kodiInstance, m_handle);
+      m_handle = nullptr;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Get a buffer for zero-copy stream data
+    ///
+    /// @param[in] width The framebuffer width, or 0 for no width specified
+    /// @param[in] height The framebuffer height, or 0 for no height specified
+    /// @param[out] buffer The buffer, or unmodified if false is returned
+    /// @return True if buffer was set, false otherwise
+    ///
+    /// @note If this returns true, buffer must be freed using \ref ReleaseBuffer().
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    bool GetBuffer(unsigned int width, unsigned int height, game_stream_buffer& buffer)
+    {
+      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
+        return false;
+
+      AddonToKodiFuncTable_Game& cb =
+          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+              ->m_instanceData->toKodi;
+      return cb.GetStreamBuffer(cb.kodiInstance, m_handle, width, height, &buffer);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Add a data packet to a stream
+    ///
+    /// @param[in] packet The data packet
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    void AddData(const game_stream_packet& packet)
+    {
+      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
+        return;
+
+      AddonToKodiFuncTable_Game& cb =
+          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+              ->m_instanceData->toKodi;
+      cb.AddStreamData(cb.kodiInstance, m_handle, &packet);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief Free an allocated buffer
+    ///
+    /// @param[in] buffer The buffer returned from GetStreamBuffer()
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    void ReleaseBuffer(game_stream_buffer& buffer)
+    {
+      if (!m_handle || !CAddonBase::m_interface->globalSingleInstance)
+        return;
+
+      AddonToKodiFuncTable_Game& cb =
+          static_cast<CInstanceGame*>(CAddonBase::m_interface->globalSingleInstance)
+              ->m_instanceData->toKodi;
+      cb.ReleaseStreamBuffer(cb.kodiInstance, m_handle, &buffer);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_game_Operation_CStream
+    /// @brief To check stream open was OK, e.g. after use of constructor
+    ///
+    /// @return true if stream was successfully opened
+    ///
+    /// @remarks Only called from addon itself
+    ///
+    bool IsOpen() const { return m_handle != nullptr; }
+    //--------------------------------------------------------------------------
+
+  private:
+    void* m_handle = nullptr;
+  };
+  //@}
+
+  //@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_HardwareRendering 3. Hardware rendering operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Hardware rendering operations**
+  ///
+  //@{
+
+  //============================================================================
+  ///
+  /// @brief Invalidates the current HW context and reinitializes GPU resources
+  ///
+  /// Any GL state is lost, and must not be deinitialized explicitly.
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the HW context was reset
+  ///
+  virtual GAME_ERROR HwContextReset()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Called before the context is destroyed
+  ///
+  /// Resources can be deinitialized at this step.
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the HW context was destroyed
+  ///
+  virtual GAME_ERROR HwContextDestroy()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+
+  //============================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>Get a symbol from the hardware context
+  ///
+  /// @param[in] sym The symbol's name
+  ///
+  /// @return A function pointer for the specified symbol
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  game_proc_address_t HwGetProcAddress(const char* sym)
+  {
+    return m_instanceData->toKodi.HwGetProcAddress(m_instanceData->toKodi.kodiInstance, sym);
+  }
+  //----------------------------------------------------------------------------
+
+  //@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_InputOperations 4. Input operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Input operations**
+  ///
+  //@{
+
+  //============================================================================
+  ///
+  /// @brief Check if input is accepted for a feature on the controller
+  ///
+  /// If only a subset of the controller profile is used, this can return false
+  /// for unsupported features to not absorb their input.
+  ///
+  /// If the entire controller profile is used, this should always return true.
+  ///
+  /// @param[in] controller_id The ID of the controller profile
+  /// @param[in] feature_name The name of a feature in that profile
+  /// @return true if input is accepted for the feature, false otherwise
+  ///
+  virtual bool HasFeature(const std::string& controller_id, const std::string& feature_name)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Get the input topology that specifies which controllers can be connected
+  ///
+  /// @return The input topology, or null to use the default
+  ///
+  /// If this returns non-null, topology must be freed using FreeTopology().
+  ///
+  /// If this returns null, the topology will default to a single port that can
+  /// accept all controllers imported by addon.xml. The port ID is set to
+  /// the @ref DEFAULT_PORT_ID constant.
+  ///
+  virtual game_input_topology* GetTopology()
+  {
+    return nullptr;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Free the topology's resources
+  ///
+  /// @param[in] topology The topology returned by GetTopology()
+    ///
+  virtual void FreeTopology(game_input_topology* topology)
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Set the layouts for known controllers
+  ///
+  /// @param[in] controllers The controller layouts
+  ///
+  /// After loading the input topology, the frontend will call this with
+  /// controller layouts for all controllers discovered in the topology.
+  ///
+  virtual void SetControllerLayouts(const std::vector<AddonGameControllerLayout>& controllers)
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Enable/disable keyboard input using the specified controller
+  ///
+  /// @param[in] enable True to enable input, false otherwise
+  /// @param[in] controller_id The controller ID if enabling, or unused if disabling
+  ///
+  /// @return True if keyboard input was enabled, false otherwise
+  ///
+  virtual bool EnableKeyboard(bool enable, const std::string& controller_id)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Enable/disable mouse input using the specified controller
+  ///
+  /// @param[in] enable True to enable input, false otherwise
+  /// @param[in] controller_id The controller ID if enabling, or unused if disabling
+  ///
+  /// @return True if mouse input was enabled, false otherwise
+  ///
+  virtual bool EnableMouse(bool enable, const std::string& controller_id)
+  {
+    return false;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @brief Connect/disconnect a controller to a port on the virtual game console
+  ///
+  /// @param[in] connect True to connect a controller, false to disconnect
+  /// @param[in] port_address The address of the port
+  /// @param[in] controller_id The controller ID if connecting, or unused if disconnecting
+  /// @return True if the \p controller was (dis-)connected to the port, false otherwise
+  ///
+  /// The address is a string that allows traversal of the controller topology.
+  /// It is formed by alternating port IDs and controller IDs separated by "/".
+  ///
+  /// For example, assume that the topology represented in XML for Snes9x is:
+  ///
+  /// ~~~~~~~~~~~~~{.xml}
+  ///     <logicaltopology>
+  ///       <port type="controller" id="1">
+  ///         <accepts controller="game.controller.snes"/>
+  ///         <accepts controller="game.controller.snes.multitap">
+  ///           <port type="controller" id="1">
+  ///             <accepts controller="game.controller.snes"/>
+  ///           </port>
+  ///           <port type="controller" id="2">
+  ///             <accepts controller="game.controller.snes"/>
+  ///           </port>
+  ///           ...
+  ///         </accepts>
+  ///       </port>
+  ///     </logicaltopology>
+  /// ~~~~~~~~~~~~~
+  ///
+  /// To connect a multitap to the console's first port, the multitap's controller
+  /// info is set using the port address:
+  ///
+  ///     1
+  ///
+  /// To connect a SNES controller to the second port of the multitap, the
+  /// controller info is next set using the address:
+  ///
+  ///     1/game.controller.multitap/2
+  ///
+  /// Any attempts to connect a controller to a port on a disconnected multitap
+  /// will return false.
+  ///
+  virtual bool ConnectController(bool connect,
+                                 const std::string& port_address,
+                                 const std::string& controller_id)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Notify the add-on of an input event
+  ///
+  /// @param[in] event The input event
+  ///
+  /// @return true if the event was handled, false otherwise
+  ///
+  virtual bool InputEvent(const game_input_event& event)
+  {
+    return false;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief **Callback to Kodi Function**<br>Notify the port of an input event
+  ///
+  /// @param[in] event The input event
+  /// @return true if the event was handled, false otherwise
+  ///
+  /// @note Input events can arrive for the following sources:
+  ///   - \ref GAME_INPUT_EVENT_MOTOR
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  bool KodiInputEvent(const game_input_event& event)
+  {
+    return m_instanceData->toKodi.InputEvent(m_instanceData->toKodi.kodiInstance, &event);
+  }
+  //----------------------------------------------------------------------------
+
+  //@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_SerializationOperations 5. Serialization operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Serialization operations**
+  ///
+  //@{
+
+  //============================================================================
+  ///
+  /// @brief Get the number of bytes required to serialize the game
+  ///
+  /// @return the number of bytes, or 0 if serialization is not supported
+  ///
+  virtual size_t SerializeSize()
+  {
+    return 0;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Serialize the state of the game
+  ///
+  /// @param[in] data The buffer receiving the serialized game data
+  /// @param[in] size The size of the buffer
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game was serialized into the buffer
+  ///
+  virtual GAME_ERROR Serialize(uint8_t* data, size_t size)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Deserialize the game from the given state
+  ///
+  /// @param[in] data A buffer containing the game's new state
+  /// @param[in] size The size of the buffer
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the game deserialized
+  ///
+  virtual GAME_ERROR Deserialize(const uint8_t* data, size_t size)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //@}
+
+//--==----==----==----==----==----==----==----==----==----==----==----==----==--
+
+  //============================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_game_CheatOperations 6. Cheat operations
+  /// @ingroup cpp_kodi_addon_game
+  /// @brief **Cheat operations**
+  ///
+  //@{
+
+  //============================================================================
+  ///
+  /// @brief Reset the cheat system
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the cheat system was reset
+  ///
+  virtual GAME_ERROR CheatReset()
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Get a region of memory
+  ///
+  /// @param[in] type The type of memory to retrieve
+  /// @param[in] data Set to the region of memory; must remain valid until UnloadGame() is called
+  /// @param[in] size Set to the size of the region of memory
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if data was set to a valid buffer
+  ///
+  virtual GAME_ERROR GetMemory(GAME_MEMORY type, uint8_t*& data, size_t& size)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Set a cheat code
+  ///
+  /// @param[in] index
+  /// @param[in] enabled
+  /// @param[in] code
+  ///
+  /// @return the error, or @ref GAME_ERROR_NO_ERROR if the cheat was set
+  ///
+  virtual GAME_ERROR SetCheat(unsigned int index, bool enabled, const std::string& code)
+  {
+    return GAME_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //@}
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceGame: Creation with empty addon structure not"
+                             "allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_Game*>(instance);
+    m_instanceData->toAddon.addonInstance = this;
+
+    m_instanceData->toAddon.LoadGame = ADDON_LoadGame;
+    m_instanceData->toAddon.LoadGameSpecial = ADDON_LoadGameSpecial;
+    m_instanceData->toAddon.LoadStandalone = ADDON_LoadStandalone;
+    m_instanceData->toAddon.UnloadGame = ADDON_UnloadGame;
+    m_instanceData->toAddon.GetGameTiming = ADDON_GetGameTiming;
+    m_instanceData->toAddon.GetRegion = ADDON_GetRegion;
+    m_instanceData->toAddon.RequiresGameLoop = ADDON_RequiresGameLoop;
+    m_instanceData->toAddon.RunFrame = ADDON_RunFrame;
+    m_instanceData->toAddon.Reset = ADDON_Reset;
+
+    m_instanceData->toAddon.HwContextReset = ADDON_HwContextReset;
+    m_instanceData->toAddon.HwContextDestroy = ADDON_HwContextDestroy;
+
+    m_instanceData->toAddon.HasFeature = ADDON_HasFeature;
+    m_instanceData->toAddon.GetTopology = ADDON_GetTopology;
+    m_instanceData->toAddon.FreeTopology = ADDON_FreeTopology;
+    m_instanceData->toAddon.SetControllerLayouts = ADDON_SetControllerLayouts;
+    m_instanceData->toAddon.EnableKeyboard = ADDON_EnableKeyboard;
+    m_instanceData->toAddon.EnableMouse = ADDON_EnableMouse;
+    m_instanceData->toAddon.ConnectController = ADDON_ConnectController;
+    m_instanceData->toAddon.InputEvent = ADDON_InputEvent;
+
+    m_instanceData->toAddon.SerializeSize = ADDON_SerializeSize;
+    m_instanceData->toAddon.Serialize = ADDON_Serialize;
+    m_instanceData->toAddon.Deserialize = ADDON_Deserialize;
+
+    m_instanceData->toAddon.CheatReset = ADDON_CheatReset;
+    m_instanceData->toAddon.GetMemory = ADDON_GetMemory;
+    m_instanceData->toAddon.SetCheat = ADDON_SetCheat;
+  }
+
+  // --- Game operations ---------------------------------------------------------
+
+  inline static GAME_ERROR ADDON_LoadGame(const AddonInstance_Game* instance, const char* url)
+  {
+    return instance->toAddon.addonInstance->LoadGame(url);
+  }
+
+  inline static GAME_ERROR ADDON_LoadGameSpecial(const AddonInstance_Game* instance,
+                                                 SPECIAL_GAME_TYPE type,
+                                                 const char** urls,
+                                                 size_t urlCount)
+  {
+    std::vector<std::string> urlList;
+    for (size_t i = 0; i < urlCount; ++i)
+    {
+      if (urls[i] != nullptr)
+        urlList.push_back(urls[i]);
+    }
+
+    return instance->toAddon.addonInstance->LoadGameSpecial(type, urlList);
+  }
+
+  inline static GAME_ERROR ADDON_LoadStandalone(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->LoadStandalone();
+  }
+
+  inline static GAME_ERROR ADDON_UnloadGame(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->UnloadGame();
+  }
+
+  inline static GAME_ERROR ADDON_GetGameTiming(const AddonInstance_Game* instance,
+                                               game_system_timing* timing_info)
+  {
+    return instance->toAddon.addonInstance->GetGameTiming(*timing_info);
+  }
+
+  inline static GAME_REGION ADDON_GetRegion(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->GetRegion();
+  }
+
+  inline static bool ADDON_RequiresGameLoop(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->RequiresGameLoop();
+  }
+
+  inline static GAME_ERROR ADDON_RunFrame(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->RunFrame();
+  }
+
+  inline static GAME_ERROR ADDON_Reset(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->Reset();
+  }
+
+
+  // --- Hardware rendering operations -------------------------------------------
+
+  inline static GAME_ERROR ADDON_HwContextReset(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->HwContextReset();
+  }
+
+  inline static GAME_ERROR ADDON_HwContextDestroy(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->HwContextDestroy();
+  }
+
+
+  // --- Input operations --------------------------------------------------------
+
+  inline static bool ADDON_HasFeature(const AddonInstance_Game* instance,
+                                      const char* controller_id,
+                                      const char* feature_name)
+  {
+    return instance->toAddon.addonInstance->HasFeature(controller_id, feature_name);
+  }
+
+  inline static game_input_topology* ADDON_GetTopology(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->GetTopology();
+  }
+
+  inline static void ADDON_FreeTopology(const AddonInstance_Game* instance,
+                                        game_input_topology* topology)
+  {
+    instance->toAddon.addonInstance->FreeTopology(topology);
+  }
+
+  inline static void ADDON_SetControllerLayouts(const AddonInstance_Game* instance,
+                                                const game_controller_layout* controllers,
+                                                unsigned int controller_count)
+  {
+    if (controllers == nullptr)
+      return;
+
+    std::vector<AddonGameControllerLayout> controllerList;
+    for (unsigned int i = 0; i < controller_count; ++i)
+      controllerList.push_back(controllers[i]);
+
+    instance->toAddon.addonInstance->SetControllerLayouts(controllerList);
+  }
+
+  inline static bool ADDON_EnableKeyboard(const AddonInstance_Game* instance,
+                                          bool enable,
+                                          const char* controller_id)
+  {
+    return instance->toAddon.addonInstance->EnableKeyboard(enable, controller_id);
+  }
+
+  inline static bool ADDON_EnableMouse(const AddonInstance_Game* instance,
+                                       bool enable,
+                                       const char* controller_id)
+  {
+    return instance->toAddon.addonInstance->EnableMouse(enable, controller_id);
+  }
+
+  inline static bool ADDON_ConnectController(const AddonInstance_Game* instance,
+                                             bool connect,
+                                             const char* port_address,
+                                             const char* controller_id)
+  {
+    return instance->toAddon.addonInstance->ConnectController(connect, port_address, controller_id);
+  }
+
+  inline static bool ADDON_InputEvent(const AddonInstance_Game* instance,
+                                      const game_input_event* event)
+  {
+    return instance->toAddon.addonInstance->InputEvent(*event);
+  }
+
+
+  // --- Serialization operations ------------------------------------------------
+
+  inline static size_t ADDON_SerializeSize(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->SerializeSize();
+  }
+
+  inline static GAME_ERROR ADDON_Serialize(const AddonInstance_Game* instance,
+                                           uint8_t* data,
+                                           size_t size)
+  {
+    return instance->toAddon.addonInstance->Serialize(data, size);
+  }
+
+  inline static GAME_ERROR ADDON_Deserialize(const AddonInstance_Game* instance,
+                                             const uint8_t* data,
+                                             size_t size)
+  {
+    return instance->toAddon.addonInstance->Deserialize(data, size);
+  }
+
+
+  // --- Cheat operations --------------------------------------------------------
+
+  inline static GAME_ERROR ADDON_CheatReset(const AddonInstance_Game* instance)
+  {
+    return instance->toAddon.addonInstance->CheatReset();
+  }
+
+  inline static GAME_ERROR ADDON_GetMemory(const AddonInstance_Game* instance,
+                                           GAME_MEMORY type,
+                                           uint8_t** data,
+                                           size_t* size)
+  {
+    return instance->toAddon.addonInstance->GetMemory(type, *data, *size);
+  }
+
+  inline static GAME_ERROR ADDON_SetCheat(const AddonInstance_Game* instance,
+                                          unsigned int index,
+                                          bool enabled,
+                                          const char* code)
+  {
+    return instance->toAddon.addonInstance->SetCheat(index, enabled, code);
+  }
+
+  AddonInstance_Game* m_instanceData;
+};
+
+} /* namespace addon */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/ImageDecoder.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/ImageDecoder.h
index 09ac6c9..e41e5ef 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/ImageDecoder.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/ImageDecoder.h
@@ -9,144 +9,307 @@
 #pragma once
 
 #include "../AddonBase.h"
+#include "../c-api/addon-instance/image_decoder.h"
 
-namespace kodi { namespace addon { class CInstanceImageDecoder; }}
-
-extern "C"
+#ifdef __cplusplus
+namespace kodi
+{
+namespace addon
 {
 
-  typedef struct AddonProps_ImageDecoder
-  {
-    const char* mimetype;
-  } AddonProps_ImageDecoder;
+//##############################################################################
+/// @defgroup cpp_kodi_addon_imagedecoder_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_addon_imagedecoder
+/// @brief **Image decoder add-on general variables**
+///
+/// Used to exchange the available options between Kodi and addon.
+///
+///
 
-  typedef struct AddonToKodiFuncTable_ImageDecoder
+//==============================================================================
+///
+/// @addtogroup cpp_kodi_addon_imagedecoder
+/// @brief @cpp_class{ kodi::addon::CInstanceImageDecoder }
+/// **Image decoder add-on instance**\n
+/// This instance type is used to allow Kodi various additional image format
+/// types.
+///
+/// This usage can be requested under various conditions, by a Mimetype protocol
+/// defined in <b>`addon.xml`</b> or supported file extensions.
+///
+/// Include the header @ref ImageDecoder.h "#include <kodi/addon-instance/ImageDecoder.h>"
+/// to use this class.
+///
+/// ----------------------------------------------------------------------------
+///
+/// Here is an example of what the <b>`addon.xml.in`</b> would look like for an
+/// image decoder addon:
+///
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <addon
+///   id="imagedecoder.myspecialnamefor"
+///   version="1.0.0"
+///   name="My image decoder addon"
+///   provider-name="Your Name">
+///   <requires>@ADDON_DEPENDS@</requires>
+///   <extension
+///     point="kodi.imagedecoder"
+///     extension=".imga|.imgb"
+///     mimetype="image/mymimea|image/mymimea"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+///   <extension point="xbmc.addon.metadata">
+///     <summary lang="en_GB">My image decoder addon summary</summary>
+///     <description lang="en_GB">My image decoder description</description>
+///     <platform>@PLATFORM@</platform>
+///   </extension>
+/// </addon>
+/// ~~~~~~~~~~~~~
+///
+/// ### Standard values that can be declared for processing in `addon.xml`.
+///
+/// These values are used by Kodi to identify associated images and file
+/// extensions and then to select the associated addon.
+///
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`point`</b>,
+///                  @anchor cpp_kodi_addon_imagedecoder_point
+///                  string,
+///     The identification of the addon instance to image decoder is mandatory
+///     <b>`kodi.imagedecoder`</b>. In addition\, the instance declared in the
+///     first <b>`<extension ... />`</b> is also the main type of addon.
+///   }
+///   \table_row3{   <b>`extension`</b>,
+///                  @anchor cpp_kodi_addon_imagedecoder_defaultPort
+///                  string,
+///     The from addon operated and supported image file endings.\n
+///     Use a <b>`|`</b> to separate between different ones.
+///   }
+///   \table_row3{   <b>`defaultPort`</b>,
+///                  @anchor cpp_kodi_addon_imagedecoder_defaultPort
+///                  string,
+///     The from addon operated image [mimetypes](https://en.wikipedia.org/wiki/Media_type).\n
+///     Use a <b>`|`</b> to separate between different ones.
+///   }
+///   \table_row3{   <b>`library_@PLATFORM@`</b>,
+///                  @anchor cpp_kodi_addon_imagedecoder_library
+///                  string,
+///     The runtime library used for the addon. This is usually declared by `cmake` and correctly displayed in the translated <b>`addon.xml`</b>.
+///   }
+/// \table_end
+///
+/// @remark For more detailed description of the <b>`addon.xml`</b>, see also https://kodi.wiki/view/Addon.xml.
+///
+///
+/// --------------------------------------------------------------------------
+///
+///
+/// **Example:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/ImageDecoder.h>
+///
+/// class ATTRIBUTE_HIDDEN CMyImageDecoder : public kodi::addon::CInstanceImageDecoder
+/// {
+/// public:
+///   CMyImageDecoder(KODI_HANDLE instance, const std::string& kodiVersion);
+///
+///   bool LoadImageFromMemory(unsigned char* buffer,
+///                            unsigned int bufSize,
+///                            unsigned int& width,
+///                            unsigned int& height) override;
+///
+///   bool Decode(unsigned char* pixels,
+///               unsigned int width,
+///               unsigned int height,
+///               unsigned int pitch,
+///               ImageFormat format) override;
+///
+///   ...
+/// };
+///
+/// CMyImageDecoder::CMyImageDecoder(KODI_HANDLE instance, const std::string& kodiVersion)
+///   : CInstanceImageDecoder(instance, kodiVersion)
+/// {
+///   ...
+/// }
+///
+/// bool CMyImageDecoder::LoadImageFromMemory(unsigned char* buffer,
+///                                           unsigned int bufSize,
+///                                           unsigned int& width,
+///                                           unsigned int& height)
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// bool CMyImageDecoder::Decode(unsigned char* pixels,
+///                              unsigned int width,
+///                              unsigned int height,
+///                              unsigned int pitch,
+///                              ImageFormat format) override;
+/// {
+///   ...
+///   return true;
+/// }
+///
+/// //----------------------------------------------------------------------
+///
+/// class ATTRIBUTE_HIDDEN CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() = default;
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               const std::string& instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       const std::string& instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_IMAGEDECODER)
+///   {
+///     kodi::Log(ADDON_LOG_NOTICE, "Creating my image decoder instance");
+///     addonInstance = new CMyImageDecoder(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyImageDecoder` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+//------------------------------------------------------------------------------
+class ATTRIBUTE_HIDDEN CInstanceImageDecoder : public IAddonInstance
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_imagedecoder
+  /// @brief Class constructor.
+  ///
+  /// @param[in] instance The from Kodi given instance given be add-on
+  ///                     CreateInstance call with instance id
+  ///                     @ref ADDON_INSTANCE_IMAGEDECODER.
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  /// @note Recommended to set <b>`kodiVersion`</b>.
+  ///
+  explicit CInstanceImageDecoder(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_IMAGEDECODER,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_IMAGEDECODER))
   {
-    KODI_HANDLE kodi_instance;
-  } AddonToKodiFuncTable_ImageDecoder;
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceImageDecoder: Creation of multiple together "
+                             "with single instance way is not allowed!");
 
-  struct AddonInstance_ImageDecoder;
-  typedef struct KodiToAddonFuncTable_ImageDecoder
-  {
-    kodi::addon::CInstanceImageDecoder* addonInstance;
-    bool (__cdecl* load_image_from_memory) (const AddonInstance_ImageDecoder* instance,
-                                            unsigned char* buffer, unsigned int buf_size,
-                                            unsigned int* width, unsigned int* height);
-
-    bool (__cdecl* decode) (const AddonInstance_ImageDecoder* instance,
-                            unsigned char* pixels,
-                            unsigned int width, unsigned int height,
-                            unsigned int pitch, unsigned int format);
-  } KodiToAddonFuncTable_ImageDecoder;
-
-  typedef struct AddonInstance_ImageDecoder
-  {
-    AddonProps_ImageDecoder props;
-    AddonToKodiFuncTable_ImageDecoder toKodi;
-    KodiToAddonFuncTable_ImageDecoder toAddon;
-  } AddonInstance_ImageDecoder;
+    SetAddonStruct(instance);
+  }
+  //----------------------------------------------------------------------------
 
-} /* extern "C" */
+  ~CInstanceImageDecoder() override = default;
 
-typedef enum ImageFormat : unsigned int
-{
-  ADDON_IMG_FMT_A8R8G8B8 = 1,
-  ADDON_IMG_FMT_A8 = 2,
-  ADDON_IMG_FMT_RGBA8 = 3,
-  ADDON_IMG_FMT_RGB8 = 4
-} ImageFormat;
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_imagedecoder
+  /// @brief Initialize an encoder.
+  ///
+  /// @param[in] buffer The data to read from memory
+  /// @param[in] bufSize The buffer size
+  /// @param[in,out] width The optimal width of image on entry, obtained width
+  ///                      on return
+  /// @param[in,out] height The optimal height of image, actual obtained height
+  ///                       on return
+  /// @return true if successful done, false on error
+  ///
+  virtual bool LoadImageFromMemory(unsigned char* buffer,
+                                   unsigned int bufSize,
+                                   unsigned int& width,
+                                   unsigned int& height) = 0;
+  //----------------------------------------------------------------------------
 
-namespace kodi
-{
-namespace addon
-{
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_imagedecoder
+  /// @brief Decode previously loaded image.
+  ///
+  /// @param[in] pixels Output buffer
+  /// @param[in] width Width of output image
+  /// @param[in] height Height of output image
+  /// @param[in] pitch Pitch of output image
+  /// @param[in] format Format of output image
+  /// @return true if successful done, false on error
+  ///
+  virtual bool Decode(unsigned char* pixels,
+                      unsigned int width,
+                      unsigned int height,
+                      unsigned int pitch,
+                      ImageFormat format) = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_imagedecoder
+  /// @brief **Callback to Kodi Function**\n
+  /// Get the wanted mime type from Kodi.
+  ///
+  /// @return the mimetype wanted from Kodi
+  ///
+  /// @remarks Only called from addon itself.
+  ///
+  inline std::string MimeType() { return m_instanceData->props->mimetype; }
+  //----------------------------------------------------------------------------
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceImageDecoder: Creation with empty addon "
+                             "structure not allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_ImageDecoder*>(instance);
+    m_instanceData->toAddon->addonInstance = this;
+    m_instanceData->toAddon->load_image_from_memory = ADDON_LoadImageFromMemory;
+    m_instanceData->toAddon->decode = ADDON_Decode;
+  }
 
-  class CInstanceImageDecoder : public IAddonInstance
+  inline static bool ADDON_LoadImageFromMemory(const AddonInstance_ImageDecoder* instance,
+                                               unsigned char* buffer,
+                                               unsigned int bufSize,
+                                               unsigned int* width,
+                                               unsigned int* height)
   {
-  public:
-    //==========================================================================
-    /// @brief Class constructor
-    ///
-    /// @param[in] instance             The from Kodi given instance given be
-    ///                                 add-on CreateInstance call with instance
-    ///                                 id ADDON_INSTANCE_IMAGEDECODER.
-    explicit CInstanceImageDecoder(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_IMAGEDECODER)
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceImageDecoder: Creation of multiple together with single instance way is not allowed!");
-
-      SetAddonStruct(instance);
-    }
-    //--------------------------------------------------------------------------
-
-    ~CInstanceImageDecoder() override = default;
-
-    //==========================================================================
-    /// @brief Initialize an encoder
-    ///
-    /// @param[in] buffer The data to read from memory
-    /// @param[in] bufSize The buffer size
-    /// @param[in,out] width The optimal width of image on entry, obtained width on return
-    /// @param[in,out] height The optimal height of image, actual obtained height on return
-    /// @return true if successful done, false on error
-    ///
-    virtual bool LoadImageFromMemory(unsigned char* buffer, unsigned int bufSize,
-                                     unsigned int& width, unsigned int& height) = 0;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// @brief Decode previously loaded image
-    ///
-    /// @param[in] pixels Output buffer
-    /// @param[in] width Width of output image
-    /// @param[in] height Height of output image
-    /// @param[in] pitch Pitch of output image
-    /// @param[in] format Format of output image
-    /// @return true if successful done, false on error
-    ///
-    virtual bool Decode(unsigned char* pixels,
-                        unsigned int width, unsigned int height,
-                        unsigned int pitch, ImageFormat format) = 0;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    /// @brief Get the wanted mime type from Kodi
-    ///
-    /// @return the mimetype wanted from Kodi
-    ///
-    inline std::string MimeType() { return m_instanceData->props.mimetype; }
-    //--------------------------------------------------------------------------
-
-  private:
-    void SetAddonStruct(KODI_HANDLE instance)
-    {
-      if (instance == nullptr)
-        throw std::logic_error("kodi::addon::CInstanceImageDecoder: Creation with empty addon structure not allowed, table must be given from Kodi!");
-
-      m_instanceData = static_cast<AddonInstance_ImageDecoder*>(instance);
-      m_instanceData->toAddon.addonInstance = this;
-      m_instanceData->toAddon.load_image_from_memory = ADDON_LoadImageFromMemory;
-      m_instanceData->toAddon.decode = ADDON_Decode;
-    }
-
-    inline static bool ADDON_LoadImageFromMemory(const AddonInstance_ImageDecoder* instance,
-                                                 unsigned char* buffer, unsigned int bufSize,
-                                                 unsigned int* width, unsigned int* height)
-    {
-      return instance->toAddon.addonInstance->LoadImageFromMemory(buffer, bufSize, *width, *height);
-    }
-
-    inline static bool ADDON_Decode(const AddonInstance_ImageDecoder* instance,
-                                    unsigned char* pixels,
-                                    unsigned int width, unsigned int height,
-                                    unsigned int pitch, unsigned int format)
-    {
-      return instance->toAddon.addonInstance->Decode(pixels, width, height, pitch, static_cast<ImageFormat>(format));
-    }
-
-    AddonInstance_ImageDecoder* m_instanceData;
-  };
+    return static_cast<CInstanceImageDecoder*>(instance->toAddon->addonInstance)
+        ->LoadImageFromMemory(buffer, bufSize, *width, *height);
+  }
+
+  inline static bool ADDON_Decode(const AddonInstance_ImageDecoder* instance,
+                                  unsigned char* pixels,
+                                  unsigned int width,
+                                  unsigned int height,
+                                  unsigned int pitch,
+                                  enum ImageFormat format)
+  {
+    return static_cast<CInstanceImageDecoder*>(instance->toAddon->addonInstance)
+        ->Decode(pixels, width, height, pitch, format);
+  }
+
+  AddonInstance_ImageDecoder* m_instanceData;
+};
 
 } /* namespace addon */
 } /* namespace kodi */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
index 252edbf..354806e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
@@ -14,25 +14,31 @@
  */
 
 #include "../AddonBase.h"
-#include "../StreamCrypto.h"
 #include "../StreamCodec.h"
+#include "../StreamCrypto.h"
 
 #ifdef BUILD_KODI_ADDON
 #include "../DemuxPacket.h"
+#include "../InputStreamConstants.h"
 #else
 #include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
+#include "cores/VideoPlayer/Interface/Addon/InputStreamConstants.h"
 #endif
 
-namespace kodi { namespace addon { class CInstanceInputStream; }}
+//Increment this level always if you add features which can lead to compile failures in the addon
+#define INPUTSTREAM_VERSION_LEVEL 2
 
-extern "C" {
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
 
   /*!
    * @brief InputStream add-on capabilities. All capabilities are set to "false" as default.
    */
   struct INPUTSTREAM_CAPABILITIES
   {
-    enum MASKTYPE: uint32_t
+    enum MASKTYPE : uint32_t
     {
       /// supports interface IDemux
       SUPPORTS_IDEMUX = (1 << 0),
@@ -50,7 +56,10 @@ extern "C" {
       SUPPORTS_PAUSE = (1 << 4),
 
       /// supports interface ITime
-      SUPPORTS_ITIME = (1 << 5)
+      SUPPORTS_ITIME = (1 << 5),
+
+      /// supports interface IChapter
+      SUPPORTS_ICHAPTER = (1 << 6),
     };
 
     /// set of supported capabilities
@@ -62,19 +71,18 @@ extern "C" {
    */
   struct INPUTSTREAM
   {
-    static const unsigned int MAX_INFO_COUNT = 8;
-
-    const char *m_strURL;
+    const char* m_strURL;
+    const char* m_mimeType;
 
     unsigned int m_nCountInfoValues;
     struct LISTITEMPROPERTY
     {
-      const char *m_strKey;
-      const char *m_strValue;
-    } m_ListItemProperties[MAX_INFO_COUNT];
+      const char* m_strKey;
+      const char* m_strValue;
+    } m_ListItemProperties[STREAM_MAX_PROPERTY_COUNT];
 
-    const char *m_libFolder;
-    const char *m_profileFolder;
+    const char* m_libFolder;
+    const char* m_profileFolder;
   };
 
   /*!
@@ -82,23 +90,50 @@ extern "C" {
    */
   struct INPUTSTREAM_IDS
   {
-    static const unsigned int MAX_STREAM_COUNT = 32;
+    static const unsigned int MAX_STREAM_COUNT = 256;
     unsigned int m_streamCount;
     unsigned int m_streamIds[MAX_STREAM_COUNT];
   };
 
   /*!
+   * @brief MASTERING Metadata
+   */
+  struct INPUTSTREAM_MASTERING_METADATA
+  {
+    double primary_r_chromaticity_x;
+    double primary_r_chromaticity_y;
+    double primary_g_chromaticity_x;
+    double primary_g_chromaticity_y;
+    double primary_b_chromaticity_x;
+    double primary_b_chromaticity_y;
+    double white_point_chromaticity_x;
+    double white_point_chromaticity_y;
+    double luminance_max;
+    double luminance_min;
+  };
+
+  /*!
+  * @brief CONTENTLIGHT Metadata
+  */
+  struct INPUTSTREAM_CONTENTLIGHT_METADATA
+  {
+    uint64_t max_cll;
+    uint64_t max_fall;
+  };
+
+  /*!
    * @brief stream properties
    */
   struct INPUTSTREAM_INFO
   {
     enum STREAM_TYPE
     {
-      TYPE_NONE,
+      TYPE_NONE = 0,
       TYPE_VIDEO,
       TYPE_AUDIO,
       TYPE_SUBTITLE,
-      TYPE_TELETEXT
+      TYPE_TELETEXT,
+      TYPE_RDS,
     } m_streamType;
 
     enum Codec_FEATURES : uint32_t
@@ -118,65 +153,130 @@ extern "C" {
       FLAG_KARAOKE = 0x0020,
       FLAG_FORCED = 0x0040,
       FLAG_HEARING_IMPAIRED = 0x0080,
-      FLAG_VISUAL_IMPAIRED = 0x0100
+      FLAG_VISUAL_IMPAIRED = 0x0100,
     };
 
-    enum INPUTSTREAM_COLORSPACE
-    {
-      COLORSPACE_UNKNOWN,
-      COLORSPACE_BT709,
-      COLORSPACE_BT470M,
-      COLORSPACE_BT470BG,
-      COLORSPACE_SMPTE170M,
-      COLORSPACE_SMPTE240M,
-      COLORSPACE_FILM,
-      COLORSPACE_BT2020,
-      COLORSPACE_SMPTE428,
-      COLORSPACE_SMPTEST428_1,
-      COLORSPACE_SMPTE431,
-      COLORSPACE_SMPTE432,
-      COLORSPACE_JEDEC_P22
+    // Keep in sync with AVColorSpace
+    enum COLORSPACE
+    {
+      COLORSPACE_RGB = 0,
+      COLORSPACE_BT709 = 1,
+      COLORSPACE_UNSPECIFIED = 2,
+      COLORSPACE_UNKNOWN = COLORSPACE_UNSPECIFIED, // compatibility
+      COLORSPACE_RESERVED = 3,
+      COLORSPACE_FCC = 4,
+      COLORSPACE_BT470BG = 5,
+      COLORSPACE_SMPTE170M = 6,
+      COLORSPACE_SMPTE240M = 7,
+      COLORSPACE_YCGCO = 8,
+      COLORSPACE_YCOCG = COLORSPACE_YCGCO,
+      COLORSPACE_BT2020_NCL = 9,
+      COLORSPACE_BT2020_CL = 10,
+      COLORSPACE_SMPTE2085 = 11,
+      COLORSPACE_CHROMA_DERIVED_NCL = 12,
+      COLORSPACE_CHROMA_DERIVED_CL = 13,
+      COLORSPACE_ICTCP = 14,
+      COLORSPACE_MAX
+    };
+
+    // Keep in sync with AVColorPrimaries
+    enum COLORPRIMARIES : int32_t
+    {
+      COLORPRIMARY_RESERVED0 = 0,
+      COLORPRIMARY_BT709 = 1,
+      COLORPRIMARY_UNSPECIFIED = 2,
+      COLORPRIMARY_RESERVED = 3,
+      COLORPRIMARY_BT470M = 4,
+      COLORPRIMARY_BT470BG = 5,
+      COLORPRIMARY_SMPTE170M = 6,
+      COLORPRIMARY_SMPTE240M = 7,
+      COLORPRIMARY_FILM = 8,
+      COLORPRIMARY_BT2020 = 9,
+      COLORPRIMARY_SMPTE428 = 10,
+      COLORPRIMARY_SMPTEST428_1 = COLORPRIMARY_SMPTE428,
+      COLORPRIMARY_SMPTE431 = 11,
+      COLORPRIMARY_SMPTE432 = 12,
+      COLORPRIMARY_JEDEC_P22 = 22,
+      COLORPRIMARY_MAX
     };
 
-    enum INPUTSTREAM_COLORRANGE
+    // Keep in sync with AVColorRange
+    enum COLORRANGE
     {
-      COLORRANGE_UNKNOWN,
+      COLORRANGE_UNKNOWN = 0,
       COLORRANGE_LIMITED,
-      COLORRANGE_FULLRANGE
+      COLORRANGE_FULLRANGE,
+      COLORRANGE_MAX
+    };
+
+    // keep in sync with AVColorTransferCharacteristic
+    enum COLORTRC : int32_t
+    {
+      COLORTRC_RESERVED0 = 0,
+      COLORTRC_BT709 = 1,
+      COLORTRC_UNSPECIFIED = 2,
+      COLORTRC_RESERVED = 3,
+      COLORTRC_GAMMA22 = 4,
+      COLORTRC_GAMMA28 = 5,
+      COLORTRC_SMPTE170M = 6,
+      COLORTRC_SMPTE240M = 7,
+      COLORTRC_LINEAR = 8,
+      COLORTRC_LOG = 9,
+      COLORTRC_LOG_SQRT = 10,
+      COLORTRC_IEC61966_2_4 = 11,
+      COLORTRC_BT1361_ECG = 12,
+      COLORTRC_IEC61966_2_1 = 13,
+      COLORTRC_BT2020_10 = 14,
+      COLORTRC_BT2020_12 = 15,
+      COLORTRC_SMPTE2084 = 16,
+      COLORTRC_SMPTEST2084 = COLORTRC_SMPTE2084,
+      COLORTRC_SMPTE428 = 17,
+      COLORTRC_SMPTEST428_1 = COLORTRC_SMPTE428,
+      COLORTRC_ARIB_STD_B67 = 18,
+      COLORTRC_MAX
     };
 
     uint32_t m_flags;
 
-    char m_name[256];                    /*!< @brief (optinal) name of the stream, \0 for default handling */
-    char m_codecName[32];                /*!< @brief (required) name of codec according to ffmpeg */
-    char m_codecInternalName[32];        /*!< @brief (optional) internal name of codec (selectionstream info) */
-    STREAMCODEC_PROFILE m_codecProfile;  /*!< @brief (optional) the profile of the codec */
-    unsigned int m_pID;                  /*!< @brief (required) physical index */
+    char m_name[256]; /*!< @brief (optinal) name of the stream, \0 for default handling */
+    char m_codecName[32]; /*!< @brief (required) name of codec according to ffmpeg */
+    char m_codecInternalName
+        [32]; /*!< @brief (optional) internal name of codec (selectionstream info) */
+    STREAMCODEC_PROFILE m_codecProfile; /*!< @brief (optional) the profile of the codec */
+    unsigned int m_pID; /*!< @brief (required) physical index */
 
-    const uint8_t *m_ExtraData;
+    const uint8_t* m_ExtraData;
     unsigned int m_ExtraSize;
 
-    char m_language[64];                 /*!< @brief RFC 5646 language code (empty string if undefined) */
+    char m_language[64]; /*!< @brief RFC 5646 language code (empty string if undefined) */
 
-    unsigned int m_FpsScale;             /*!< @brief Scale of 1000 and a rate of 29970 will result in 29.97 fps */
+    unsigned int
+        m_FpsScale; /*!< @brief Scale of 1000 and a rate of 29970 will result in 29.97 fps */
     unsigned int m_FpsRate;
-    unsigned int m_Height;               /*!< @brief height of the stream reported by the demuxer */
-    unsigned int m_Width;                /*!< @brief width of the stream reported by the demuxer */
-    float m_Aspect;                      /*!< @brief display aspect of stream */
+    unsigned int m_Height; /*!< @brief height of the stream reported by the demuxer */
+    unsigned int m_Width; /*!< @brief width of the stream reported by the demuxer */
+    float m_Aspect; /*!< @brief display aspect of stream */
 
 
-    unsigned int m_Channels;             /*!< @brief (required) amount of channels */
-    unsigned int m_SampleRate;           /*!< @brief (required) sample rate */
-    unsigned int m_BitRate;              /*!< @brief (required) bit rate */
-    unsigned int m_BitsPerSample;        /*!< @brief (required) bits per sample */
+    unsigned int m_Channels; /*!< @brief (required) amount of channels */
+    unsigned int m_SampleRate; /*!< @brief (required) sample rate */
+    unsigned int m_BitRate; /*!< @brief (required) bit rate */
+    unsigned int m_BitsPerSample; /*!< @brief (required) bits per sample */
     unsigned int m_BlockAlign;
 
     CRYPTO_INFO m_cryptoInfo;
 
     // new in API version 2.0.8
-    unsigned int m_codecFourCC;          /*!< @brief Codec If available, the fourcc code codec */
-    INPUTSTREAM_COLORSPACE m_colorSpace; /*!< @brief definition of colorspace */
-    INPUTSTREAM_COLORRANGE m_colorRange; /*!< @brief color range if available */
+    unsigned int m_codecFourCC; /*!< @brief Codec If available, the fourcc code codec */
+    COLORSPACE m_colorSpace; /*!< @brief definition of colorspace */
+    COLORRANGE m_colorRange; /*!< @brief color range if available */
+
+    //new in API 2.0.9 / INPUTSTREAM_VERSION_LEVEL 1
+    COLORPRIMARIES m_colorPrimaries;
+    COLORTRC m_colorTransferCharacteristic;
+    INPUTSTREAM_MASTERING_METADATA* m_masteringMetadata; /*!< @brief mastering static Metadata */
+    INPUTSTREAM_CONTENTLIGHT_METADATA*
+        m_contentLightMetadata; /*!< @brief content light static Metadata */
   };
 
   struct INPUTSTREAM_TIMES
@@ -188,7 +288,7 @@ extern "C" {
   };
 
   /*!
-   * @brief Structure to transfer the methods from xbmc_inputstream_dll.h to XBMC
+   * @brief "C" ABI Structures to transfer the methods from this to Kodi
    */
 
   // this are properties given to the addon on create
@@ -202,53 +302,72 @@ extern "C" {
   {
     KODI_HANDLE kodiInstance;
     DemuxPacket* (*allocate_demux_packet)(void* kodiInstance, int data_size);
-    DemuxPacket* (*allocate_encrypted_demux_packet)(void* kodiInstance, unsigned int data_size, unsigned int encrypted_subsample_count);
+    DemuxPacket* (*allocate_encrypted_demux_packet)(void* kodiInstance,
+                                                    unsigned int data_size,
+                                                    unsigned int encrypted_subsample_count);
     void (*free_demux_packet)(void* kodiInstance, DemuxPacket* packet);
   } AddonToKodiFuncTable_InputStream;
 
   struct AddonInstance_InputStream;
   typedef struct KodiToAddonFuncTable_InputStream /* internal */
   {
-    kodi::addon::CInstanceInputStream* addonInstance;
+    KODI_HANDLE addonInstance;
 
-    bool (__cdecl* open)(const AddonInstance_InputStream* instance, INPUTSTREAM* props);
-    void (__cdecl* close)(const AddonInstance_InputStream* instance);
-    const char* (__cdecl* get_path_list)(const AddonInstance_InputStream* instance);
-    void (__cdecl* get_capabilities)(const AddonInstance_InputStream* instance, INPUTSTREAM_CAPABILITIES* capabilities);
+    bool(__cdecl* open)(const AddonInstance_InputStream* instance, INPUTSTREAM* props);
+    void(__cdecl* close)(const AddonInstance_InputStream* instance);
+    const char*(__cdecl* get_path_list)(const AddonInstance_InputStream* instance);
+    void(__cdecl* get_capabilities)(const AddonInstance_InputStream* instance,
+                                    INPUTSTREAM_CAPABILITIES* capabilities);
 
     // IDemux
-    struct INPUTSTREAM_IDS (__cdecl* get_stream_ids)(const AddonInstance_InputStream* instance);
-    struct INPUTSTREAM_INFO (__cdecl* get_stream)(const AddonInstance_InputStream* instance, int streamid);
-    void (__cdecl* enable_stream)(const AddonInstance_InputStream* instance, int streamid, bool enable);
+    struct INPUTSTREAM_IDS(__cdecl* get_stream_ids)(const AddonInstance_InputStream* instance);
+    struct INPUTSTREAM_INFO(__cdecl* get_stream)(const AddonInstance_InputStream* instance,
+                                                 int streamid);
+    void(__cdecl* enable_stream)(const AddonInstance_InputStream* instance,
+                                 int streamid,
+                                 bool enable);
     bool(__cdecl* open_stream)(const AddonInstance_InputStream* instance, int streamid);
-    void (__cdecl* demux_reset)(const AddonInstance_InputStream* instance);
-    void (__cdecl* demux_abort)(const AddonInstance_InputStream* instance);
-    void (__cdecl* demux_flush)(const AddonInstance_InputStream* instance);
-    DemuxPacket* (__cdecl* demux_read)(const AddonInstance_InputStream* instance);
-    bool (__cdecl* demux_seek_time)(const AddonInstance_InputStream* instance, double time, bool backwards, double* startpts);
-    void (__cdecl* demux_set_speed)(const AddonInstance_InputStream* instance, int speed);
-    void (__cdecl* set_video_resolution)(const AddonInstance_InputStream* instance, int width, int height);
+    void(__cdecl* demux_reset)(const AddonInstance_InputStream* instance);
+    void(__cdecl* demux_abort)(const AddonInstance_InputStream* instance);
+    void(__cdecl* demux_flush)(const AddonInstance_InputStream* instance);
+    DemuxPacket*(__cdecl* demux_read)(const AddonInstance_InputStream* instance);
+    bool(__cdecl* demux_seek_time)(const AddonInstance_InputStream* instance,
+                                   double time,
+                                   bool backwards,
+                                   double* startpts);
+    void(__cdecl* demux_set_speed)(const AddonInstance_InputStream* instance, int speed);
+    void(__cdecl* set_video_resolution)(const AddonInstance_InputStream* instance,
+                                        int width,
+                                        int height);
 
     // IDisplayTime
-    int (__cdecl* get_total_time)(const AddonInstance_InputStream* instance);
-    int (__cdecl* get_time)(const AddonInstance_InputStream* instance);
+    int(__cdecl* get_total_time)(const AddonInstance_InputStream* instance);
+    int(__cdecl* get_time)(const AddonInstance_InputStream* instance);
 
     // ITime
-    bool(__cdecl* get_times)(const AddonInstance_InputStream* instance, INPUTSTREAM_TIMES *times);
+    bool(__cdecl* get_times)(const AddonInstance_InputStream* instance, INPUTSTREAM_TIMES* times);
 
     // IPosTime
-    bool (__cdecl* pos_time)(const AddonInstance_InputStream* instance, int ms);
-
-    // Seekable (mandatory)
-    bool (__cdecl* can_pause_stream)(const AddonInstance_InputStream* instance);
-    bool (__cdecl* can_seek_stream)(const AddonInstance_InputStream* instance);
-
-    int (__cdecl* read_stream)(const AddonInstance_InputStream* instance, uint8_t* buffer, unsigned int bufferSize);
-    int64_t(__cdecl* seek_stream)(const AddonInstance_InputStream* instance, int64_t position, int whence);
-    int64_t (__cdecl* position_stream)(const AddonInstance_InputStream* instance);
-    int64_t (__cdecl* length_stream)(const AddonInstance_InputStream* instance);
-    void (__cdecl* pause_stream)(const AddonInstance_InputStream* instance, double time);
-    bool (__cdecl* is_real_time_stream)(const AddonInstance_InputStream* instance);
+    bool(__cdecl* pos_time)(const AddonInstance_InputStream* instance, int ms);
+
+    int(__cdecl* read_stream)(const AddonInstance_InputStream* instance,
+                              uint8_t* buffer,
+                              unsigned int bufferSize);
+    int64_t(__cdecl* seek_stream)(const AddonInstance_InputStream* instance,
+                                  int64_t position,
+                                  int whence);
+    int64_t(__cdecl* position_stream)(const AddonInstance_InputStream* instance);
+    int64_t(__cdecl* length_stream)(const AddonInstance_InputStream* instance);
+    bool(__cdecl* is_real_time_stream)(const AddonInstance_InputStream* instance);
+
+    // IChapter
+    int(__cdecl* get_chapter)(const AddonInstance_InputStream* instance);
+    int(__cdecl* get_chapter_count)(const AddonInstance_InputStream* instance);
+    const char*(__cdecl* get_chapter_name)(const AddonInstance_InputStream* instance, int ch);
+    int64_t(__cdecl* get_chapter_pos)(const AddonInstance_InputStream* instance, int ch);
+    bool(__cdecl* seek_chapter)(const AddonInstance_InputStream* instance, int ch);
+
+    int(__cdecl* block_size_stream)(const AddonInstance_InputStream* instance);
   } KodiToAddonFuncTable_InputStream;
 
   typedef struct AddonInstance_InputStream /* internal */
@@ -258,6 +377,7 @@ extern "C" {
     KodiToAddonFuncTable_InputStream toAddon;
   } AddonInstance_InputStream;
 
+#ifdef __cplusplus
 } /* extern "C" */
 
 namespace kodi
@@ -265,90 +385,93 @@ namespace kodi
 namespace addon
 {
 
-  class CInstanceInputStream : public IAddonInstance
+class ATTRIBUTE_HIDDEN CInstanceInputStream : public IAddonInstance
+{
+public:
+  explicit CInstanceInputStream(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_INPUTSTREAM,
+                     !kodiVersion.empty() ? kodiVersion
+                                          : GetKodiTypeVersion(ADDON_INSTANCE_INPUTSTREAM))
   {
-  public:
-    explicit CInstanceInputStream(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_INPUTSTREAM)
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceInputStream: Creation of multiple together with single instance way is not allowed!");
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceInputStream: Creation of multiple together "
+                             "with single instance way is not allowed!");
 
-      SetAddonStruct(instance);
-    }
+    SetAddonStruct(instance, m_kodiVersion);
+  }
 
-    ~CInstanceInputStream() override = default;
+  ~CInstanceInputStream() override = default;
 
-    /*!
+  /*!
      * Open a stream.
      * @param props
      * @return True if the stream has been opened successfully, false otherwise.
      * @remarks
      */
-    virtual bool Open(INPUTSTREAM& props) = 0;
+  virtual bool Open(INPUTSTREAM& props) = 0;
 
-    /*!
+  /*!
      * Close an open stream.
      * @remarks
      */
-    virtual void Close() = 0;
+  virtual void Close() = 0;
 
-    /*!
+  /*!
      * Get Capabilities of this addon.
      * @param capabilities The add-on's capabilities.
      * @remarks
      */
-    virtual void GetCapabilities(INPUTSTREAM_CAPABILITIES& capabilities) = 0;
+  virtual void GetCapabilities(INPUTSTREAM_CAPABILITIES& capabilities) = 0;
 
-    /*!
+  /*!
      * Get IDs of available streams
      * @remarks
      */
-    virtual INPUTSTREAM_IDS GetStreamIds() = 0;
+  virtual INPUTSTREAM_IDS GetStreamIds() = 0;
 
-    /*!
+  /*!
      * Get stream properties of a stream.
      * @param streamid unique id of stream
      * @return struc of stream properties
      * @remarks
      */
-    virtual INPUTSTREAM_INFO GetStream(int streamid) = 0;
+  virtual INPUTSTREAM_INFO GetStream(int streamid) = 0;
 
-    /*!
+  /*!
      * Enable or disable a stream.
      * A disabled stream does not send demux packets
      * @param streamid unique id of stream
      * @param enable true for enable, false for disable
      * @remarks
      */
-    virtual void EnableStream(int streamid, bool enable) = 0;
+  virtual void EnableStream(int streamid, bool enable) = 0;
 
-    /*!
+  /*!
     * Opens a stream for playback.
     * @param streamid unique id of stream
     * @remarks
     */
-    virtual bool OpenStream(int streamid) = 0;
+  virtual bool OpenStream(int streamid) = 0;
 
-    /*!
+  /*!
      * Reset the demultiplexer in the add-on.
      * @remarks Required if bHandlesDemuxing is set to true.
      */
-    virtual void DemuxReset() { }
+  virtual void DemuxReset() {}
 
-    /*!
+  /*!
      * Abort the demultiplexer thread in the add-on.
      * @remarks Required if bHandlesDemuxing is set to true.
      */
-    virtual void DemuxAbort() { }
+  virtual void DemuxAbort() {}
 
-    /*!
+  /*!
      * Flush all data that's currently in the demultiplexer buffer in the add-on.
      * @remarks Required if bHandlesDemuxing is set to true.
      */
-    virtual void DemuxFlush() { }
+  virtual void DemuxFlush() {}
 
-    /*!
+  /*!
      * Read the next packet from the demultiplexer, if there is one.
      * @return The next packet.
      *         If there is no next packet, then the add-on should return the
@@ -357,12 +480,12 @@ namespace addon
      *         then, the add-on should call AllocateDemuxPacket(0) on the
      *         callback, and set the streamid to DMX_SPECIALID_STREAMCHANGE and
      *         return the value.
-     *         The add-on should return NULL if an error occured.
+     *         The add-on should return NULL if an error occurred.
      * @remarks Return NULL if this add-on won't provide this function.
      */
-    virtual DemuxPacket* DemuxRead() { return nullptr; }
+  virtual DemuxPacket* DemuxRead() { return nullptr; }
 
-    /*!
+  /*!
      * Notify the InputStream addon/demuxer that Kodi wishes to seek the stream by time
      * Demuxer is required to set stream to an IDR frame
      * @param time The absolute time since stream start
@@ -371,314 +494,388 @@ namespace addon
      * @return True if the seek operation was possible
      * @remarks Optional, and only used if addon has its own demuxer.
      */
-    virtual bool DemuxSeekTime(double time, bool backwards, double &startpts) { return false; }
+  virtual bool DemuxSeekTime(double time, bool backwards, double& startpts) { return false; }
 
-    /*!
+  /*!
      * Notify the InputStream addon/demuxer that Kodi wishes to change playback speed
      * @param speed The requested playback speed
      * @remarks Optional, and only used if addon has its own demuxer.
      */
-    virtual void DemuxSetSpeed(int speed) { }
+  virtual void DemuxSetSpeed(int speed) {}
 
-    /*!
+  /*!
      * Sets desired width / height
      * @param width / hight
      */
-    virtual void SetVideoResolution(int width, int height) { }
+  virtual void SetVideoResolution(int width, int height) {}
 
-    /*!
+  /*!
      * Totel time in ms
      * @remarks
      */
-    virtual int GetTotalTime() { return -1; }
+  virtual int GetTotalTime() { return -1; }
 
-    /*!
+  /*!
      * Playing time in ms
      * @remarks
      */
-    virtual int GetTime() { return -1; }
+  virtual int GetTime() { return -1; }
 
-    /*!
+  /*!
     * Get current timing values in PTS scale
     * @remarks
     */
-    virtual bool GetTimes(INPUTSTREAM_TIMES &times) { return false; }
+  virtual bool GetTimes(INPUTSTREAM_TIMES& times) { return false; }
 
-    /*!
+  /*!
      * Positions inputstream to playing time given in ms
      * @remarks
      */
-    virtual bool PosTime(int ms) { return false; }
+  virtual bool PosTime(int ms) { return false; }
 
+  /*!
+  * Return currently selected chapter
+  * @remarks
+  */
+  virtual int GetChapter() { return -1; };
 
-    /*!
-     * Check if the backend support pausing the currently playing stream
-     * This will enable/disable the pause button in Kodi based on the return value
-     * @return false if the InputStream addon/backend does not support pausing, true if possible
-     */
-    virtual bool CanPauseStream() { return false; }
+  /*!
+  * Return number of available chapters
+  * @remarks
+  */
+  virtual int GetChapterCount() { return 0; };
 
-    /*!
-     * Check if the backend supports seeking for the currently playing stream
-     * This will enable/disable the rewind/forward buttons in Kodi based on the return value
-     * @return false if the InputStream addon/backend does not support seeking, true if possible
-     */
-    virtual bool CanSeekStream() { return false; }
+  /*!
+  * Return name of chapter # ch
+  * @remarks
+  */
+  virtual const char* GetChapterName(int ch) { return nullptr; };
+
+  /*!
+  * Return position if chapter # ch in milliseconds
+  * @remarks
+  */
+  virtual int64_t GetChapterPos(int ch) { return 0; };
+
+  /*!
+  * Seek to the beginning of chapter # ch
+  * @remarks
+  */
+  virtual bool SeekChapter(int ch) { return false; };
 
-    /*!
+  /*!
      * Read from an open stream.
      * @param buffer The buffer to store the data in.
      * @param bufferSize The amount of bytes to read.
      * @return The amount of bytes that were actually read from the stream.
      * @remarks Return -1 if this add-on won't provide this function.
      */
-    virtual int ReadStream(uint8_t* buffer, unsigned int bufferSize) { return -1; }
+  virtual int ReadStream(uint8_t* buffer, unsigned int bufferSize) { return -1; }
 
-    /*!
+  /*!
      * Seek in a stream.
      * @param position The position to seek to.
      * @param whence ?
      * @return The new position.
      * @remarks Return -1 if this add-on won't provide this function.
      */
-    virtual int64_t SeekStream(int64_t position, int whence = SEEK_SET) { return -1; }
+  virtual int64_t SeekStream(int64_t position, int whence = SEEK_SET) { return -1; }
 
-    /*!
+  /*!
      * @return The position in the stream that's currently being read.
      * @remarks Return -1 if this add-on won't provide this function.
      */
-    virtual int64_t PositionStream() { return -1; }
+  virtual int64_t PositionStream() { return -1; }
 
-    /*!
+  /*!
      * @return The total length of the stream that's currently being read.
      * @remarks Return -1 if this add-on won't provide this function.
      */
-    virtual int64_t LengthStream() { return -1; }
-
+  virtual int64_t LengthStream() { return -1; }
 
-    /*!
-     * @brief Notify the InputStream addon that Kodi (un)paused the currently playing stream
+  /*!
+     * @return Obtain the chunk size to use when reading streams.
+     * @remarks Return 0 if this add-on won't provide this function.
      */
-    virtual void PauseStream(double time) { }
-
+  virtual int GetBlockSize() { return 0; }
 
-    /*!
+  /*!
      *  Check for real-time streaming
      *  @return true if current stream is real-time
      */
-    virtual bool IsRealTimeStream() { return true; }
+  virtual bool IsRealTimeStream() { return true; }
 
-    /*!
+  /*!
      * @brief Allocate a demux packet. Free with FreeDemuxPacket
      * @param dataSize The size of the data that will go into the packet
      * @return The allocated packet
      */
-    DemuxPacket* AllocateDemuxPacket(int dataSize)
-    {
-      return m_instanceData->toKodi.allocate_demux_packet(m_instanceData->toKodi.kodiInstance, dataSize);
-    }
+  DemuxPacket* AllocateDemuxPacket(int dataSize)
+  {
+    return m_instanceData->toKodi.allocate_demux_packet(m_instanceData->toKodi.kodiInstance,
+                                                        dataSize);
+  }
 
-    /*!
+  /*!
      * @brief Allocate a demux packet. Free with FreeDemuxPacket
      * @param dataSize The size of the data that will go into the packet
      * @return The allocated packet
      */
-    DemuxPacket* AllocateEncryptedDemuxPacket(int dataSize, unsigned int encryptedSubsampleCount)
-    {
-      return m_instanceData->toKodi.allocate_encrypted_demux_packet(m_instanceData->toKodi.kodiInstance, dataSize, encryptedSubsampleCount);
-    }
+  DemuxPacket* AllocateEncryptedDemuxPacket(int dataSize, unsigned int encryptedSubsampleCount)
+  {
+    return m_instanceData->toKodi.allocate_encrypted_demux_packet(
+        m_instanceData->toKodi.kodiInstance, dataSize, encryptedSubsampleCount);
+  }
 
-    /*!
+  /*!
      * @brief Free a packet that was allocated with AllocateDemuxPacket
      * @param packet The packet to free
      */
-    void FreeDemuxPacket(DemuxPacket* packet)
-    {
-      return m_instanceData->toKodi.free_demux_packet(m_instanceData->toKodi.kodiInstance, packet);
-    }
+  void FreeDemuxPacket(DemuxPacket* packet)
+  {
+    return m_instanceData->toKodi.free_demux_packet(m_instanceData->toKodi.kodiInstance, packet);
+  }
 
-  private:
-    void SetAddonStruct(KODI_HANDLE instance)
-    {
-      if (instance == nullptr)
-        throw std::logic_error("kodi::addon::CInstanceInputStream: Creation with empty addon structure not allowed, table must be given from Kodi!");
-
-      m_instanceData = static_cast<AddonInstance_InputStream*>(instance);
-      m_instanceData->toAddon.addonInstance = this;
-      m_instanceData->toAddon.open = ADDON_Open;
-      m_instanceData->toAddon.close = ADDON_Close;
-      m_instanceData->toAddon.get_capabilities = ADDON_GetCapabilities;
-
-      m_instanceData->toAddon.get_stream_ids = ADDON_GetStreamIds;
-      m_instanceData->toAddon.get_stream = ADDON_GetStream;
-      m_instanceData->toAddon.enable_stream = ADDON_EnableStream;
-      m_instanceData->toAddon.open_stream = ADDON_OpenStream;
-      m_instanceData->toAddon.demux_reset = ADDON_DemuxReset;
-      m_instanceData->toAddon.demux_abort = ADDON_DemuxAbort;
-      m_instanceData->toAddon.demux_flush = ADDON_DemuxFlush;
-      m_instanceData->toAddon.demux_read = ADDON_DemuxRead;
-      m_instanceData->toAddon.demux_seek_time = ADDON_DemuxSeekTime;
-      m_instanceData->toAddon.demux_set_speed = ADDON_DemuxSetSpeed;
-      m_instanceData->toAddon.set_video_resolution = ADDON_SetVideoResolution;
-
-      m_instanceData->toAddon.get_total_time = ADDON_GetTotalTime;
-      m_instanceData->toAddon.get_time = ADDON_GetTime;
-
-      m_instanceData->toAddon.get_times = ADDON_GetTimes;
-
-      m_instanceData->toAddon.pos_time = ADDON_PosTime;
-
-      m_instanceData->toAddon.can_pause_stream = ADDON_CanPauseStream;
-      m_instanceData->toAddon.can_seek_stream = ADDON_CanSeekStream;
-
-      m_instanceData->toAddon.read_stream = ADDON_ReadStream;
-      m_instanceData->toAddon.seek_stream = ADDON_SeekStream;
-      m_instanceData->toAddon.position_stream = ADDON_PositionStream;
-      m_instanceData->toAddon.length_stream = ADDON_LengthStream;
-      m_instanceData->toAddon.pause_stream = ADDON_PauseStream;
-      m_instanceData->toAddon.is_real_time_stream = ADDON_IsRealTimeStream;
-    }
+private:
+  static int compareVersion(const int v1[3], const int v2[3])
+  {
+    for (unsigned i(0); i < 3; ++i)
+      if (v1[i] != v2[i])
+        return v1[i] - v2[i];
+    return 0;
+  }
 
-    inline static bool ADDON_Open(const AddonInstance_InputStream* instance, INPUTSTREAM* props)
-    {
-      return instance->toAddon.addonInstance->Open(*props);
+  void SetAddonStruct(KODI_HANDLE instance, const std::string& kodiVersion)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceInputStream: Creation with empty addon "
+                             "structure not allowed, table must be given from Kodi!");
+    int api[3] = { 0, 0, 0 };
+    sscanf(kodiVersion.c_str(), "%d.%d.%d", &api[0], &api[1], &api[2]);
+
+    m_instanceData = static_cast<AddonInstance_InputStream*>(instance);
+    m_instanceData->toAddon.addonInstance = this;
+    m_instanceData->toAddon.open = ADDON_Open;
+    m_instanceData->toAddon.close = ADDON_Close;
+    m_instanceData->toAddon.get_capabilities = ADDON_GetCapabilities;
+
+    m_instanceData->toAddon.get_stream_ids = ADDON_GetStreamIds;
+    m_instanceData->toAddon.get_stream = ADDON_GetStream;
+    m_instanceData->toAddon.enable_stream = ADDON_EnableStream;
+    m_instanceData->toAddon.open_stream = ADDON_OpenStream;
+    m_instanceData->toAddon.demux_reset = ADDON_DemuxReset;
+    m_instanceData->toAddon.demux_abort = ADDON_DemuxAbort;
+    m_instanceData->toAddon.demux_flush = ADDON_DemuxFlush;
+    m_instanceData->toAddon.demux_read = ADDON_DemuxRead;
+    m_instanceData->toAddon.demux_seek_time = ADDON_DemuxSeekTime;
+    m_instanceData->toAddon.demux_set_speed = ADDON_DemuxSetSpeed;
+    m_instanceData->toAddon.set_video_resolution = ADDON_SetVideoResolution;
+
+    m_instanceData->toAddon.get_total_time = ADDON_GetTotalTime;
+    m_instanceData->toAddon.get_time = ADDON_GetTime;
+
+    m_instanceData->toAddon.get_times = ADDON_GetTimes;
+    m_instanceData->toAddon.pos_time = ADDON_PosTime;
+
+    m_instanceData->toAddon.read_stream = ADDON_ReadStream;
+    m_instanceData->toAddon.seek_stream = ADDON_SeekStream;
+    m_instanceData->toAddon.position_stream = ADDON_PositionStream;
+    m_instanceData->toAddon.length_stream = ADDON_LengthStream;
+    m_instanceData->toAddon.is_real_time_stream = ADDON_IsRealTimeStream;
+
+    int minChapterVersion[3] = { 2, 0, 10 };
+    if (compareVersion(api, minChapterVersion) >= 0)
+    {
+      m_instanceData->toAddon.get_chapter = ADDON_GetChapter;
+      m_instanceData->toAddon.get_chapter_count = ADDON_GetChapterCount;
+      m_instanceData->toAddon.get_chapter_name = ADDON_GetChapterName;
+      m_instanceData->toAddon.get_chapter_pos = ADDON_GetChapterPos;
+      m_instanceData->toAddon.seek_chapter = ADDON_SeekChapter;
     }
 
-    inline static void ADDON_Close(const AddonInstance_InputStream* instance)
+    int minBlockSizeVersion[3] = {2, 0, 12};
+    if (compareVersion(api, minBlockSizeVersion) >= 0)
     {
-      instance->toAddon.addonInstance->Close();
+      m_instanceData->toAddon.block_size_stream = ADDON_GetBlockSize;
     }
+  }
 
-    inline static void ADDON_GetCapabilities(const AddonInstance_InputStream* instance, INPUTSTREAM_CAPABILITIES* capabilities)
-    {
-      instance->toAddon.addonInstance->GetCapabilities(*capabilities);
-    }
+  inline static bool ADDON_Open(const AddonInstance_InputStream* instance, INPUTSTREAM* props)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->Open(*props);
+  }
 
+  inline static void ADDON_Close(const AddonInstance_InputStream* instance)
+  {
+    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->Close();
+  }
 
-    // IDemux
-    inline static struct INPUTSTREAM_IDS ADDON_GetStreamIds(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->GetStreamIds();
-    }
+  inline static void ADDON_GetCapabilities(const AddonInstance_InputStream* instance,
+                                           INPUTSTREAM_CAPABILITIES* capabilities)
+  {
+    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+        ->GetCapabilities(*capabilities);
+  }
 
-    inline static struct INPUTSTREAM_INFO ADDON_GetStream(const AddonInstance_InputStream* instance, int streamid)
-    {
-      return instance->toAddon.addonInstance->GetStream(streamid);
-    }
 
-    inline static void ADDON_EnableStream(const AddonInstance_InputStream* instance, int streamid, bool enable)
-    {
-      instance->toAddon.addonInstance->EnableStream(streamid, enable);
-    }
+  // IDemux
+  inline static struct INPUTSTREAM_IDS ADDON_GetStreamIds(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetStreamIds();
+  }
 
-    inline static bool ADDON_OpenStream(const AddonInstance_InputStream* instance, int streamid)
-    {
-      return instance->toAddon.addonInstance->OpenStream(streamid);
-    }
+  inline static struct INPUTSTREAM_INFO ADDON_GetStream(const AddonInstance_InputStream* instance,
+                                                        int streamid)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetStream(streamid);
+  }
 
-    inline static void ADDON_DemuxReset(const AddonInstance_InputStream* instance)
-    {
-      instance->toAddon.addonInstance->DemuxReset();
-    }
+  inline static void ADDON_EnableStream(const AddonInstance_InputStream* instance,
+                                        int streamid,
+                                        bool enable)
+  {
+    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+        ->EnableStream(streamid, enable);
+  }
 
-    inline static void ADDON_DemuxAbort(const AddonInstance_InputStream* instance)
-    {
-      instance->toAddon.addonInstance->DemuxAbort();
-    }
+  inline static bool ADDON_OpenStream(const AddonInstance_InputStream* instance, int streamid)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+        ->OpenStream(streamid);
+  }
 
-    inline static void ADDON_DemuxFlush(const AddonInstance_InputStream* instance)
-    {
-      instance->toAddon.addonInstance->DemuxFlush();
-    }
+  inline static void ADDON_DemuxReset(const AddonInstance_InputStream* instance)
+  {
+    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxReset();
+  }
 
-    inline static DemuxPacket* ADDON_DemuxRead(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->DemuxRead();
-    }
+  inline static void ADDON_DemuxAbort(const AddonInstance_InputStream* instance)
+  {
+    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxAbort();
+  }
 
-    inline static bool ADDON_DemuxSeekTime(const AddonInstance_InputStream* instance, double time, bool backwards, double *startpts)
-    {
-      return instance->toAddon.addonInstance->DemuxSeekTime(time, backwards, *startpts);
-    }
+  inline static void ADDON_DemuxFlush(const AddonInstance_InputStream* instance)
+  {
+    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxFlush();
+  }
 
-    inline static void ADDON_DemuxSetSpeed(const AddonInstance_InputStream* instance, int speed)
-    {
-      instance->toAddon.addonInstance->DemuxSetSpeed(speed);
-    }
+  inline static DemuxPacket* ADDON_DemuxRead(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxRead();
+  }
 
-    inline static void ADDON_SetVideoResolution(const AddonInstance_InputStream* instance, int width, int height)
-    {
-      instance->toAddon.addonInstance->SetVideoResolution(width, height);
-    }
+  inline static bool ADDON_DemuxSeekTime(const AddonInstance_InputStream* instance,
+                                         double time,
+                                         bool backwards,
+                                         double* startpts)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+        ->DemuxSeekTime(time, backwards, *startpts);
+  }
 
+  inline static void ADDON_DemuxSetSpeed(const AddonInstance_InputStream* instance, int speed)
+  {
+    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->DemuxSetSpeed(speed);
+  }
 
-    // IDisplayTime
-    inline static int ADDON_GetTotalTime(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->GetTotalTime();
-    }
+  inline static void ADDON_SetVideoResolution(const AddonInstance_InputStream* instance,
+                                              int width,
+                                              int height)
+  {
+    static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+        ->SetVideoResolution(width, height);
+  }
 
-    inline static int ADDON_GetTime(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->GetTime();
-    }
 
-    // ITime
-    inline static bool ADDON_GetTimes(const AddonInstance_InputStream* instance, INPUTSTREAM_TIMES *times)
-    {
-      return instance->toAddon.addonInstance->GetTimes(*times);
-    }
+  // IDisplayTime
+  inline static int ADDON_GetTotalTime(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetTotalTime();
+  }
 
-    // IPosTime
-    inline static bool ADDON_PosTime(const AddonInstance_InputStream* instance, int ms)
-    {
-      return instance->toAddon.addonInstance->PosTime(ms);
-    }
+  inline static int ADDON_GetTime(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetTime();
+  }
 
-    // Seekable (mandatory)
-    inline static bool ADDON_CanPauseStream(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->CanPauseStream();
-    }
+  // ITime
+  inline static bool ADDON_GetTimes(const AddonInstance_InputStream* instance,
+                                    INPUTSTREAM_TIMES* times)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetTimes(*times);
+  }
 
-    inline static bool ADDON_CanSeekStream(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->CanSeekStream();
-    }
+  // IPosTime
+  inline static bool ADDON_PosTime(const AddonInstance_InputStream* instance, int ms)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->PosTime(ms);
+  }
 
+  inline static int ADDON_GetChapter(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetChapter();
+  }
 
-    inline static int ADDON_ReadStream(const AddonInstance_InputStream* instance, uint8_t* buffer, unsigned int bufferSize)
-    {
-      return instance->toAddon.addonInstance->ReadStream(buffer, bufferSize);
-    }
+  inline static int ADDON_GetChapterCount(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetChapterCount();
+  }
 
-    inline static int64_t ADDON_SeekStream(const AddonInstance_InputStream* instance, int64_t position, int whence)
-    {
-      return instance->toAddon.addonInstance->SeekStream(position, whence);
-    }
+  inline static const char* ADDON_GetChapterName(const AddonInstance_InputStream* instance, int ch)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetChapterName(ch);
+  }
 
-    inline static int64_t ADDON_PositionStream(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->PositionStream();
-    }
+  inline static int64_t ADDON_GetChapterPos(const AddonInstance_InputStream* instance, int ch)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetChapterPos(ch);
+  }
 
-    inline static int64_t ADDON_LengthStream(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->LengthStream();
-    }
+  inline static bool ADDON_SeekChapter(const AddonInstance_InputStream* instance, int ch)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->SeekChapter(ch);
+  }
 
-    inline static void ADDON_PauseStream(const AddonInstance_InputStream* instance, double time)
-    {
-      instance->toAddon.addonInstance->PauseStream(time);
-    }
+  inline static int ADDON_ReadStream(const AddonInstance_InputStream* instance,
+                                     uint8_t* buffer,
+                                     unsigned int bufferSize)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+        ->ReadStream(buffer, bufferSize);
+  }
 
-    inline static bool ADDON_IsRealTimeStream(const AddonInstance_InputStream* instance)
-    {
-      return instance->toAddon.addonInstance->IsRealTimeStream();
-    }
+  inline static int64_t ADDON_SeekStream(const AddonInstance_InputStream* instance,
+                                         int64_t position,
+                                         int whence)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)
+        ->SeekStream(position, whence);
+  }
 
-    AddonInstance_InputStream* m_instanceData;
-  };
+  inline static int64_t ADDON_PositionStream(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->PositionStream();
+  }
+
+  inline static int64_t ADDON_LengthStream(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->LengthStream();
+  }
+
+  inline static int ADDON_GetBlockSize(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->GetBlockSize();
+  }
+
+  inline static bool ADDON_IsRealTimeStream(const AddonInstance_InputStream* instance)
+  {
+    return static_cast<CInstanceInputStream*>(instance->toAddon.addonInstance)->IsRealTimeStream();
+  }
+
+  AddonInstance_InputStream* m_instanceData;
+};
 
 } /* namespace addon */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h
new file mode 100644
index 0000000..0bca8e2
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PVR.h
@@ -0,0 +1,3423 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../c-api/addon-instance/pvr.h"
+#include "pvr/ChannelGroups.h"
+#include "pvr/Channels.h"
+#include "pvr/EDL.h"
+#include "pvr/EPG.h"
+#include "pvr/General.h"
+#include "pvr/MenuHook.h"
+#include "pvr/Recordings.h"
+#include "pvr/Stream.h"
+#include "pvr/Timers.h"
+
+#ifdef __cplusplus
+
+/*!
+ * @internal
+ * @brief PVR "C++" API interface
+ *
+ * In this field are the pure addon-side C++ data.
+ *
+ * @note Changes can be made without problems and have no influence on other
+ * PVR addons that have already been created.\n
+ * \n
+ * Therefore, @ref ADDON_INSTANCE_VERSION_PVR_MIN can be ignored for these
+ * fields and only the @ref ADDON_INSTANCE_VERSION_PVR needs to be increased.\n
+ * \n
+ * Only must be min version increased if a new compile of addon breaks after
+ * changes here.
+ *
+ * Have by add of new parts a look about **Doxygen** `\\ingroup`, so that
+ * added parts included in documentation.
+ *
+ * If you add addon side related documentation, where his dev need know, use `///`.
+ * For parts only for Kodi make it like here.
+ *
+ * @endinternal
+ */
+
+namespace kodi
+{
+namespace addon
+{
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Doxygen group set for the definitions
+//{{{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_addon_pvr
+/// @brief **PVR client add-on instance definition values**\n
+/// All PVR functions associated data structures.
+///
+/// Used to exchange the available options between Kodi and addon.\n
+/// The groups described here correspond to the groups of functions on PVR
+/// instance class.
+///
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_General 1. General
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **PVR add-on general variables**\n
+/// Used to exchange the available options between Kodi and addon.
+///
+/// This group also includes @ref cpp_kodi_addon_pvr_Defs_PVRCapabilities with
+/// which Kodi an @ref kodi::addon::CInstancePVRClient::GetCapabilities()
+/// queries the supported **modules** of the addon.
+///
+/// The standard values are also below, once for error messages and once to
+/// @ref kodi::addon::CInstancePVRClient::ConnectionStateChange() to give Kodi
+/// any information.
+///
+///@{
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_General_Inputstream class PVRStreamProperty & definition PVR_STREAM_PROPERTY
+/// @ingroup cpp_kodi_addon_pvr_Defs_General
+/// @brief **Inputstream variables**\n
+/// This includes values related to the outside of PVR available inputstream
+/// system.
+///
+/// This can be by separate instance on same addon, by handling in Kodi itself
+/// or to reference of another addon where support needed inputstream.
+///
+/// @note This is complete independent from own system included here
+/// @ref cpp_kodi_addon_pvr_Streams "inputstream".
+///
+//------------------------------------------------------------------------------
+///@}
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_Channel 2. Channel
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **PVR add-on channel**\n
+/// Used to exchange the available channel options between Kodi and addon.
+///
+/// Modules here are mainly intended for @ref cpp_kodi_addon_pvr_Channels "channels",
+/// but are also used on other modules to identify the respective TV/radio
+/// channel.
+///
+/// Because of @ref cpp_kodi_addon_pvr_Defs_Channel_PVRSignalStatus and
+/// @ref cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo is a special case at
+/// this point. This is currently only used on running streams, but it may be
+/// possible that this must always be usable in connection with PiP in the
+/// future.
+///
+//------------------------------------------------------------------------------
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_ChannelGroup 3. Channel Group
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **PVR add-on channel group**\n
+/// This group contains data classes and values which are used in PVR on
+/// @ref cpp_kodi_addon_pvr_supportsChannelGroups "channel groups".
+///
+//------------------------------------------------------------------------------
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_epg 4. EPG Tag
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **PVR add-on EPG data**\n
+/// Used on @ref cpp_kodi_addon_pvr_EPGTag "EPG methods in PVR instance class".
+///
+/// See related modules about, also below in this view are few macros where
+/// default values of associated places.
+///
+//------------------------------------------------------------------------------
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_Recording 5. Recording
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **Representation of a recording**\n
+/// Used to exchange the available recording data between Kodi and addon on
+/// @ref cpp_kodi_addon_pvr_Recordings "Recordings methods in PVR instance class".
+///
+//------------------------------------------------------------------------------
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_Timer 6. Timer
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **PVR add-on timer data**\n
+/// Used to exchange the available timer data between Kodi and addon on
+/// @ref cpp_kodi_addon_pvr_Timers "Timers methods in PVR instance class".
+///
+//------------------------------------------------------------------------------
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_Menuhook 7. Menuhook
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **PVR Context menu data**\n
+/// Define data for the context menus available to the user
+///
+//------------------------------------------------------------------------------
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_EDLEntry 8. Edit decision list (EDL)
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **An edit decision list or EDL is used in the post-production process
+/// of film editing and video editing**\n
+/// Used on @ref kodi::addon::CInstancePVRClient::GetEPGTagEdl and
+/// @ref kodi::addon::CInstancePVRClient::GetRecordingEdl
+///
+//------------------------------------------------------------------------------
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_pvr_Defs_Stream 9. Inputstream
+/// @ingroup cpp_kodi_addon_pvr_Defs
+/// @brief **Inputstream**\n
+/// This includes classes and values that are used in the PVR inputstream.
+///
+/// Used on @ref cpp_kodi_addon_pvr_Streams "Inputstream methods in PVR instance class".
+///
+/// @note The parts here will be removed in the future and replaced by the
+/// separate @ref cpp_kodi_addon_inputstream "inputstream addon instance".
+/// If there is already a possibility, new addons should do it via the
+/// inputstream instance.
+///
+//------------------------------------------------------------------------------
+
+//}}}
+//______________________________________________________________________________
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" PVR addon instance class
+//{{{
+
+//==============================================================================
+/// @addtogroup cpp_kodi_addon_pvr
+/// @brief \cpp_class{ kodi::addon::CInstancePVRClient }
+/// **PVR client add-on instance**
+///
+/// Kodi features powerful [Live TV](https://kodi.wiki/view/Live_TV) and
+/// [video recording (DVR/PVR)](http://en.wikipedia.org/wiki/Digital_video_recorder)
+/// abilities using a very flexible distributed application structure. That is, by
+/// leveraging other existing third-party
+/// [PVR backend applications](https://kodi.wiki/view/PVR_backend) or
+/// [DVR devices](https://kodi.wiki/view/PVR_backend)
+/// that specialize in receiving television signals and also support the same type
+/// of [client–server model](http://en.wikipedia.org/wiki/client%E2%80%93server_model)
+/// which Kodi uses, (following a [frontend-backend](http://en.wikipedia.org/wiki/Front_and_back_ends)
+/// design principle for [separation of concerns](http://en.wikipedia.org/wiki/Separation_of_concerns)),
+/// these PVR features in Kodi allow you to watch Live TV, listen to radio, view an EPG TV-Guide
+/// and schedule recordings, and also enables many other TV related features, all using
+/// Kodi as your primary interface once the initial pairing connection and
+/// configuration have been done.
+///
+/// @note It is very important to understand that with "Live TV" in the reference
+/// to PVR in Kodi, we do not mean [streaming video](http://en.wikipedia.org/wiki/Streaming_media)
+/// from the internet via websites providing [free content](https://kodi.wiki/view/Free_content)
+/// or online services such as Netflix, Hulu, Vudu and similar, no matter if that
+/// content is actually streamed live or not. If that is what you are looking for
+/// then you might want to look into [Video Addons](https://kodi.wiki/view/Add-ons)
+/// for Kodi instead, (which again is not the same as the "PVR" or "Live TV" we
+/// discuss in this article), but remember that [Kodi does not provide any video
+/// content or video streaming services](https://kodi.wiki/view/Free_content).
+///
+/// The use of the PVR is based on the @ref CInstancePVRClient.
+///
+/// Include the header @ref PVR.h "#include <kodi/addon-instance/PVR.h>"
+/// to use this class.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// Here is an example of what the <b>`addon.xml.in`</b> would look like for an PVR addon:
+///
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <addon
+///   id="pvr.myspecialnamefor"
+///   version="1.0.0"
+///   name="My special PVR addon"
+///   provider-name="Your Name">
+///   <requires>@ADDON_DEPENDS@</requires>
+///   <extension
+///     point="kodi.pvrclient"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+///   <extension point="xbmc.addon.metadata">
+///     <summary lang="en_GB">My PVR addon addon</summary>
+///     <description lang="en_GB">My PVR addon description</description>
+///     <platform>@PLATFORM@</platform>
+///   </extension>
+/// </addon>
+/// ~~~~~~~~~~~~~
+///
+///
+/// At <b>`<extension point="kodi.pvrclient" ...>`</b> the basic instance definition is declared, this is intended to identify the addon as an PVR and to see its supported types:
+/// | Name | Description
+/// |------|----------------------
+/// | <b>`point`</b> | The identification of the addon instance to inputstream is mandatory <b>`kodi.pvrclient`</b>. In addition, the instance declared in the first <b>`<extension ... />`</b> is also the main type of addon.
+/// | <b>`library_@PLATFORM@`</b> | The runtime library used for the addon. This is usually declared by cmake and correctly displayed in the translated `addon.xml`.
+///
+///
+/// @remark For more detailed description of the <b>`addon.xml`</b>, see also https://kodi.wiki/view/Addon.xml.
+///
+///
+/// --------------------------------------------------------------------------
+///
+/// **Example:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/PVR.h>
+///
+/// class CMyPVRClient : public ::kodi::addon::CInstancePVRClient
+/// {
+/// public:
+///   CMyPVRClient(KODI_HANDLE instance, const std::string& kodiVersion);
+///
+///   PVR_ERROR GetCapabilities(kodi::addon::PVRCapabilities& capabilities) override;
+///   PVR_ERROR GetBackendName(std::string& name) override;
+///   PVR_ERROR GetBackendVersion(std::string& version) override;
+///
+///   PVR_ERROR GetChannelsAmount(int& amount) override;
+///   PVR_ERROR GetChannels(bool radio, std::vector<kodi::addon::PVRChannel>& channels) override;
+///   PVR_ERROR GetChannelStreamProperties(const kodi::addon::PVRChannel&       channel,
+///                                        std::vector<kodi::addon::PVRStreamProperty>& properties) override;
+///
+/// private:
+///   std::vector<kodi::addon::PVRChannel> m_myChannels;
+/// };
+///
+/// CMyPVRClient::CMyPVRClient(KODI_HANDLE instance, const std::string& kodiVersion)
+///   : CInstancePVRClient(instance, kodiVersion)
+/// {
+///   kodi::addon::PVRChannel channel;
+///   channel.SetUniqueId(123);
+///   channel.SetChannelNumber(1);
+///   channel.SetChannelName("My test channel");
+///   m_myChannels.push_back(channel);
+/// }
+///
+/// PVR_ERROR CMyPVRClient::GetCapabilities(kodi::addon::PVRCapabilities& capabilities)
+/// {
+///   capabilities.SetSupportsTV(true);
+///   return PVR_ERROR_NO_ERROR;
+/// }
+///
+/// PVR_ERROR CMyPVRClient::GetBackendName(std::string& name)
+/// {
+///   name = "My special PVR client";
+///   return PVR_ERROR_NO_ERROR;
+/// }
+///
+/// PVR_ERROR CMyPVRClient::GetBackendVersion(std::string& version)
+/// {
+///   version = "1.0.0";
+///   return PVR_ERROR_NO_ERROR;
+/// }
+///
+/// PVR_ERROR CMyInstance::GetChannelsAmount(int& amount)
+/// {
+///   amount = m_myChannels.size();
+///   return PVR_ERROR_NO_ERROR;
+/// }
+///
+/// PVR_ERROR CMyPVRClient::GetChannels(bool radio, std::vector<kodi::addon::PVRChannel>& channels)
+/// {
+///   channels = m_myChannels;
+///   return PVR_ERROR_NO_ERROR;
+/// }
+///
+/// PVR_ERROR CMyPVRClient::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel,
+///                                                    std::vector<kodi::addon::PVRStreamProperty>& properties)
+/// {
+///   if (channel.GetUniqueId() == 123)
+///   {
+///     properties.push_back(PVR_STREAM_PROPERTY_STREAMURL, "http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_1080p_30fps_normal.mp4");
+///     properties.push_back(PVR_STREAM_PROPERTY_ISREALTIMESTREAM, "true");
+///     return PVR_ERROR_NO_ERROR;
+///   }
+///   return PVR_ERROR_UNKNOWN;
+/// }
+///
+/// ...
+///
+/// //----------------------------------------------------------------------
+///
+/// class CMyAddon : public ::kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() = default;
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               const std::string& instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       const std::string& instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_PVR)
+///   {
+///     kodi::Log(ADDON_LOG_NOTICE, "Creating my PVR client instance");
+///     addonInstance = new CMyPVRClient(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyPVRClient` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+class ATTRIBUTE_HIDDEN CInstancePVRClient : public IAddonInstance
+{
+public:
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Base 1. Basic functions
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief **Functions to manage the addon and get basic information about it**\n
+  /// These are e.g. @ref GetCapabilities to know supported groups at
+  /// this addon or the others to get information about the source of the PVR
+  /// stream.
+  ///
+  /// The with "Valid implementation required." declared functions are mandatory,
+  /// all others are an option.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Basic parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Base_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_Base_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief PVR client class constructor.
+  ///
+  /// Used by an add-on that only supports only PVR and only in one instance.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/PVR.h>
+  /// ...
+  ///
+  /// class ATTRIBUTE_HIDDEN CPVRExample
+  ///   : public kodi::addon::CAddonBase,
+  ///     public kodi::addon::CInstancePVRClient
+  /// {
+  /// public:
+  ///   CPVRExample()
+  ///   {
+  ///   }
+  ///
+  ///   ~CPVRExample() override;
+  ///   {
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDONCREATOR(CPVRExample)
+  /// ~~~~~~~~~~~~~
+  ///
+  CInstancePVRClient() : IAddonInstance(ADDON_INSTANCE_PVR, GetKodiTypeVersion(ADDON_INSTANCE_PVR))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstancePVRClient: Creation of more as one in single "
+                             "instance way is not allowed!");
+
+    SetAddonStruct(CAddonBase::m_interface->firstKodiInstance, m_kodiVersion);
+    CAddonBase::m_interface->globalSingleInstance = this;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief PVR client class constructor used to support multiple instance
+  /// types.
+  ///
+  /// @param[in] instance The instance value given to
+  ///                     <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+  /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+  ///                        allow compatibility to older Kodi versions.
+  ///
+  /// @note Recommended to set <b>`kodiVersion`</b>.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// class CMyPVRClient : public ::kodi::addon::CInstancePVRClient
+  /// {
+  /// public:
+  ///   CMyPVRClient(KODI_HANDLE instance, const std::string& kodiVersion)
+  ///     : CInstancePVRClient(instance, kodiVersion)
+  ///   {
+  ///      ...
+  ///   }
+  ///
+  ///   ...
+  /// };
+  ///
+  /// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+  ///                                       const std::string& instanceID,
+  ///                                       KODI_HANDLE instance,
+  ///                                       const std::string& version,
+  ///                                       KODI_HANDLE& addonInstance)
+  /// {
+  ///   kodi::Log(ADDON_LOG_NOTICE, "Creating my PVR client instance");
+  ///   addonInstance = new CMyPVRClient(instance, version);
+  ///   return ADDON_STATUS_OK;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  explicit CInstancePVRClient(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_PVR,
+                     !kodiVersion.empty() ? kodiVersion : GetKodiTypeVersion(ADDON_INSTANCE_PVR))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstancePVRClient: Creation of multiple together with "
+                             "single instance way is not allowed!");
+
+    SetAddonStruct(instance, m_kodiVersion);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Destructor
+  ///
+  ~CInstancePVRClient() override = default;
+  //----------------------------------------------------------------------------
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @brief Get the list of features that this add-on provides.
+  ///
+  /// Called by Kodi to query the add-on's capabilities.
+  /// Used to check which options should be presented in the UI, which methods to call, etc.
+  /// All capabilities that the add-on supports should be set to true.
+  ///
+  /// @param capabilities The with @ref cpp_kodi_addon_pvr_Defs_PVRCapabilities defined add-on's capabilities.
+  /// @return @ref PVR_ERROR_NO_ERROR if the properties were fetched successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_PVRCapabilities_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// PVR_ERROR CMyPVRClient::GetCapabilities(kodi::addon::PVRCapabilities& capabilities)
+  /// {
+  ///   capabilities.SetSupportsTV(true);
+  ///   capabilities.SetSupportsEPG(true);
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @note Valid implementation required.
+  ///
+  virtual PVR_ERROR GetCapabilities(kodi::addon::PVRCapabilities& capabilities) = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the name reported by the backend that will be displayed in the UI.
+  ///
+  /// @param[out] name The name reported by the backend that will be displayed in the UI.
+  /// @return @ref PVR_ERROR_NO_ERROR if successfully done
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// PVR_ERROR CMyPVRClient::GetBackendName(std::string& name)
+  /// {
+  ///   name = "My special PVR client";
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @note Valid implementation required.
+  ///
+  virtual PVR_ERROR GetBackendName(std::string& name) = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the version string reported by the backend that will be
+  /// displayed in the UI.
+  ///
+  /// @param[out] version The version string reported by the backend that will be
+  ///                     displayed in the UI.
+  /// @return @ref PVR_ERROR_NO_ERROR if successfully done
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// PVR_ERROR CMyPVRClient::GetBackendVersion(std::string& version)
+  /// {
+  ///   version = "1.0.0";
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @note Valid implementation required.
+  ///
+  virtual PVR_ERROR GetBackendVersion(std::string& version) = 0;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the hostname of the pvr backend server
+  ///
+  /// @param[out] hostname Hostname as ip address or alias. If backend does not
+  ///                      utilize a server, return empty string.
+  /// @return @ref PVR_ERROR_NO_ERROR if successfully done
+  ///
+  virtual PVR_ERROR GetBackendHostname(std::string& hostname) { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief To get the connection string reported by the backend that will be
+  /// displayed in the UI.
+  ///
+  /// @param[out] connection The connection string reported by the backend that
+  ///                        will be displayed in the UI.
+  /// @return @ref PVR_ERROR_NO_ERROR if successfully done
+  ///
+  virtual PVR_ERROR GetConnectionString(std::string& connection)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the disk space reported by the backend (if supported).
+  ///
+  /// @param[in] total The total disk space in bytes.
+  /// @param[in] used The used disk space in bytes.
+  /// @return @ref PVR_ERROR_NO_ERROR if the drive space has been fetched
+  ///         successfully.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// PVR_ERROR CMyPVRClient::GetDriveSpace(uint64_t& total, uint64_t& used)
+  /// {
+  ///   total = 10 * 1024 * 1024 * 1024; // To set complete size of drive in bytes
+  ///   used =  122324243; // To set the used amount
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetDriveSpace(uint64_t& total, uint64_t& used)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Call one of the settings related menu hooks (if supported).
+  ///
+  /// Supported @ref cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook "menu hook "
+  /// instances have to be added in `constructor()`, by calling @ref AddMenuHook()
+  /// on the callback.
+  ///
+  /// @param[in] menuhook The hook to call.
+  /// @return @ref PVR_ERROR_NO_ERROR if the hook was called successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// PVR_ERROR CMyPVRClient::CallSettingsMenuHook(const kodi::addon::PVRMenuhook& menuhook)
+  /// {
+  ///   if (menuhook.GetHookId() == 2)
+  ///     kodi::QueueNotification(QUEUE_INFO, "", kodi::GetLocalizedString(menuhook.GetLocalizedStringId()));
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR CallSettingsMenuHook(const kodi::addon::PVRMenuhook& menuhook)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\nAdd or replace a menu hook for the context menu for this add-on
+  ///
+  /// This is a callback function, called from addon to give Kodi his context menu's.
+  ///
+  /// @param[in] menuhook The with @ref cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook defined hook to add
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here's an example of the use of it:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/PVR.h>
+  /// ...
+  ///
+  /// {
+  ///   kodi::addon::PVRMenuhook hook;
+  ///   hook.SetHookId(1);
+  ///   hook.SetCategory(PVR_MENUHOOK_CHANNEL);
+  ///   hook.SetLocalizedStringId(30000);
+  ///   AddMenuHook(hook);
+  /// }
+  ///
+  /// {
+  ///   kodi::addon::PVRMenuhook hook;
+  ///   hook.SetHookId(2);
+  ///   hook.SetCategory(PVR_MENUHOOK_SETTING);
+  ///   hook.SetLocalizedStringId(30001);
+  ///   AddMenuHook(hook);
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  /// **Here another way:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/PVR.h>
+  /// ...
+  ///
+  /// AddMenuHook(kodi::addon::PVRMenuhook(1, 30000, PVR_MENUHOOK_CHANNEL));
+  /// AddMenuHook(kodi::addon::PVRMenuhook(2, 30001, PVR_MENUHOOK_SETTING));
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline void AddMenuHook(const kodi::addon::PVRMenuhook& hook)
+  {
+    m_instanceData->toKodi->AddMenuHook(m_instanceData->toKodi->kodiInstance, hook);
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Notify a state change for a PVR backend connection.
+  ///
+  /// @param[in] connectionString The connection string reported by the backend
+  ///                             that can be displayed in the UI.
+  /// @param[in] newState The by @ref PVR_CONNECTION_STATE defined new state.
+  /// @param[in] message A localized addon-defined string representing the new
+  ///                    state, that can be displayed in the UI or **empty** if
+  ///                    the Kodi-defined default string for the new state
+  ///                    shall be displayed.
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  ///
+  /// **Here's an example of the use of it:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/PVR.h>
+  /// #include <kodi/General.h> /* for kodi::GetLocalizedString(...) */
+  /// ...
+  ///
+  ///   ConnectionStateChange("PVR demo connection lost", PVR_CONNECTION_STATE_DISCONNECTED, kodi::GetLocalizedString(30005, "Lost connection to Server"););
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline void ConnectionStateChange(const std::string& connectionString,
+                                    PVR_CONNECTION_STATE newState,
+                                    const std::string& message)
+  {
+    m_instanceData->toKodi->ConnectionStateChange(
+        m_instanceData->toKodi->kodiInstance, connectionString.c_str(), newState, message.c_str());
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Get user data path of the PVR addon.
+  ///
+  /// @return Path of current Kodi user
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  /// @note Alternatively, @ref kodi::GetAddonPath() can be used for this.
+  ///
+  inline std::string UserPath() const { return m_instanceData->props->strUserPath; }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Get main client path of the PVR addon.
+  ///
+  /// @return Path of addon client
+  ///
+  /// @remarks Only called from addon itself.
+  ///
+  /// @note Alternatively, @ref kodi::GetBaseUserPath() can be used for this.
+  ///
+  inline std::string ClientPath() const { return m_instanceData->props->strClientPath; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Channels 2. Channels (required)
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief **Functions to get available TV or Radio channels**\n
+  /// These are mandatory functions for using this addon to get the available
+  /// channels.
+  ///
+  /// @remarks Either @ref PVRCapabilities::SetSupportsTV "SetSupportsTV()" or
+  /// @ref PVRCapabilities::SetSupportsRadio "SetSupportsRadio()" is required to
+  /// be set to <b>`true`</b>.\n
+  /// If a channel changes after the initial import, or if a new one was added,
+  /// then the add-on should call @ref TriggerChannelUpdate().
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Channel parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Channels_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_Channels_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief The total amount of channels on the backend
+  ///
+  /// @param[out] amount The total amount of channels on the backend
+  /// @return @ref PVR_ERROR_NO_ERROR if the amount has been fetched successfully.
+  ///
+  /// @remarks Valid implementation required.
+  ///
+  virtual PVR_ERROR GetChannelsAmount(int& amount) { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Request the list of all channels from the backend.
+  ///
+  /// @param[in] radio True to get the radio channels, false to get the TV channels.
+  /// @param[out] results The channels defined with @ref cpp_kodi_addon_pvr_Defs_Channel_PVRChannel
+  ///                     and available at the addon, them transferred with
+  ///                     @ref cpp_kodi_addon_pvr_Defs_Channel_PVRChannelsResultSet.
+  /// @return @ref PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Channel_PVRChannel_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @remarks
+  /// If @ref PVRCapabilities::SetSupportsTV() is set to
+  /// <b>`true`</b>, a valid result set needs to be provided for <b>`radio = false`</b>.\n
+  /// If @ref PVRCapabilities::SetSupportsRadio() is set to
+  /// <b>`true`</b>, a valid result set needs to be provided for <b>`radio = true`</b>.
+  /// At least one of these two must provide a valid result set.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetChannels(bool radio, kodi::addon::PVRChannelsResultSet& results)
+  /// {
+  ///   // Minimal demo example, in reality bigger and loop to transfer all
+  ///   kodi::addon::PVRChannel channel;
+  ///   channel.SetUniqueId(123);
+  ///   channel.SetIsRadio(false);
+  ///   channel.SetChannelNumber(1);
+  ///   channel.SetChannelName("My channel name");
+  ///   ...
+  ///
+  ///   // Give it now to Kodi
+  ///   results.Add(channel);
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetChannels(bool radio, kodi::addon::PVRChannelsResultSet& results)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the stream properties for a channel from the backend.
+  ///
+  /// @param[in] channel The channel to get the stream properties for.
+  /// @param[out] properties the properties required to play the stream.
+  /// @return @ref PVR_ERROR_NO_ERROR if the stream is available.
+  ///
+  /// @remarks If @ref PVRCapabilities::SetSupportsTV "SetSupportsTV" or
+  /// @ref PVRCapabilities::SetSupportsRadio "SetSupportsRadio" are set to true
+  /// and @ref PVRCapabilities::SetHandlesInputStream "SetHandlesInputStream" is
+  /// set to false.\n\n
+  /// In this case the implementation must fill the property @ref PVR_STREAM_PROPERTY_STREAMURL
+  /// with the URL Kodi should resolve to playback the channel.
+  ///
+  /// @note The value directly related to inputstream must always begin with the
+  /// name of the associated add-on, e.g. <b>`"inputstream.adaptive.manifest_update_parameter"`</b>.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel,
+  ///                                                      std::vector<kodi::addon::PVRStreamProperty>& properties)
+  /// {
+  ///   ...
+  ///   properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM, "inputstream.adaptive");
+  ///   properties.emplace_back("inputstream.adaptive.manifest_type", "mpd");
+  ///   properties.emplace_back("inputstream.adaptive.manifest_update_parameter", "full");
+  ///   properties.emplace_back(PVR_STREAM_PROPERTY_MIMETYPE, "application/xml+dash");
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetChannelStreamProperties(
+      const kodi::addon::PVRChannel& channel,
+      std::vector<kodi::addon::PVRStreamProperty>& properties)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the signal status of the stream that's currently open.
+  ///
+  /// @param[out] signalStatus The signal status.
+  /// @return @ref PVR_ERROR_NO_ERROR if the signal status has been read successfully, false otherwise.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetHandlesInputStream "SetHandlesInputStream"
+  /// is set to true.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Channel_PVRSignalStatus_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  ///
+  /// **Here's example about the use of this:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/PVR.h>
+  /// ...
+  ///
+  /// class ATTRIBUTE_HIDDEN CPVRExample
+  ///   : public kodi::addon::CAddonBase,
+  ///     public kodi::addon::CInstancePVRClient
+  /// {
+  /// public:
+  ///   ...
+  ///   PVR_ERROR SignalStatus(PVRSignalStatus &signalStatus) override
+  ///   {
+  ///     signalStatus.SetAapterName("Example adapter 1");
+  ///     signalStatus.SetAdapterStatus("OK");
+  ///     signalStatus.SetSignal(0xFFFF); // 100%
+  ///
+  ///     return PVR_ERROR_NO_ERROR;
+  ///   }
+  /// };
+  ///
+  /// ADDONCREATOR(CPVRExample)
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetSignalStatus(int channelUid, kodi::addon::PVRSignalStatus& signalStatus)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the descramble information of the stream that's currently open.
+  ///
+  /// @param[out] descrambleInfo The descramble information.
+  /// @return @ref PVR_ERROR_NO_ERROR if the descramble information has been
+  ///         read successfully, false otherwise.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsDescrambleInfo "supportsDescrambleInfo"
+  /// is set to true.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo_Help
+  ///
+  virtual PVR_ERROR GetDescrambleInfo(int channelUid,
+                                      kodi::addon::PVRDescrambleInfo& descrambleInfo)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Request Kodi to update it's list of channels.
+  ///
+  /// @remarks Only called from addon itself.
+  ///
+  inline void TriggerChannelUpdate()
+  {
+    m_instanceData->toKodi->TriggerChannelUpdate(m_instanceData->toKodi->kodiInstance);
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_supportsChannelGroups 3. Channel Groups (optional)
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief <b>Bring in this functions if you have set @ref PVRCapabilities::SetSupportsChannelGroups "supportsChannelGroups"
+  /// to true</b>\n
+  /// This is used to divide available addon channels into groups, which can
+  /// then be selected by the user.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Channel group parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_supportsChannelGroups_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_supportsChannelGroups_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Get the total amount of channel groups on the backend if it supports channel groups.
+  ///
+  /// @param[out] amount The total amount of channel groups on the backend
+  /// @return @ref PVR_ERROR_NO_ERROR if the amount has been fetched successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsChannelGroups "supportsChannelGroups"  is set to true.
+  ///
+  virtual PVR_ERROR GetChannelGroupsAmount(int& amount) { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get a list of available channel groups on addon
+  ///
+  /// Request the list of all channel groups from the backend if it supports
+  /// channel groups.
+  ///
+  /// @param[in] radio True to get the radio channel groups, false to get the
+  ///                  TV channel groups.
+  /// @param[out] results List of available groups on addon defined with
+  ///                     @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup,
+  ///                     them transferred with
+  ///                     @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupsResultSet.
+  /// @return @ref PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsChannelGroups "supportsChannelGroups"
+  /// is set to true.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetChannelGroups(bool radio, kodi::addon::PVRChannelGroupsResultSet& groups)
+  /// {
+  ///   kodi::addon::PVRChannelGroup group;
+  ///   group.SetIsRadio(false);
+  ///   group.SetGroupName("My group name");
+  ///   group.SetPosition(1);
+  ///   ...
+  ///
+  ///   // Give it now to Kodi
+  ///   results.Add(group);
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetChannelGroups(bool radio, kodi::addon::PVRChannelGroupsResultSet& results)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get a list of members on a group
+  ///
+  /// Request the list of all group members of a group from the backend if it
+  /// supports channel groups.
+  ///
+  /// @param[in] group The group to get the members for.
+  /// @param[out] results List of available group member channels defined with
+  ///                     @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember,
+  ///                     them transferred with
+  ///                     @ref PVRChannelGroupMembersResultSet.
+  /// @return @ref PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember_Help
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsChannelGroups "supportsChannelGroups"
+  /// is set to true.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetChannelGroupMembers(const kodi::addon::PVRChannelGroup& group,
+  ///                                                  kodi::addon::PVRChannelGroupMembersResultSet& results)
+  /// {
+  ///   for (const auto& myGroup : m_myGroups)
+  ///   {
+  ///     if (myGroup.strGroupName == group.GetGroupName())
+  ///     {
+  ///       for (unsigned int iChannelPtr = 0; iChannelPtr < myGroup.members.size(); iChannelPtr++)
+  ///       {
+  ///         int iId = myGroup.members.at(iChannelPtr) - 1;
+  ///         if (iId < 0 || iId > (int)m_channels.size() - 1)
+  ///           continue;
+  ///
+  ///         PVRDemoChannel &channel = m_channels.at(iId);
+  ///         kodi::addon::PVRChannelGroupMember kodiGroupMember;
+  ///         kodiGroupMember.SetGroupName(group.GetGroupName());
+  ///         kodiGroupMember.SetChannelUniqueId(channel.iUniqueId);
+  ///         kodiGroupMember.SetChannelNumber(channel.iChannelNumber);
+  ///         kodiGroupMember.SetSubChannelNumber(channel.iSubChannelNumber);
+  ///
+  ///         results.Add(kodiGroupMember);
+  ///       }
+  ///     }
+  ///   }
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetChannelGroupMembers(const kodi::addon::PVRChannelGroup& group,
+                                           kodi::addon::PVRChannelGroupMembersResultSet& results)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Request Kodi to update it's list of channel groups.
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  inline void TriggerChannelGroupsUpdate()
+  {
+    m_instanceData->toKodi->TriggerChannelGroupsUpdate(m_instanceData->toKodi->kodiInstance);
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_supportsChannelEdit 4. Channel edit (optional)
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief <b>Bring in this functions if you have set @ref PVRCapabilities::SetSupportsChannelSettings "supportsChannelSettings"
+  /// to true or for @ref OpenDialogChannelScan() set @ref PVRCapabilities::SetSupportsChannelScan "supportsChannelScan"
+  /// to true</b>\n
+  /// The support of this is a pure option and not mandatory.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Channel edit parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_supportsChannelEdit_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_supportsChannelEdit_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Delete a channel from the backend.
+  ///
+  /// @param[in] channel The channel to delete.
+  /// @return @ref PVR_ERROR_NO_ERROR if the channel has been deleted successfully.
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsChannelSettings "supportsChannelSettings"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR DeleteChannel(const kodi::addon::PVRChannel& channel)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Rename a channel on the backend.
+  ///
+  /// @param[in] channel The channel to rename, containing the new channel name.
+  /// @return @ref PVR_ERROR_NO_ERROR if the channel has been renamed successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Channel_PVRChannel_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsChannelSettings "supportsChannelSettings"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR RenameChannel(const kodi::addon::PVRChannel& channel)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Show the channel settings dialog, if supported by the backend.
+  ///
+  /// @param[in] channel The channel to show the dialog for.
+  /// @return @ref PVR_ERROR_NO_ERROR if the dialog has been displayed successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsChannelSettings "supportsChannelSettings" is set to true.
+  /// @note Use @ref cpp_kodi_gui_CWindow "kodi::gui::CWindow" to create dialog for them.
+  ///
+  virtual PVR_ERROR OpenDialogChannelSettings(const kodi::addon::PVRChannel& channel)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Show the dialog to add a channel on the backend, if supported by the backend.
+  ///
+  /// @param[in] channel The channel to add.
+  /// @return @ref PVR_ERROR_NO_ERROR if the channel has been added successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsChannelSettings "supportsChannelSettings" is set to true.
+  /// @note Use @ref cpp_kodi_gui_CWindow "kodi::gui::CWindow" to create dialog for them.
+  ///
+  virtual PVR_ERROR OpenDialogChannelAdd(const kodi::addon::PVRChannel& channel)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Show the channel scan dialog if this backend supports it.
+  ///
+  /// @return @ref PVR_ERROR_NO_ERROR if the dialog was displayed successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsChannelScan "supportsChannelScan" is set to true.
+  /// @note Use @ref cpp_kodi_gui_CWindow "kodi::gui::CWindow" to create dialog for them.
+  ///
+  virtual PVR_ERROR OpenDialogChannelScan() { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Call one of the channel related menu hooks (if supported).
+  ///
+  /// Supported @ref cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook instances have to be added in
+  /// `constructor()`, by calling @ref AddMenuHook() on the callback.
+  ///
+  /// @param[in] menuhook The hook to call.
+  /// @param[in] item The selected channel item for which the hook was called.
+  /// @return @ref PVR_ERROR_NO_ERROR if the hook was called successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook_Help
+  ///
+  virtual PVR_ERROR CallChannelMenuHook(const kodi::addon::PVRMenuhook& menuhook,
+                                        const kodi::addon::PVRChannel& item)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_EPGTag 4. EPG methods (optional)
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief **PVR EPG methods**\n
+  /// These C ++ class functions of are intended for processing EPG information
+  /// and for giving it to Kodi.
+  ///
+  /// The necessary data is transferred with @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag.
+  ///
+  /// @remarks Only used by Kodi if @ref PVRCapabilities::SetSupportsEPG "supportsEPG"
+  /// is set to true.\n\n
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **EPG parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_EPGTag_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_EPGTag_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Request the EPG for a channel from the backend.
+  ///
+  /// @param[in] channelUid The UID of the channel to get the EPG table for.
+  /// @param[in] start Get events after this time (UTC).
+  /// @param[in] end Get events before this time (UTC).
+  /// @param[out] results List where available EPG information becomes
+  ///                     transferred with @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag
+  ///                     and given to Kodi
+  /// @return @ref PVR_ERROR_NO_ERROR if the table has been fetched successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_epg_PVREPGTag_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsEPG "supportsEPG" is set to true.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetEPGForChannel(int channelUid,
+  ///                                            time_t start,
+  ///                                            time_t end,
+  ///                                            kodi::addon::PVREPGTagsResultSet& results)
+  /// {
+  ///   // Minimal demo example, in reality bigger, loop to transfer all and to
+  ///   // match wanted times.
+  ///   kodi::addon::PVREPGTag tag;
+  ///   tag.SetUniqueBroadcastId(123);
+  ///   tag.SetUniqueChannelId(123);
+  ///   tag.SetTitle("My epg entry name");
+  ///   tag.SetGenreType(EPG_EVENT_CONTENTMASK_MOVIEDRAMA);
+  ///   tag.SetStartTime(1589148283); // Seconds elapsed since 00:00 hours, Jan 1, 1970 UTC
+  ///   tag.SetEndTime(1589151913);
+  ///   ...
+  ///
+  ///   // Give it now to Kodi
+  ///   results.Add(tag);
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetEPGForChannel(int channelUid,
+                                     time_t start,
+                                     time_t end,
+                                     kodi::addon::PVREPGTagsResultSet& results)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Check if the given EPG tag can be recorded.
+  ///
+  /// @param[in] tag the @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "epg tag" to check.
+  /// @param[out] isRecordable Set to true if the tag can be recorded.
+  /// @return @ref PVR_ERROR_NO_ERROR if bIsRecordable has been set successfully.
+  ///
+  /// @remarks Optional, it return @ref PVR_ERROR_NOT_IMPLEMENTED by parent to let Kodi decide.
+  ///
+  virtual PVR_ERROR IsEPGTagRecordable(const kodi::addon::PVREPGTag& tag, bool& isRecordable)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Check if the given EPG tag can be played.
+  ///
+  /// @param[in] tag the @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "epg tag" to check.
+  /// @param[out] isPlayable Set to true if the tag can be played.
+  /// @return @ref PVR_ERROR_NO_ERROR if bIsPlayable has been set successfully.
+  ///
+  /// @remarks Required if add-on supports playing epg tags.
+  ///
+  virtual PVR_ERROR IsEPGTagPlayable(const kodi::addon::PVREPGTag& tag, bool& isPlayable)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Retrieve the edit decision list (EDL) of an EPG tag on the backend.
+  ///
+  /// @param[in] tag The @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "epg tag".
+  /// @param[out] edl The function has to write the EDL into this array.
+  /// @return @ref PVR_ERROR_NO_ERROR if the EDL was successfully read or no EDL exists.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsEPGEdl "supportsEPGEdl" is set to true.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsEPGEdl "supportsEPGEdl" is set to true.
+  ///
+  virtual PVR_ERROR GetEPGTagEdl(const kodi::addon::PVREPGTag& tag,
+                                 std::vector<kodi::addon::PVREDLEntry>& edl)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the stream properties for an epg tag from the backend.
+  ///
+  /// @param[in] tag The @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "epg tag" to get the stream properties for.
+  /// @param[out] properties the properties required to play the stream.
+  /// @return @ref PVR_ERROR_NO_ERROR if the stream is available.
+  ///
+  /// @remarks Required if add-on supports playing epg tags.
+  /// In this case your implementation must fill the property @ref PVR_STREAM_PROPERTY_STREAMURL
+  /// with the URL Kodi should resolve to playback the epg tag.
+  /// It return @ref PVR_ERROR_NOT_IMPLEMENTED from parent if this add-on won't provide this function.
+  ///
+  /// @note The value directly related to inputstream must always begin with the
+  /// name of the associated add-on, e.g. <b>`"inputstream.adaptive.manifest_update_parameter"`</b>.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetEPGTagStreamProperties(const kodi::addon::PVREPGTag& tag,
+  ///                                                     std::vector<kodi::addon::PVRStreamProperty>& properties)
+  /// {
+  ///   ...
+  ///   properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM, "inputstream.adaptive");
+  ///   properties.emplace_back("inputstream.adaptive.manifest_type", "mpd");
+  ///   properties.emplace_back("inputstream.adaptive.manifest_update_parameter", "full");
+  ///   properties.emplace_back(PVR_STREAM_PROPERTY_MIMETYPE, "application/xml+dash");
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetEPGTagStreamProperties(
+      const kodi::addon::PVREPGTag& tag, std::vector<kodi::addon::PVRStreamProperty>& properties)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief 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
+  /// @ref 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
+  /// supplies the current epg time frame value in @ref EpgMaxDays() when creating the
+  /// addon and calls @ref SetEPGTimeFrame later whenever Kodi's epg time frame value
+  /// changes.
+  ///
+  /// @param[in] days number of days from "now". @ref EPG_TIMEFRAME_UNLIMITED means that Kodi
+  ///                 is interested in all epg events, regardless of event times.
+  /// @return @ref PVR_ERROR_NO_ERROR if new value was successfully set.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsEPG "supportsEPG" is set to true.
+  ///
+  virtual PVR_ERROR SetEPGTimeFrame(int days) { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Call one of the EPG related menu hooks (if supported).
+  ///
+  /// Supported @ref cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook instances have to be added in
+  /// `constructor()`, by calling @ref AddMenuHook() on the callback.
+  ///
+  /// @param[in] menuhook The hook to call.
+  /// @param[in] tag The selected EPG item for which the hook was called.
+  /// @return @ref PVR_ERROR_NO_ERROR if the hook was called successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook_Help
+  ///
+  virtual PVR_ERROR CallEPGMenuHook(const kodi::addon::PVRMenuhook& menuhook,
+                                    const kodi::addon::PVREPGTag& tag)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Get the Max days handled by Kodi.
+  ///
+  /// If > @ref EPG_TIMEFRAME_UNLIMITED, in async epg mode, deliver only events
+  /// in the range from 'end time > now' to 'start time < now + EpgMaxDays().
+  /// @ref EPG_TIMEFRAME_UNLIMITED, notify all events.
+  ///
+  /// @return The Max days handled by Kodi
+  ///
+  inline int EpgMaxDays() const { return m_instanceData->props->iEpgMaxDays; }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Schedule an EPG update for the given channel channel.
+  ///
+  /// @param[in] channelUid The unique id of the channel for this add-on
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  inline void TriggerEpgUpdate(unsigned int channelUid)
+  {
+    m_instanceData->toKodi->TriggerEpgUpdate(m_instanceData->toKodi->kodiInstance, channelUid);
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Notify a state change for an EPG event.
+  ///
+  /// @param[in] tag The @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "EPG tag" where have event.
+  /// @param[in] newState The new state.
+  /// - For @ref EPG_EVENT_CREATED and @ref EPG_EVENT_UPDATED, tag must be filled with all available event data, not just a delta.
+  /// - For @ref EPG_EVENT_DELETED, it is sufficient to fill @ref kodi::addon::PVREPGTag::SetUniqueBroadcastId
+  ///
+  /// @remarks Only called from addon itself,
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  ///
+  /// void CMyPVRInstance::MyProcessFunction()
+  /// {
+  ///   ...
+  ///   kodi::addon::PVREPGTag tag; // Here as mini add, in real it should be a complete tag
+  ///   tag.SetUniqueId(123);
+  ///
+  ///   // added namespace here not needed to have, only to have more clear for where is
+  ///   kodi::addon::CInstancePVRClient::EpgEventStateChange(tag, EPG_EVENT_UPDATED);
+  ///   ...
+  /// }
+  ///
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  inline void EpgEventStateChange(kodi::addon::PVREPGTag& tag, EPG_EVENT_STATE newState)
+  {
+    m_instanceData->toKodi->EpgEventStateChange(m_instanceData->toKodi->kodiInstance, tag.GetTag(),
+                                                newState);
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Recordings 5. Recordings (optional)
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief **PVR recording methods**\n
+  /// To transfer available recordings of the PVR backend and to allow possible
+  /// playback.
+  ///
+  /// @remarks Only used by Kodi if @ref PVRCapabilities::SetSupportsRecordings "supportsRecordings"
+  /// is set to true.\n\n
+  /// If a recordings changes after the initial import, or if a new one was added,
+  /// then the add-on should call @ref TriggerRecordingUpdate().
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Recordings parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Recordings_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_Recordings_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief To get amount of recording present on backend
+  ///
+  /// @param[in] deleted if set return deleted recording (called if
+  ///                    @ref PVRCapabilities::SetSupportsRecordingsUndelete "supportsRecordingsUndelete"
+  ///                    set to true)
+  /// @param[out] amount The total amount of recordings on the backend
+  /// @return @ref PVR_ERROR_NO_ERROR if the amount has been fetched successfully.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings "supportsRecordings" is set to true.
+  ///
+  virtual PVR_ERROR GetRecordingsAmount(bool deleted, int& amount)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Request the list of all recordings from the backend, if supported.
+  ///
+  /// Recording entries are added to Kodi by calling TransferRecordingEntry() on the callback.
+  ///
+  /// @param[in] deleted if set return deleted recording (called if
+  ///                    @ref PVRCapabilities::SetSupportsRecordingsUndelete "supportsRecordingsUndelete"
+  ///                    set to true)
+  /// @param[out] results List of available recordings with @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  ///                     becomes transferred with @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecordingsResultSet
+  ///                     and given to Kodi
+  /// @return @ref PVR_ERROR_NO_ERROR if the recordings have been fetched successfully.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings "supportsRecordings"
+  /// is set to true.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Recording_PVRRecording_Help
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetRecordings(bool deleted, kodi::addon::PVRRecordingsResultSet& results)
+  /// {
+  ///   // Minimal demo example, in reality bigger and loop to transfer all
+  ///   kodi::addon::PVRRecording recording;
+  ///   recording.SetRecordingId(123);
+  ///   recording.SetTitle("My recording name");
+  ///   ...
+  ///
+  ///   // Give it now to Kodi
+  ///   results.Add(recording);
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetRecordings(bool deleted, kodi::addon::PVRRecordingsResultSet& results)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Delete a recording on the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording to delete.
+  /// @return @ref PVR_ERROR_NO_ERROR if the recording has been deleted successfully.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings "supportsRecordings"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR DeleteRecording(const kodi::addon::PVRRecording& recording)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Undelete a recording on the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording to undelete.
+  /// @return @ref PVR_ERROR_NO_ERROR if the recording has been undeleted successfully.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordingsUndelete "supportsRecordingsUndelete"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR UndeleteRecording(const kodi::addon::PVRRecording& recording)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief  Delete all recordings permanent which in the deleted folder on the backend.
+  ///
+  /// @return @ref PVR_ERROR_NO_ERROR if the recordings has been deleted successfully.
+  ///
+  virtual PVR_ERROR DeleteAllRecordingsFromTrash() { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Rename a recording on the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  ///                      to rename, containing the new name.
+  /// @return @ref PVR_ERROR_NO_ERROR if the recording has been renamed successfully.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings "supportsRecordings"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR RenameRecording(const kodi::addon::PVRRecording& recording)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set the lifetime of a recording on the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  ///                      to change the lifetime for. recording.iLifetime
+  ///                      contains the new lieftime value.
+  /// @return @ref PVR_ERROR_NO_ERROR if the recording's lifetime has been set
+  ///         successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsRecordingsLifetimeChange "supportsRecordingsLifetimeChange"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR SetRecordingLifetime(const kodi::addon::PVRRecording& recording)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set the play count of a recording on the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  ///                      to change the play count.
+  /// @param[in] count Play count.
+  /// @return @ref PVR_ERROR_NO_ERROR if the recording's play count has been set
+  /// successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsRecordingPlayCount "supportsRecordingPlayCount"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR SetRecordingPlayCount(const kodi::addon::PVRRecording& recording, int count)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set the last watched position of a recording on the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording.
+  /// @param[in] lastplayedposition The last watched position in seconds
+  /// @return @ref PVR_ERROR_NO_ERROR if the position has been stored successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsLastPlayedPosition "supportsLastPlayedPosition"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR SetRecordingLastPlayedPosition(const kodi::addon::PVRRecording& recording,
+                                                   int lastplayedposition)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Retrieve the last watched position of a recording on the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording.
+  /// @param[out] position The last watched position in seconds
+  /// @return @ref PVR_ERROR_NO_ERROR if the amount has been fetched successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsRecordingPlayCount "supportsRecordingPlayCount"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR GetRecordingLastPlayedPosition(const kodi::addon::PVRRecording& recording,
+                                                   int& position)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Retrieve the edit decision list (EDL) of a recording on the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording.
+  /// @param[out] edl The function has to write the EDL into this array.
+  /// @return @ref PVR_ERROR_NO_ERROR if the EDL was successfully read or no EDL exists.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsRecordingEdl "supportsRecordingEdl"
+  /// is set to true.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry_Help
+  ///
+  virtual PVR_ERROR GetRecordingEdl(const kodi::addon::PVRRecording& recording,
+                                    std::vector<kodi::addon::PVREDLEntry>& edl)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Retrieve the size of a recording on the backend.
+  ///
+  /// @param[in] recording The recording to get the size in bytes for.
+  /// @param[out] size The size in bytes of the recording
+  /// @return @ref PVR_ERROR_NO_ERROR if the recording's size has been set successfully.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsRecordingSize "supportsRecordingSize"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR GetRecordingSize(const kodi::addon::PVRRecording& recording, int64_t& size)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the stream properties for a recording from the backend.
+  ///
+  /// @param[in] recording The @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  ///                      to get the stream properties for.
+  /// @param[out] properties The properties required to play the stream.
+  /// @return @ref PVR_ERROR_NO_ERROR if the stream is available.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetSupportsRecordings "supportsRecordings"
+  /// is set to true and the add-on does not implement recording stream functions
+  /// (@ref OpenRecordedStream, ...).\n
+  /// In this case your implementation must fill the property @ref PVR_STREAM_PROPERTY_STREAMURL
+  /// with the URL Kodi should resolve to playback the recording.
+  ///
+  /// @note The value directly related to inputstream must always begin with the
+  /// name of the associated add-on, e.g. <b>`"inputstream.adaptive.manifest_update_parameter"`</b>.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetRecordingStreamProperties(const kodi::addon::PVRRecording& recording,
+  ///                                                        std::vector<kodi::addon::PVRStreamProperty>& properties)
+  /// {
+  ///   ...
+  ///   properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM, "inputstream.adaptive");
+  ///   properties.emplace_back("inputstream.adaptive.manifest_type", "mpd");
+  ///   properties.emplace_back("inputstream.adaptive.manifest_update_parameter", "full");
+  ///   properties.emplace_back(PVR_STREAM_PROPERTY_MIMETYPE, "application/xml+dash");
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetRecordingStreamProperties(
+      const kodi::addon::PVRRecording& recording,
+      std::vector<kodi::addon::PVRStreamProperty>& properties)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Call one of the recording related menu hooks (if supported).
+  ///
+  /// Supported @ref cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook instances have to be added in
+  /// `constructor()`, by calling @ref AddMenuHook() on the callback.
+  ///
+  /// @param[in] menuhook The hook to call.
+  /// @param[in] item The selected recording item for which the hook was called.
+  /// @return @ref PVR_ERROR_NO_ERROR if the hook was called successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook_Help
+  ///
+  virtual PVR_ERROR CallRecordingMenuHook(const kodi::addon::PVRMenuhook& menuhook,
+                                          const kodi::addon::PVRRecording& item)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Display a notification in Kodi that a recording started or stopped on the
+  /// server.
+  ///
+  /// @param[in] recordingName The name of the recording to display
+  /// @param[in] fileName The filename of the recording
+  /// @param[in] on True when recording started, false when it stopped
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  inline void RecordingNotification(const std::string& recordingName,
+                                    const std::string& fileName,
+                                    bool on)
+  {
+    m_instanceData->toKodi->RecordingNotification(m_instanceData->toKodi->kodiInstance,
+                                                  recordingName.c_str(), fileName.c_str(), on);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Request Kodi to update it's list of recordings.
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  inline void TriggerRecordingUpdate()
+  {
+    m_instanceData->toKodi->TriggerRecordingUpdate(m_instanceData->toKodi->kodiInstance);
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Timers 6. Timers (optional)
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief **PVR timer methods**\n
+  /// For editing and displaying timed work, such as video recording.
+  ///
+  /// @remarks Only used by Kodi if @ref PVRCapabilities::SetSupportsTimers "supportsTimers"
+  /// is set to true.\n\n
+  /// If a timer changes after the initial import, or if a new one was added,
+  /// then the add-on should call @ref TriggerTimerUpdate().
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Timer parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Timers_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_Timers_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Retrieve the timer types supported by the backend.
+  ///
+  /// @param[out] types The function has to write the definition of the
+  ///                   @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType types
+  ///                   into this array.
+  /// @return @ref PVR_ERROR_NO_ERROR if the types were successfully written to
+  ///         the array.
+  ///
+  /// @note Maximal 32 entries are allowed inside.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType_Help
+  ///
+  virtual PVR_ERROR GetTimerTypes(std::vector<kodi::addon::PVRTimerType>& types)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief To get total amount of timers on the backend or -1 on error.
+  ///
+  /// @param[out] amount The total amount of timers on the backend
+  /// @return @ref PVR_ERROR_NO_ERROR if the amount has been fetched successfully.
+  ///
+  /// @note Required to use if @ref PVRCapabilities::SetSupportsTimers "supportsTimers"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR GetTimersAmount(int& amount) { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Request the list of all timers from the backend if supported.
+  ///
+  /// @param[out] results List of available timers with @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimer
+  ///                     becomes transferred with @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimersResultSet
+  ///                     and given to Kodi
+  /// @return @ref PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+  ///
+  /// @note Required to use if @ref PVRCapabilities::SetSupportsTimers "supportsTimers"
+  /// is set to true.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Timer_PVRTimer_Help
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// PVR_ERROR CMyPVRInstance::GetTimers(kodi::addon::PVRTimersResultSet& results)
+  /// {
+  ///   // Minimal demo example, in reality bigger and loop to transfer all
+  ///   kodi::addon::PVRTimer timer;
+  ///   timer.SetClientIndex(123);
+  ///   timer.SetState(PVR_TIMER_STATE_SCHEDULED);
+  ///   timer.SetTitle("My timer name");
+  ///   ...
+  ///
+  ///   // Give it now to Kodi
+  ///   results.Add(timer);
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual PVR_ERROR GetTimers(kodi::addon::PVRTimersResultSet& results)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Add a timer on the backend.
+  ///
+  /// @param[in] timer The timer to add.
+  /// @return @ref PVR_ERROR_NO_ERROR if the timer has been added successfully.
+  ///
+  /// @note Required to use if @ref PVRCapabilities::SetSupportsTimers "supportsTimers"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR AddTimer(const kodi::addon::PVRTimer& timer)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Delete a timer on the backend.
+  ///
+  /// @param[in] timer The timer to delete.
+  /// @param[in] forceDelete Set to true to delete a timer that is currently
+  ///                        recording a program.
+  /// @return @ref PVR_ERROR_NO_ERROR if the timer has been deleted successfully.
+  ///
+  /// @note Required to use if @ref PVRCapabilities::SetSupportsTimers "supportsTimers"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR DeleteTimer(const kodi::addon::PVRTimer& timer, bool forceDelete)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Update the timer information on the backend.
+  ///
+  /// @param[in] timer The timer to update.
+  /// @return @ref PVR_ERROR_NO_ERROR if the timer has been updated successfully.
+  ///
+  /// @note Required to use if @ref PVRCapabilities::SetSupportsTimers "supportsTimers"
+  /// is set to true.
+  ///
+  virtual PVR_ERROR UpdateTimer(const kodi::addon::PVRTimer& timer)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Call one of the timer related menu hooks (if supported).
+  ///
+  /// Supported @ref cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook instances have
+  /// to be added in `constructor()`, by calling @ref AddMenuHook() on the
+  /// callback.
+  ///
+  /// @param[in] menuhook The hook to call.
+  /// @param[in] item The selected timer item for which the hook was called.
+  /// @return @ref PVR_ERROR_NO_ERROR if the hook was called successfully.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook_Help
+  ///
+  virtual PVR_ERROR CallTimerMenuHook(const kodi::addon::PVRMenuhook& menuhook,
+                                      const kodi::addon::PVRTimer& item)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Request Kodi to update it's list of timers.
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  inline void TriggerTimerUpdate()
+  {
+    m_instanceData->toKodi->TriggerTimerUpdate(m_instanceData->toKodi->kodiInstance);
+  }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_PowerManagement 7. Power management events (optional)
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief **Used to notify the pvr addon for power management events**\n
+  /// Used to allow any energy savings.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Power management events in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_PowerManagement_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_PowerManagement_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief To notify addon about system sleep
+  ///
+  /// @return @ref PVR_ERROR_NO_ERROR If successfully done.
+  ///
+  virtual PVR_ERROR OnSystemSleep() { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief To notify addon about system wake up
+  ///
+  /// @return @ref PVR_ERROR_NO_ERROR If successfully done.
+  ///
+  virtual PVR_ERROR OnSystemWake() { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief To notify addon power saving on system is activated
+  ///
+  /// @return @ref PVR_ERROR_NO_ERROR If successfully done.
+  ///
+  virtual PVR_ERROR OnPowerSavingActivated() { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief To notify addon power saving on system is deactivated
+  ///
+  /// @return @ref PVR_ERROR_NO_ERROR If successfully done.
+  ///
+  virtual PVR_ERROR OnPowerSavingDeactivated() { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Streams 8. Inputstream
+  /// @ingroup cpp_kodi_addon_pvr
+  /// @brief **PVR Inputstream**\n
+  /// This includes functions that are used in the PVR inputstream.
+  ///
+  /// @warning The parts here will be removed in the future and replaced by the
+  /// separate @ref cpp_kodi_addon_inputstream "inputstream addon instance".
+  /// If there is already a possibility, new addons should do it via the
+  /// inputstream instance.
+  ///
+  ///@{
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Streams_TV 8.1. TV stream
+  /// @ingroup cpp_kodi_addon_pvr_Streams
+  /// @brief **PVR TV stream**\n
+  /// Stream processing regarding live TV.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **TV stream parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Streams_TV_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_Streams_TV_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Open a live stream on the backend.
+  ///
+  /// @param[in] channel The channel to stream.
+  /// @return True if the stream has been opened successfully, false otherwise.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Channel_PVRChannel_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetHandlesInputStream() or
+  /// @ref PVRCapabilities::SetHandlesDemuxing() is set to true.
+  /// @ref CloseLiveStream() will always be called by Kodi prior to calling this
+  /// function.
+  ///
+  virtual bool OpenLiveStream(const kodi::addon::PVRChannel& channel) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Close an open live stream.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetHandlesInputStream() or
+  /// @ref PVRCapabilities::SetHandlesDemuxing() is set to true.
+  ///
+  virtual void CloseLiveStream() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Read from an open live stream.
+  ///
+  /// @param[in] pBuffer The buffer to store the data in.
+  /// @param[in] iBufferSize The amount of bytes to read.
+  /// @return The amount of bytes that were actually read from the stream.
+  ///
+  /// @remarks Required if @ref PVRCapabilities::SetHandlesInputStream() is set
+  /// to true.
+  ///
+  virtual int ReadLiveStream(unsigned char* buffer, unsigned int size) { return 0; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Seek in a live stream on a backend that supports timeshifting.
+  ///
+  /// @param[in] position The position to seek to.
+  /// @param[in] whence [optional] offset relative to
+  ///                   You can set the value of whence to one of three things:
+  /// |   Value | int | Description |
+  /// |:--------:|:---:|:----------------------------------------------------|
+  /// | SEEK_SET |  0 | position is relative to the beginning of the file. This is probably what you had in mind anyway, and is the most commonly used value for whence.
+  /// | SEEK_CUR |  1 | position is relative to the current file pointer position. So, in effect, you can say, "Move to my current position plus 30 bytes," or, "move to my current position minus 20 bytes."
+  /// | SEEK_END |  2 | position is relative to the end of the file. Just like SEEK_SET except from the other end of the file. Be sure to use negative values for offset if you want to back up from the end of the file, instead of going past the end into oblivion.
+  ///
+  /// @return The new position.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetHandlesInputStream()
+  /// is set to true.
+  ///
+  virtual int64_t SeekLiveStream(int64_t position, int whence) { return 0; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Obtain the length of a live stream.
+  ///
+  /// @return The total length of the stream that's currently being read.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetHandlesInputStream()
+  /// is set to true.
+  ///
+  virtual int64_t LengthLiveStream() { return 0; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Streams_TV_Demux 8.1.1. Stream demuxing
+  /// @ingroup cpp_kodi_addon_pvr_Streams_TV
+  /// @brief **PVR stream demuxing**\n
+  /// Read TV streams with own demux within addon.
+  ///
+  /// This is only on Live TV streams and only if @ref PVRCapabilities::SetHandlesDemuxing()
+  /// has been set to "true".
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Stream demuxing parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Streams_TV_Demux_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_Streams_TV_Demux_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Get the stream properties of the stream that's currently being read.
+  ///
+  /// @param[in] properties The properties of the currently playing stream.
+  /// @return @ref PVR_ERROR_NO_ERROR if the properties have been fetched successfully.
+  ///
+  /// @remarks Required, and only used if addon has its own demuxer.
+  ///
+  virtual PVR_ERROR GetStreamProperties(std::vector<kodi::addon::PVRStreamProperties>& properties)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Read the next packet from the demultiplexer, if there is one.
+  ///
+  /// @return The next packet.
+  /// If there is no next packet, then the add-on should return the packet
+  /// created by calling @ref AllocateDemuxPacket(0) on the callback.
+  /// If the stream changed and Kodi's player needs to be reinitialised, then,
+  /// the add-on should call @ref AllocateDemuxPacket(0) on the callback, and set
+  /// the streamid to @ref DMX_SPECIALID_STREAMCHANGE and return the value.
+  /// The add-on should return `nullptr` if an error occurred.
+  ///
+  /// @remarks Required, and only used if addon has its own demuxer.
+  /// Return `nullptr` if this add-on won't provide this function.
+  ///
+  virtual DemuxPacket* DemuxRead() { return nullptr; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Reset the demultiplexer in the add-on.
+  ///
+  /// @remarks Required, and only used if addon has its own demuxer.
+  ///
+  virtual void DemuxReset() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Abort the demultiplexer thread in the add-on.
+  ///
+  /// @remarks Required, and only used if addon has its own demuxer.
+  ///
+  virtual void DemuxAbort() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Flush all data that's currently in the demultiplexer buffer in the
+  /// add-on.
+  ///
+  /// @remarks Required, and only used if addon has its own demuxer.
+  ///
+  virtual void DemuxFlush() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Notify the pvr addon/demuxer that Kodi wishes to change playback
+  /// speed.
+  ///
+  /// @param[in] speed The requested playback speed
+  ///
+  /// @remarks Optional, and only used if addon has its own demuxer.
+  ///
+  virtual void SetSpeed(int speed) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Notify the pvr addon/demuxer that Kodi wishes to fill demux queue.
+  ///
+  /// @param[in] mode The requested filling mode
+  ///
+  /// @remarks Optional, and only used if addon has its own demuxer.
+  ///
+  virtual void FillBuffer(bool mode) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Notify the pvr addon/demuxer that Kodi wishes to seek the stream by
+  /// time.
+  ///
+  /// @param[in] time The absolute time since stream start
+  /// @param[in] backwards True to seek to keyframe BEFORE time, else AFTER
+  /// @param[in] startpts can be updated to point to where display should start
+  /// @return True if the seek operation was possible
+  ///
+  /// @remarks Optional, and only used if addon has its own demuxer.
+  ///          Return False if this add-on won't provide this function.
+  ///
+  virtual bool SeekTime(double time, bool backwards, double& startpts) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Get the codec id used by Kodi.
+  ///
+  /// @param[in] codecName The name of the codec
+  /// @return The codec_id, or a codec_id with 0 values when not supported
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  inline PVRCodec GetCodecByName(const std::string& codecName) const
+  {
+    return PVRCodec(m_instanceData->toKodi->GetCodecByName(m_instanceData->toKodi->kodiInstance,
+                                                           codecName.c_str()));
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Allocate a demux packet. Free with @ref FreeDemuxPacket().
+  ///
+  /// @param[in] iDataSize The size of the data that will go into the packet
+  /// @return The allocated packet
+  ///
+  /// @remarks Only called from addon itself
+  ///
+  inline DemuxPacket* AllocateDemuxPacket(int iDataSize)
+  {
+    return m_instanceData->toKodi->AllocateDemuxPacket(m_instanceData->toKodi->kodiInstance,
+                                                       iDataSize);
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief **Callback to Kodi Function**\n
+  /// Free a packet that was allocated with @ref AllocateDemuxPacket().
+  ///
+  /// @param[in] pPacket The packet to free
+  ///
+  /// @remarks Only called from addon itself.
+  ///
+  inline void FreeDemuxPacket(DemuxPacket* pPacket)
+  {
+    m_instanceData->toKodi->FreeDemuxPacket(m_instanceData->toKodi->kodiInstance, pPacket);
+  }
+  //----------------------------------------------------------------------------
+  ///@}
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Streams_Recording 8.2. Recording stream
+  /// @ingroup cpp_kodi_addon_pvr_Streams
+  /// @brief **PVR Recording stream**\n
+  /// Stream processing regarding recordings.
+  ///
+  /// @note Demuxing is not possible with the recordings.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Recording stream parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Streams_Recording_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_Streams_Recording_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Open a stream to a recording on the backend.
+  ///
+  /// @param[in] recording The recording to open.
+  /// @return True if the stream has been opened successfully, false otherwise.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings()
+  /// is set to true. @ref CloseRecordedStream() will always be called by Kodi
+  /// prior to calling this function.
+  ///
+  virtual bool OpenRecordedStream(const kodi::addon::PVRRecording& recording) { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Close an open stream from a recording.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings()
+  /// is set to true.
+  ///
+  virtual void CloseRecordedStream() {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Read from a recording.
+  ///
+  /// @param[in] buffer The buffer to store the data in.
+  /// @param[in] size The amount of bytes to read.
+  /// @return The amount of bytes that were actually read from the stream.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings()
+  /// is set to true.
+  ///
+  virtual int ReadRecordedStream(unsigned char* buffer, unsigned int size) { return 0; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Seek in a recorded stream.
+  ///
+  /// @param[in] position The position to seek to.
+  /// @param[in] whence [optional] offset relative to
+  ///                   You can set the value of whence to one of three things:
+  /// |   Value | int | Description |
+  /// |:--------:|:---:|:----------------------------------------------------|
+  /// | SEEK_SET |  0 | position is relative to the beginning of the file. This is probably what you had in mind anyway, and is the most commonly used value for whence.
+  /// | SEEK_CUR |  1 | position is relative to the current file pointer position. So, in effect, you can say, "Move to my current position plus 30 bytes," or, "move to my current position minus 20 bytes."
+  /// | SEEK_END |  2 | position is relative to the end of the file. Just like SEEK_SET except from the other end of the file. Be sure to use negative values for offset if you want to back up from the end of the file, instead of going past the end into oblivion.
+  ///
+  /// @return The new position.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings()
+  /// is set to true.
+  ///
+  virtual int64_t SeekRecordedStream(int64_t position, int whence) { return 0; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Obtain the length of a recorded stream.
+  ///
+  /// @return The total length of the stream that's currently being read.
+  ///
+  /// @remarks Optional, and only used if @ref PVRCapabilities::SetSupportsRecordings()
+  /// is true (=> @ref ReadRecordedStream).
+  ///
+  virtual int64_t LengthRecordedStream() { return 0; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Streams_Various 8.3. Various functions
+  /// @ingroup cpp_kodi_addon_pvr_Streams
+  /// @brief **Various other PVR stream related functions**\n
+  /// These apply to all other groups in inputstream and are therefore declared
+  /// as several.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Various stream parts in interface:**\n
+  /// Copy this to your project and extend with your parts or leave functions
+  /// complete away where not used or supported.
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Streams_Various_header_addon_auto_check
+  /// @copydetails cpp_kodi_addon_pvr_Streams_Various_source_addon_auto_check
+  ///
+  ///@{
+
+  //============================================================================
+  ///
+  /// @brief Check if the backend support pausing the currently playing stream.
+  ///
+  /// This will enable/disable the pause button in Kodi based on the return
+  /// value.
+  ///
+  /// @return false if the PVR addon/backend does not support pausing, true if
+  ///         possible
+  ///
+  virtual bool CanPauseStream() { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Check if the backend supports seeking for the currently playing
+  /// stream.
+  ///
+  /// This will enable/disable the rewind/forward buttons in Kodi based on the
+  /// return value.
+  ///
+  /// @return false if the PVR addon/backend does not support seeking, true if
+  ///         possible
+  ///
+  virtual bool CanSeekStream() { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Notify the pvr addon that Kodi (un)paused the currently playing
+  /// stream.
+  ///
+  /// @param[in] paused To inform by `true` is paused and with `false` playing
+  ///
+  virtual void PauseStream(bool paused) {}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Check for real-time streaming.
+  ///
+  /// @return true if current stream is real-time
+  ///
+  virtual bool IsRealTimeStream() { return false; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Get stream times.
+  ///
+  /// @param[out] times A pointer to the data to be filled by the implementation.
+  /// @return @ref PVR_ERROR_NO_ERROR on success.
+  ///
+  virtual PVR_ERROR GetStreamTimes(kodi::addon::PVRStreamTimes& times)
+  {
+    return PVR_ERROR_NOT_IMPLEMENTED;
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  ///
+  /// @brief Obtain the chunk size to use when reading streams.
+  ///
+  /// @param[out] chunksize must be filled with the chunk size in bytes.
+  /// @return @ref PVR_ERROR_NO_ERROR if the chunk size has been fetched successfully.
+  ///
+  /// @remarks Optional, and only used if not reading from demuxer (=> @ref DemuxRead) and
+  /// @ref PVRCapabilities::SetSupportsRecordings() is true (=> @ref ReadRecordedStream) or
+  /// @ref PVRCapabilities::SetHandlesInputStream() is true (=> @ref ReadLiveStream).
+  ///
+  virtual PVR_ERROR GetStreamReadChunkSize(int& chunksize) { return PVR_ERROR_NOT_IMPLEMENTED; }
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+private:
+  void SetAddonStruct(KODI_HANDLE instance, const std::string& kodiVersion)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstancePVRClient: Creation with empty addon "
+                             "structure not allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_PVR*>(instance);
+    m_instanceData->toAddon->addonInstance = this;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->GetCapabilities = ADDON_GetCapabilities;
+    m_instanceData->toAddon->GetConnectionString = ADDON_GetConnectionString;
+    m_instanceData->toAddon->GetBackendName = ADDON_GetBackendName;
+    m_instanceData->toAddon->GetBackendVersion = ADDON_GetBackendVersion;
+    m_instanceData->toAddon->GetBackendHostname = ADDON_GetBackendHostname;
+    m_instanceData->toAddon->GetDriveSpace = ADDON_GetDriveSpace;
+    m_instanceData->toAddon->CallSettingsMenuHook = ADDON_CallSettingsMenuHook;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->GetChannelsAmount = ADDON_GetChannelsAmount;
+    m_instanceData->toAddon->GetChannels = ADDON_GetChannels;
+    m_instanceData->toAddon->GetChannelStreamProperties = ADDON_GetChannelStreamProperties;
+    m_instanceData->toAddon->GetSignalStatus = ADDON_GetSignalStatus;
+    m_instanceData->toAddon->GetDescrambleInfo = ADDON_GetDescrambleInfo;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->GetChannelGroupsAmount = ADDON_GetChannelGroupsAmount;
+    m_instanceData->toAddon->GetChannelGroups = ADDON_GetChannelGroups;
+    m_instanceData->toAddon->GetChannelGroupMembers = ADDON_GetChannelGroupMembers;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->DeleteChannel = ADDON_DeleteChannel;
+    m_instanceData->toAddon->RenameChannel = ADDON_RenameChannel;
+    m_instanceData->toAddon->OpenDialogChannelSettings = ADDON_OpenDialogChannelSettings;
+    m_instanceData->toAddon->OpenDialogChannelAdd = ADDON_OpenDialogChannelAdd;
+    m_instanceData->toAddon->OpenDialogChannelScan = ADDON_OpenDialogChannelScan;
+    m_instanceData->toAddon->CallChannelMenuHook = ADDON_CallChannelMenuHook;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->GetEPGForChannel = ADDON_GetEPGForChannel;
+    m_instanceData->toAddon->IsEPGTagRecordable = ADDON_IsEPGTagRecordable;
+    m_instanceData->toAddon->IsEPGTagPlayable = ADDON_IsEPGTagPlayable;
+    m_instanceData->toAddon->GetEPGTagEdl = ADDON_GetEPGTagEdl;
+    m_instanceData->toAddon->GetEPGTagStreamProperties = ADDON_GetEPGTagStreamProperties;
+    m_instanceData->toAddon->SetEPGTimeFrame = ADDON_SetEPGTimeFrame;
+    m_instanceData->toAddon->CallEPGMenuHook = ADDON_CallEPGMenuHook;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->GetRecordingsAmount = ADDON_GetRecordingsAmount;
+    m_instanceData->toAddon->GetRecordings = ADDON_GetRecordings;
+    m_instanceData->toAddon->DeleteRecording = ADDON_DeleteRecording;
+    m_instanceData->toAddon->UndeleteRecording = ADDON_UndeleteRecording;
+    m_instanceData->toAddon->DeleteAllRecordingsFromTrash = ADDON_DeleteAllRecordingsFromTrash;
+    m_instanceData->toAddon->RenameRecording = ADDON_RenameRecording;
+    m_instanceData->toAddon->SetRecordingLifetime = ADDON_SetRecordingLifetime;
+    m_instanceData->toAddon->SetRecordingPlayCount = ADDON_SetRecordingPlayCount;
+    m_instanceData->toAddon->SetRecordingLastPlayedPosition = ADDON_SetRecordingLastPlayedPosition;
+    m_instanceData->toAddon->GetRecordingLastPlayedPosition = ADDON_GetRecordingLastPlayedPosition;
+    m_instanceData->toAddon->GetRecordingEdl = ADDON_GetRecordingEdl;
+    m_instanceData->toAddon->GetRecordingSize = ADDON_GetRecordingSize;
+    m_instanceData->toAddon->GetRecordingStreamProperties = ADDON_GetRecordingStreamProperties;
+    m_instanceData->toAddon->CallRecordingMenuHook = ADDON_CallRecordingMenuHook;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->GetTimerTypes = ADDON_GetTimerTypes;
+    m_instanceData->toAddon->GetTimersAmount = ADDON_GetTimersAmount;
+    m_instanceData->toAddon->GetTimers = ADDON_GetTimers;
+    m_instanceData->toAddon->AddTimer = ADDON_AddTimer;
+    m_instanceData->toAddon->DeleteTimer = ADDON_DeleteTimer;
+    m_instanceData->toAddon->UpdateTimer = ADDON_UpdateTimer;
+    m_instanceData->toAddon->CallTimerMenuHook = ADDON_CallTimerMenuHook;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->OnSystemSleep = ADDON_OnSystemSleep;
+    m_instanceData->toAddon->OnSystemWake = ADDON_OnSystemWake;
+    m_instanceData->toAddon->OnPowerSavingActivated = ADDON_OnPowerSavingActivated;
+    m_instanceData->toAddon->OnPowerSavingDeactivated = ADDON_OnPowerSavingDeactivated;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->OpenLiveStream = ADDON_OpenLiveStream;
+    m_instanceData->toAddon->CloseLiveStream = ADDON_CloseLiveStream;
+    m_instanceData->toAddon->ReadLiveStream = ADDON_ReadLiveStream;
+    m_instanceData->toAddon->SeekLiveStream = ADDON_SeekLiveStream;
+    m_instanceData->toAddon->LengthLiveStream = ADDON_LengthLiveStream;
+    m_instanceData->toAddon->GetStreamProperties = ADDON_GetStreamProperties;
+    m_instanceData->toAddon->GetStreamReadChunkSize = ADDON_GetStreamReadChunkSize;
+    m_instanceData->toAddon->IsRealTimeStream = ADDON_IsRealTimeStream;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->OpenRecordedStream = ADDON_OpenRecordedStream;
+    m_instanceData->toAddon->CloseRecordedStream = ADDON_CloseRecordedStream;
+    m_instanceData->toAddon->ReadRecordedStream = ADDON_ReadRecordedStream;
+    m_instanceData->toAddon->SeekRecordedStream = ADDON_SeekRecordedStream;
+    m_instanceData->toAddon->LengthRecordedStream = ADDON_LengthRecordedStream;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->DemuxReset = ADDON_DemuxReset;
+    m_instanceData->toAddon->DemuxAbort = ADDON_DemuxAbort;
+    m_instanceData->toAddon->DemuxFlush = ADDON_DemuxFlush;
+    m_instanceData->toAddon->DemuxRead = ADDON_DemuxRead;
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    m_instanceData->toAddon->CanPauseStream = ADDON_CanPauseStream;
+    m_instanceData->toAddon->PauseStream = ADDON_PauseStream;
+    m_instanceData->toAddon->CanSeekStream = ADDON_CanSeekStream;
+    m_instanceData->toAddon->SeekTime = ADDON_SeekTime;
+    m_instanceData->toAddon->SetSpeed = ADDON_SetSpeed;
+    m_instanceData->toAddon->FillBuffer = ADDON_FillBuffer;
+    m_instanceData->toAddon->GetStreamTimes = ADDON_GetStreamTimes;
+  }
+
+  inline static PVR_ERROR ADDON_GetCapabilities(const AddonInstance_PVR* instance,
+                                                PVR_ADDON_CAPABILITIES* capabilities)
+  {
+    PVRCapabilities cppCapabilities(capabilities);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetCapabilities(cppCapabilities);
+  }
+
+  inline static PVR_ERROR ADDON_GetBackendName(const AddonInstance_PVR* instance,
+                                               char* str,
+                                               int memSize)
+  {
+    std::string backendName;
+    PVR_ERROR err = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                        ->GetBackendName(backendName);
+    if (err == PVR_ERROR_NO_ERROR)
+      strncpy(str, backendName.c_str(), memSize);
+    return err;
+  }
+
+  inline static PVR_ERROR ADDON_GetBackendVersion(const AddonInstance_PVR* instance,
+                                                  char* str,
+                                                  int memSize)
+  {
+    std::string backendVersion;
+    PVR_ERROR err = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                        ->GetBackendVersion(backendVersion);
+    if (err == PVR_ERROR_NO_ERROR)
+      strncpy(str, backendVersion.c_str(), memSize);
+    return err;
+  }
+
+  inline static PVR_ERROR ADDON_GetBackendHostname(const AddonInstance_PVR* instance,
+                                                   char* str,
+                                                   int memSize)
+  {
+    std::string backendHostname;
+    PVR_ERROR err = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                        ->GetBackendHostname(backendHostname);
+    if (err == PVR_ERROR_NO_ERROR)
+      strncpy(str, backendHostname.c_str(), memSize);
+    return err;
+  }
+
+  inline static PVR_ERROR ADDON_GetConnectionString(const AddonInstance_PVR* instance,
+                                                    char* str,
+                                                    int memSize)
+  {
+    std::string connectionString;
+    PVR_ERROR err = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                        ->GetConnectionString(connectionString);
+    if (err == PVR_ERROR_NO_ERROR)
+      strncpy(str, connectionString.c_str(), memSize);
+    return err;
+  }
+
+  inline static PVR_ERROR ADDON_GetDriveSpace(const AddonInstance_PVR* instance,
+                                              uint64_t* total,
+                                              uint64_t* used)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetDriveSpace(*total, *used);
+  }
+
+  inline static PVR_ERROR ADDON_CallSettingsMenuHook(const AddonInstance_PVR* instance,
+                                                     const PVR_MENUHOOK* menuhook)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->CallSettingsMenuHook(menuhook);
+  }
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  inline static PVR_ERROR ADDON_GetChannelsAmount(const AddonInstance_PVR* instance, int* amount)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetChannelsAmount(*amount);
+  }
+
+  inline static PVR_ERROR ADDON_GetChannels(const AddonInstance_PVR* instance,
+                                            ADDON_HANDLE handle,
+                                            bool radio)
+  {
+    PVRChannelsResultSet result(instance, handle);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetChannels(radio, result);
+  }
+
+  inline static PVR_ERROR ADDON_GetChannelStreamProperties(const AddonInstance_PVR* instance,
+                                                           const PVR_CHANNEL* channel,
+                                                           PVR_NAMED_VALUE* properties,
+                                                           unsigned int* propertiesCount)
+  {
+    *propertiesCount = 0;
+    std::vector<PVRStreamProperty> propertiesList;
+    PVR_ERROR error = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                          ->GetChannelStreamProperties(channel, propertiesList);
+    if (error == PVR_ERROR_NO_ERROR)
+    {
+      for (const auto& property : propertiesList)
+      {
+        strncpy(properties[*propertiesCount].strName, property.GetCStructure()->strName,
+                sizeof(properties[*propertiesCount].strName) - 1);
+        strncpy(properties[*propertiesCount].strValue, property.GetCStructure()->strValue,
+                sizeof(properties[*propertiesCount].strValue) - 1);
+        ++*propertiesCount;
+        if (*propertiesCount > STREAM_MAX_PROPERTY_COUNT)
+          break;
+      }
+    }
+    return error;
+  }
+
+  inline static PVR_ERROR ADDON_GetSignalStatus(const AddonInstance_PVR* instance,
+                                                int channelUid,
+                                                PVR_SIGNAL_STATUS* signalStatus)
+  {
+    PVRSignalStatus cppSignalStatus(signalStatus);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetSignalStatus(channelUid, cppSignalStatus);
+  }
+
+  inline static PVR_ERROR ADDON_GetDescrambleInfo(const AddonInstance_PVR* instance,
+                                                  int channelUid,
+                                                  PVR_DESCRAMBLE_INFO* descrambleInfo)
+  {
+    PVRDescrambleInfo cppDescrambleInfo(descrambleInfo);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetDescrambleInfo(channelUid, cppDescrambleInfo);
+  }
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  inline static PVR_ERROR ADDON_GetChannelGroupsAmount(const AddonInstance_PVR* instance,
+                                                       int* amount)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetChannelGroupsAmount(*amount);
+  }
+
+  inline static PVR_ERROR ADDON_GetChannelGroups(const AddonInstance_PVR* instance,
+                                                 ADDON_HANDLE handle,
+                                                 bool radio)
+  {
+    PVRChannelGroupsResultSet result(instance, handle);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetChannelGroups(radio, result);
+  }
+
+  inline static PVR_ERROR ADDON_GetChannelGroupMembers(const AddonInstance_PVR* instance,
+                                                       ADDON_HANDLE handle,
+                                                       const PVR_CHANNEL_GROUP* group)
+  {
+    PVRChannelGroupMembersResultSet result(instance, handle);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetChannelGroupMembers(group, result);
+  }
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  inline static PVR_ERROR ADDON_DeleteChannel(const AddonInstance_PVR* instance,
+                                              const PVR_CHANNEL* channel)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->DeleteChannel(channel);
+  }
+
+  inline static PVR_ERROR ADDON_RenameChannel(const AddonInstance_PVR* instance,
+                                              const PVR_CHANNEL* channel)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->RenameChannel(channel);
+  }
+
+  inline static PVR_ERROR ADDON_OpenDialogChannelSettings(const AddonInstance_PVR* instance,
+                                                          const PVR_CHANNEL* channel)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->OpenDialogChannelSettings(channel);
+  }
+
+  inline static PVR_ERROR ADDON_OpenDialogChannelAdd(const AddonInstance_PVR* instance,
+                                                     const PVR_CHANNEL* channel)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->OpenDialogChannelAdd(channel);
+  }
+
+  inline static PVR_ERROR ADDON_OpenDialogChannelScan(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->OpenDialogChannelScan();
+  }
+
+  inline static PVR_ERROR ADDON_CallChannelMenuHook(const AddonInstance_PVR* instance,
+                                                    const PVR_MENUHOOK* menuhook,
+                                                    const PVR_CHANNEL* channel)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->CallChannelMenuHook(menuhook, channel);
+  }
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  inline static PVR_ERROR ADDON_GetEPGForChannel(const AddonInstance_PVR* instance,
+                                                 ADDON_HANDLE handle,
+                                                 int channelUid,
+                                                 time_t start,
+                                                 time_t end)
+  {
+    PVREPGTagsResultSet result(instance, handle);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetEPGForChannel(channelUid, start, end, result);
+  }
+
+  inline static PVR_ERROR ADDON_IsEPGTagRecordable(const AddonInstance_PVR* instance,
+                                                   const EPG_TAG* tag,
+                                                   bool* isRecordable)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->IsEPGTagRecordable(tag, *isRecordable);
+  }
+
+  inline static PVR_ERROR ADDON_IsEPGTagPlayable(const AddonInstance_PVR* instance,
+                                                 const EPG_TAG* tag,
+                                                 bool* isPlayable)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->IsEPGTagPlayable(tag, *isPlayable);
+  }
+
+  inline static PVR_ERROR ADDON_GetEPGTagEdl(const AddonInstance_PVR* instance,
+                                             const EPG_TAG* tag,
+                                             PVR_EDL_ENTRY* edl,
+                                             int* size)
+  {
+    *size = 0;
+    std::vector<PVREDLEntry> edlList;
+    PVR_ERROR error = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                          ->GetEPGTagEdl(tag, edlList);
+    if (error == PVR_ERROR_NO_ERROR)
+    {
+      for (const auto& edlEntry : edlList)
+      {
+        edl[*size] = *edlEntry;
+        ++*size;
+      }
+    }
+    return error;
+  }
+
+  inline static PVR_ERROR ADDON_GetEPGTagStreamProperties(const AddonInstance_PVR* instance,
+                                                          const EPG_TAG* tag,
+                                                          PVR_NAMED_VALUE* properties,
+                                                          unsigned int* propertiesCount)
+  {
+    *propertiesCount = 0;
+    std::vector<PVRStreamProperty> propertiesList;
+    PVR_ERROR error = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                          ->GetEPGTagStreamProperties(tag, propertiesList);
+    if (error == PVR_ERROR_NO_ERROR)
+    {
+      for (const auto& property : propertiesList)
+      {
+        strncpy(properties[*propertiesCount].strName, property.GetCStructure()->strName,
+                sizeof(properties[*propertiesCount].strName) - 1);
+        strncpy(properties[*propertiesCount].strValue, property.GetCStructure()->strValue,
+                sizeof(properties[*propertiesCount].strValue) - 1);
+        ++*propertiesCount;
+        if (*propertiesCount > STREAM_MAX_PROPERTY_COUNT)
+          break;
+      }
+    }
+    return error;
+  }
+
+  inline static PVR_ERROR ADDON_SetEPGTimeFrame(const AddonInstance_PVR* instance, int days)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->SetEPGTimeFrame(days);
+  }
+
+  inline static PVR_ERROR ADDON_CallEPGMenuHook(const AddonInstance_PVR* instance,
+                                                const PVR_MENUHOOK* menuhook,
+                                                const EPG_TAG* tag)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->CallEPGMenuHook(menuhook, tag);
+  }
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  inline static PVR_ERROR ADDON_GetRecordingsAmount(const AddonInstance_PVR* instance,
+                                                    bool deleted,
+                                                    int* amount)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetRecordingsAmount(deleted, *amount);
+  }
+
+  inline static PVR_ERROR ADDON_GetRecordings(const AddonInstance_PVR* instance,
+                                              ADDON_HANDLE handle,
+                                              bool deleted)
+  {
+    PVRRecordingsResultSet result(instance, handle);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetRecordings(deleted, result);
+  }
+
+  inline static PVR_ERROR ADDON_DeleteRecording(const AddonInstance_PVR* instance,
+                                                const PVR_RECORDING* recording)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->DeleteRecording(recording);
+  }
+
+  inline static PVR_ERROR ADDON_UndeleteRecording(const AddonInstance_PVR* instance,
+                                                  const PVR_RECORDING* recording)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->UndeleteRecording(recording);
+  }
+
+  inline static PVR_ERROR ADDON_DeleteAllRecordingsFromTrash(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->DeleteAllRecordingsFromTrash();
+  }
+
+  inline static PVR_ERROR ADDON_RenameRecording(const AddonInstance_PVR* instance,
+                                                const PVR_RECORDING* recording)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->RenameRecording(recording);
+  }
+
+  inline static PVR_ERROR ADDON_SetRecordingLifetime(const AddonInstance_PVR* instance,
+                                                     const PVR_RECORDING* recording)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->SetRecordingLifetime(recording);
+  }
+
+  inline static PVR_ERROR ADDON_SetRecordingPlayCount(const AddonInstance_PVR* instance,
+                                                      const PVR_RECORDING* recording,
+                                                      int count)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->SetRecordingPlayCount(recording, count);
+  }
+
+  inline static PVR_ERROR ADDON_SetRecordingLastPlayedPosition(const AddonInstance_PVR* instance,
+                                                               const PVR_RECORDING* recording,
+                                                               int lastplayedposition)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->SetRecordingLastPlayedPosition(recording, lastplayedposition);
+  }
+
+  inline static PVR_ERROR ADDON_GetRecordingLastPlayedPosition(const AddonInstance_PVR* instance,
+                                                               const PVR_RECORDING* recording,
+                                                               int* position)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetRecordingLastPlayedPosition(recording, *position);
+  }
+
+  inline static PVR_ERROR ADDON_GetRecordingEdl(const AddonInstance_PVR* instance,
+                                                const PVR_RECORDING* recording,
+                                                PVR_EDL_ENTRY* edl,
+                                                int* size)
+  {
+    *size = 0;
+    std::vector<PVREDLEntry> edlList;
+    PVR_ERROR error = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                          ->GetRecordingEdl(recording, edlList);
+    if (error == PVR_ERROR_NO_ERROR)
+    {
+      for (const auto& edlEntry : edlList)
+      {
+        edl[*size] = *edlEntry;
+        ++*size;
+      }
+    }
+    return error;
+  }
+
+  inline static PVR_ERROR ADDON_GetRecordingSize(const AddonInstance_PVR* instance,
+                                                 const PVR_RECORDING* recording,
+                                                 int64_t* size)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetRecordingSize(recording, *size);
+  }
+
+  inline static PVR_ERROR ADDON_GetRecordingStreamProperties(const AddonInstance_PVR* instance,
+                                                             const PVR_RECORDING* recording,
+                                                             PVR_NAMED_VALUE* properties,
+                                                             unsigned int* propertiesCount)
+  {
+    *propertiesCount = 0;
+    std::vector<PVRStreamProperty> propertiesList;
+    PVR_ERROR error = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                          ->GetRecordingStreamProperties(recording, propertiesList);
+    if (error == PVR_ERROR_NO_ERROR)
+    {
+      for (const auto& property : propertiesList)
+      {
+        strncpy(properties[*propertiesCount].strName, property.GetCStructure()->strName,
+                sizeof(properties[*propertiesCount].strName) - 1);
+        strncpy(properties[*propertiesCount].strValue, property.GetCStructure()->strValue,
+                sizeof(properties[*propertiesCount].strValue) - 1);
+        ++*propertiesCount;
+        if (*propertiesCount > STREAM_MAX_PROPERTY_COUNT)
+          break;
+      }
+    }
+    return error;
+  }
+
+  inline static PVR_ERROR ADDON_CallRecordingMenuHook(const AddonInstance_PVR* instance,
+                                                      const PVR_MENUHOOK* menuhook,
+                                                      const PVR_RECORDING* recording)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->CallRecordingMenuHook(menuhook, recording);
+  }
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+
+  inline static PVR_ERROR ADDON_GetTimerTypes(const AddonInstance_PVR* instance,
+                                              PVR_TIMER_TYPE* types,
+                                              int* typesCount)
+  {
+    *typesCount = 0;
+    std::vector<PVRTimerType> timerTypes;
+    PVR_ERROR error = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                          ->GetTimerTypes(timerTypes);
+    if (error == PVR_ERROR_NO_ERROR)
+    {
+      for (const auto& timerType : timerTypes)
+      {
+        types[*typesCount] = *timerType;
+        ++*typesCount;
+        if (*typesCount >= PVR_ADDON_TIMERTYPE_ARRAY_SIZE)
+          break;
+      }
+    }
+    return error;
+  }
+
+  inline static PVR_ERROR ADDON_GetTimersAmount(const AddonInstance_PVR* instance, int* amount)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetTimersAmount(*amount);
+  }
+
+  inline static PVR_ERROR ADDON_GetTimers(const AddonInstance_PVR* instance, ADDON_HANDLE handle)
+  {
+    PVRTimersResultSet result(instance, handle);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->GetTimers(result);
+  }
+
+  inline static PVR_ERROR ADDON_AddTimer(const AddonInstance_PVR* instance, const PVR_TIMER* timer)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->AddTimer(timer);
+  }
+
+  inline static PVR_ERROR ADDON_DeleteTimer(const AddonInstance_PVR* instance,
+                                            const PVR_TIMER* timer,
+                                            bool forceDelete)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->DeleteTimer(timer, forceDelete);
+  }
+
+  inline static PVR_ERROR ADDON_UpdateTimer(const AddonInstance_PVR* instance,
+                                            const PVR_TIMER* timer)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->UpdateTimer(timer);
+  }
+
+  inline static PVR_ERROR ADDON_CallTimerMenuHook(const AddonInstance_PVR* instance,
+                                                  const PVR_MENUHOOK* menuhook,
+                                                  const PVR_TIMER* timer)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->CallTimerMenuHook(menuhook, timer);
+  }
+
+  //--==----==----==----==----==----==----==----==----==----==----==----==----==
+
+  inline static PVR_ERROR ADDON_OnSystemSleep(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->OnSystemSleep();
+  }
+
+  inline static PVR_ERROR ADDON_OnSystemWake(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->OnSystemWake();
+  }
+
+  inline static PVR_ERROR ADDON_OnPowerSavingActivated(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->OnPowerSavingActivated();
+  }
+
+  inline static PVR_ERROR ADDON_OnPowerSavingDeactivated(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->OnPowerSavingDeactivated();
+  }
+
+  // obsolete parts below
+  ///@{
+
+  inline static bool ADDON_OpenLiveStream(const AddonInstance_PVR* instance,
+                                          const PVR_CHANNEL* channel)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->OpenLiveStream(channel);
+  }
+
+  inline static void ADDON_CloseLiveStream(const AddonInstance_PVR* instance)
+  {
+    static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->CloseLiveStream();
+  }
+
+  inline static int ADDON_ReadLiveStream(const AddonInstance_PVR* instance,
+                                         unsigned char* buffer,
+                                         unsigned int size)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->ReadLiveStream(buffer, size);
+  }
+
+  inline static int64_t ADDON_SeekLiveStream(const AddonInstance_PVR* instance,
+                                             int64_t position,
+                                             int whence)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->SeekLiveStream(position, whence);
+  }
+
+  inline static int64_t ADDON_LengthLiveStream(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->LengthLiveStream();
+  }
+
+  inline static PVR_ERROR ADDON_GetStreamProperties(const AddonInstance_PVR* instance,
+                                                    PVR_STREAM_PROPERTIES* properties)
+  {
+    properties->iStreamCount = 0;
+    std::vector<PVRStreamProperties> cppProperties;
+    PVR_ERROR err = static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+                        ->GetStreamProperties(cppProperties);
+    if (err == PVR_ERROR_NO_ERROR)
+    {
+      for (unsigned int i = 0; i < cppProperties.size(); ++i)
+      {
+        memcpy(&properties->stream[i],
+               static_cast<PVR_STREAM_PROPERTIES::PVR_STREAM*>(cppProperties[i]),
+               sizeof(PVR_STREAM_PROPERTIES::PVR_STREAM));
+        ++properties->iStreamCount;
+
+        if (properties->iStreamCount >= PVR_STREAM_MAX_STREAMS)
+        {
+          kodi::Log(
+              ADDON_LOG_ERROR,
+              "CInstancePVRClient::%s: Addon given with '%li' more allowed streams where '%i'",
+              __func__, cppProperties.size(), PVR_STREAM_MAX_STREAMS);
+          break;
+        }
+      }
+    }
+
+    return err;
+  }
+
+  inline static PVR_ERROR ADDON_GetStreamReadChunkSize(const AddonInstance_PVR* instance,
+                                                       int* chunksize)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetStreamReadChunkSize(*chunksize);
+  }
+
+  inline static bool ADDON_IsRealTimeStream(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->IsRealTimeStream();
+  }
+
+  inline static bool ADDON_OpenRecordedStream(const AddonInstance_PVR* instance,
+                                              const PVR_RECORDING* recording)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->OpenRecordedStream(recording);
+  }
+
+  inline static void ADDON_CloseRecordedStream(const AddonInstance_PVR* instance)
+  {
+    static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->CloseRecordedStream();
+  }
+
+  inline static int ADDON_ReadRecordedStream(const AddonInstance_PVR* instance,
+                                             unsigned char* buffer,
+                                             unsigned int size)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->ReadRecordedStream(buffer, size);
+  }
+
+  inline static int64_t ADDON_SeekRecordedStream(const AddonInstance_PVR* instance,
+                                                 int64_t position,
+                                                 int whence)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->SeekRecordedStream(position, whence);
+  }
+
+  inline static int64_t ADDON_LengthRecordedStream(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->LengthRecordedStream();
+  }
+
+  inline static void ADDON_DemuxReset(const AddonInstance_PVR* instance)
+  {
+    static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->DemuxReset();
+  }
+
+  inline static void ADDON_DemuxAbort(const AddonInstance_PVR* instance)
+  {
+    static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->DemuxAbort();
+  }
+
+  inline static void ADDON_DemuxFlush(const AddonInstance_PVR* instance)
+  {
+    static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->DemuxFlush();
+  }
+
+  inline static DemuxPacket* ADDON_DemuxRead(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->DemuxRead();
+  }
+
+  inline static bool ADDON_CanPauseStream(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->CanPauseStream();
+  }
+
+  inline static bool ADDON_CanSeekStream(const AddonInstance_PVR* instance)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->CanSeekStream();
+  }
+
+  inline static void ADDON_PauseStream(const AddonInstance_PVR* instance, bool bPaused)
+  {
+    static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->PauseStream(bPaused);
+  }
+
+  inline static bool ADDON_SeekTime(const AddonInstance_PVR* instance,
+                                    double time,
+                                    bool backwards,
+                                    double* startpts)
+  {
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->SeekTime(time, backwards, *startpts);
+  }
+
+  inline static void ADDON_SetSpeed(const AddonInstance_PVR* instance, int speed)
+  {
+    static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->SetSpeed(speed);
+  }
+
+  inline static void ADDON_FillBuffer(const AddonInstance_PVR* instance, bool mode)
+  {
+    static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)->FillBuffer(mode);
+  }
+
+  inline static PVR_ERROR ADDON_GetStreamTimes(const AddonInstance_PVR* instance,
+                                               PVR_STREAM_TIMES* times)
+  {
+    PVRStreamTimes cppTimes(times);
+    return static_cast<CInstancePVRClient*>(instance->toAddon->addonInstance)
+        ->GetStreamTimes(cppTimes);
+  }
+  ///@}
+
+  AddonInstance_PVR* m_instanceData = nullptr;
+};
+//}}}
+//______________________________________________________________________________
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
index 2df8a36..2067d51 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
@@ -453,11 +453,11 @@ namespace kodi
 namespace addon
 {
 
-  class CInstancePeripheral : public IAddonInstance
+  class ATTRIBUTE_HIDDEN CInstancePeripheral : public IAddonInstance
   {
   public:
     CInstancePeripheral()
-      : IAddonInstance(ADDON_INSTANCE_PERIPHERAL)
+      : IAddonInstance(ADDON_INSTANCE_PERIPHERAL, GetKodiTypeVersion(ADDON_INSTANCE_PERIPHERAL))
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstancePeripheral: Creation of more as one in single instance way is not allowed!");
@@ -466,8 +466,10 @@ namespace addon
       CAddonBase::m_interface->globalSingleInstance = this;
     }
 
-    explicit CInstancePeripheral(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_PERIPHERAL)
+    explicit CInstancePeripheral(KODI_HANDLE instance, const std::string& kodiVersion = "")
+      : IAddonInstance(ADDON_INSTANCE_PERIPHERAL,
+                       !kodiVersion.empty() ? kodiVersion
+                                            : GetKodiTypeVersion(ADDON_INSTANCE_PERIPHERAL))
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstancePeripheral: Creation of multiple together with single instance way is not allowed!");
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
index 9b2a43f..62e5a93 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
@@ -150,9 +150,7 @@ namespace addon
   class PeripheralEvent
   {
   public:
-    PeripheralEvent(void)
-    {
-    }
+    PeripheralEvent() = default;
 
     PeripheralEvent(unsigned int peripheralIndex, unsigned int buttonIndex, JOYSTICK_STATE_BUTTON state) :
       m_type(PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON),
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Screensaver.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Screensaver.h
index c4f8005..f8a7380 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Screensaver.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Screensaver.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "../AddonBase.h"
+#include "../gui/renderHelper.h"
 
 namespace kodi { namespace addon { class CInstanceScreensaver; }}
 
@@ -218,7 +219,7 @@ namespace addon
   /// Kodi's header. Manually deleting the add-on instance is not required.
   ///
   //----------------------------------------------------------------------------
-  class CInstanceScreensaver : public IAddonInstance
+  class ATTRIBUTE_HIDDEN CInstanceScreensaver : public IAddonInstance
   {
   public:
     //==========================================================================
@@ -229,7 +230,7 @@ namespace addon
     /// Used by an add-on that only supports screensavers.
     ///
     CInstanceScreensaver()
-      : IAddonInstance(ADDON_INSTANCE_SCREENSAVER)
+      : IAddonInstance(ADDON_INSTANCE_SCREENSAVER, GetKodiTypeVersion(ADDON_INSTANCE_SCREENSAVER))
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstanceScreensaver: Creation of more as one in single instance way is not allowed!");
@@ -247,11 +248,16 @@ namespace addon
     ///
     /// @param[in] instance               The instance value given to
     ///                                   <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+    /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+    ///                        allow compatibility to older Kodi versions.
+    ///                        @note Recommended to set.
     ///
     /// @warning Only use `instance` from the CreateInstance call
     ///
-    explicit CInstanceScreensaver(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_SCREENSAVER)
+    explicit CInstanceScreensaver(KODI_HANDLE instance, const std::string& kodiVersion = "")
+      : IAddonInstance(ADDON_INSTANCE_SCREENSAVER,
+                       !kodiVersion.empty() ? kodiVersion
+                                            : GetKodiTypeVersion(ADDON_INSTANCE_SCREENSAVER))
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstanceScreensaver: Creation of multiple together with single instance way is not allowed!");
@@ -418,19 +424,35 @@ namespace addon
 
     inline static bool ADDON_Start(AddonInstance_Screensaver* instance)
     {
+      instance->toAddon.addonInstance->m_renderHelper = kodi::gui::GetRenderHelper();
       return instance->toAddon.addonInstance->Start();
     }
 
     inline static void ADDON_Stop(AddonInstance_Screensaver* instance)
     {
       instance->toAddon.addonInstance->Stop();
+      instance->toAddon.addonInstance->m_renderHelper = nullptr;
     }
 
     inline static void ADDON_Render(AddonInstance_Screensaver* instance)
     {
+      if (!instance->toAddon.addonInstance->m_renderHelper)
+        return;
+      instance->toAddon.addonInstance->m_renderHelper->Begin();
       instance->toAddon.addonInstance->Render();
+      instance->toAddon.addonInstance->m_renderHelper->End();
     }
 
+    /*
+     * Background render helper holds here and in addon base.
+     * In addon base also to have for the others, and stored here for the worst
+     * case where this class is independent from base and base becomes closed
+     * before.
+     *
+     * This is on Kodi with GL unused and the calls to there are empty (no work)
+     * On Kodi with Direct X where angle is present becomes this used.
+     */
+    std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
     AddonInstance_Screensaver* m_instanceData;
   };
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h
index 3bdc059..efd5de2 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h
@@ -10,31 +10,162 @@
 #include "../AddonBase.h"
 #include "../Filesystem.h"
 
-#ifdef BUILD_KODI_ADDON
-#include "../IFileTypes.h"
+#if !defined(_WIN32)
+#include <sys/stat.h>
+#if !defined(__stat64)
+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD)
+#define __stat64 stat
 #else
-#include "filesystem/IFileTypes.h"
-#include "PlatformDefs.h"
+#define __stat64 stat64
+#endif
+#endif
 #endif
 
-namespace kodi { namespace addon { class CInstanceVFS; }}
-
+#ifdef __cplusplus
 extern "C"
 {
-
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_vfs_Defs
+  /// @brief **VFS add-on URL data**\n
+  /// This class is used to inform the addon of the desired wanted connection.
+  ///
+  /// Used on mostly all addon functions to identify related target.
+  ///
   struct VFSURL
   {
+    /// @brief Desired URL of the file system to be edited
+    ///
+    /// This includes all available parts of the access and is structured as
+    /// follows:
+    /// - <b>`<PROTOCOL>`://`<USERNAME>`:`<PASSWORD>``@``<HOSTNAME>`:`<PORT>`/`<FILENAME>`?`<OPTIONS>`</b>
     const char* url;
+
+    /// @brief The associated domain name, which is optional and not available
+    /// in all cases.
     const char* domain;
+
+    /// @brief This includes the network address (e.g. `192.168.0.123`) or if
+    /// the addon refers to file packages the path to it
+    /// (e.g. `/home/by_me/MyPacket.rar`).
     const char* hostname;
+
+    /// @brief With this variable the desired path to a folder or file within
+    /// the hostname is given (e.g. `storage/videos/00001.ts`).
     const char* filename;
+
+    /// @brief [Networking port](https://en.wikipedia.org/wiki/Port_(computer_networking))
+    /// to use for protocol.
     unsigned int port;
+
+    /// @brief Special options on opened URL, this can e.g. on RAR packages
+    /// <b>`?flags=8&nextvalue=123`</b> to inform about to not cache a read.
+    ///
+    /// Available options from Kodi:
+    /// | Value:    | Description:
+    /// |-----------|-------------------
+    /// | flags=8   | Used on RAR packages so that no data is cached from the requested source.
+    /// | cache=no  | Used on ZIP packages so that no data from the requested source is stored in the cache. However, this is currently not available from addons!
+    ///
+    /// In addition, other addons can use the URLs given by them to give options
+    /// that fit the respective VFS addon and allow special operations.
+    ///
+    /// @note This procedure is not yet standardized and is currently not
+    /// exactly available which are handed over.
     const char* options;
+
+    /// @brief Desired username.
     const char* username;
+
+    /// @brief Desired password.
     const char* password;
+
+    /// @brief The complete URL is passed on here, but the user name and
+    /// password are not shown and only appear to there as `USERNAME:PASSWORD`.
+    ///
+    /// As example <b>`sftp://USERNAME:PASSWORD@192.168.178.123/storage/videos/00001.ts`</b>.
     const char* redacted;
+
+    /// @brief The name which is taken as the basis by source and would be first
+    /// in folder view.
+    ///
+    /// As example on <b>`sftp://dudu:isprivate@192.168.178.123/storage/videos/00001.ts`</b>
+    /// becomes then <b>`storage`</b> used here.
     const char* sharename;
+
+    /// @brief Protocol name used on this stream, e.g. <b>`sftp`</b>.
+    const char* protocol;
   };
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_vfs_Defs
+  /// @brief <b>In/out value which is queried at @ref kodi::addon::CInstanceVFS::IoControl.</b>\n
+  /// This declares the requested value on the addon, this gets or has to
+  /// transfer data depending on the value.
+  enum VFS_IOCTRL
+  {
+    /// @brief For cases where not supported control becomes asked.
+    ///
+    /// @note Should normally not given to addon.
+    VFS_IOCTRL_INVALID = 0,
+
+    /// @brief @ref VFS_IOCTRL_NATIVE_DATA structure, containing what should be
+    /// passed to native ioctrl.
+    VFS_IOCTRL_NATIVE = 1,
+
+    /// @brief To check seek is possible.
+    ///
+    //// Return 0 if known not to work, 1 if it should work on related calls.
+    VFS_IOCTRL_SEEK_POSSIBLE = 2,
+
+    /// @brief @ref VFS_IOCTRL_CACHE_STATUS_DATA structure structure on related call
+    VFS_IOCTRL_CACHE_STATUS = 3,
+
+    /// @brief Unsigned int with speed limit for caching in bytes per second
+    VFS_IOCTRL_CACHE_SETRATE = 4,
+
+    /// @brief Enable/disable retry within the protocol handler (if supported)
+    VFS_IOCTRL_SET_RETRY = 16,
+  };
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_vfs_Defs
+  /// @brief <b>Structure used in @ref kodi::addon::CInstanceVFS::IoControl
+  /// if question value for @ref VFS_IOCTRL_NATIVE is set</b>\n
+  /// With this structure, data is transmitted to the Kodi addon.
+  ///
+  /// This corresponds to POSIX systems with regard to [ioctl](https://en.wikipedia.org/wiki/Ioctl)
+  /// data (emulated with Windows).
+  struct VFS_IOCTRL_NATIVE_DATA
+  {
+    unsigned long int request;
+    void* param;
+  };
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_vfs_Defs
+  /// @brief <b>Structure used in @ref kodi::addon::CInstanceVFS::IoControl
+  /// if question value for @ref VFS_IOCTRL_CACHE_STATUS is set</b>\n
+  /// This data is filled by the addon and returned to Kodi
+  struct VFS_IOCTRL_CACHE_STATUS_DATA
+  {
+    /// @brief Number of bytes cached forward of current position.
+    uint64_t forward;
+
+    /// @brief Maximum number of bytes per second cache is allowed to fill.
+    unsigned int maxrate;
+
+    /// @brief Average read rate from source file since last position change.
+    unsigned int currate;
+
+    /// @brief Cache low speed condition detected?
+    bool lowspeed;
+  };
+  //----------------------------------------------------------------------------
 
   typedef struct VFSGetDirectoryCallbacks /* internal */
   {
@@ -57,555 +188,1078 @@ extern "C"
   struct AddonInstance_VFSEntry;
   typedef struct KodiToAddonFuncTable_VFSEntry /* internal */
   {
-    kodi::addon::CInstanceVFS* addonInstance;
-
-    void* (__cdecl* open) (const AddonInstance_VFSEntry* instance, const VFSURL* url);
-    void* (__cdecl* open_for_write) (const AddonInstance_VFSEntry* instance, const VFSURL* url, bool overwrite);
-    ssize_t (__cdecl* read) (const AddonInstance_VFSEntry* instance, void* context, void* buffer, size_t buf_size);
-    ssize_t (__cdecl* write) (const AddonInstance_VFSEntry* instance, void* context, const void* buffer, size_t buf_size);
-    int64_t (__cdecl* seek) (const AddonInstance_VFSEntry* instance, void* context, int64_t position, int whence);
-    int (__cdecl* truncate) (const AddonInstance_VFSEntry* instance, void* context, int64_t size);
-    int64_t (__cdecl* get_length) (const AddonInstance_VFSEntry* instance, void* context);
-    int64_t (__cdecl* get_position) (const AddonInstance_VFSEntry* instance, void* context);
-    int (__cdecl* get_chunk_size) (const AddonInstance_VFSEntry* instance, void* context);
-    int (__cdecl* io_control) (const AddonInstance_VFSEntry* instance, void* context, XFILE::EIoControl request, void* param);
-    int (__cdecl* stat) (const AddonInstance_VFSEntry* instance, const VFSURL* url, struct __stat64* buffer);
-    bool (__cdecl* close) (const AddonInstance_VFSEntry* instance, void* context);
-    bool (__cdecl* exists) (const AddonInstance_VFSEntry* instance, const VFSURL* url);
-    void (__cdecl* clear_out_idle) (const AddonInstance_VFSEntry* instance);
-    void (__cdecl* disconnect_all) (const AddonInstance_VFSEntry* instance);
-    bool (__cdecl* delete_it) (const AddonInstance_VFSEntry* instance, const VFSURL* url);
-    bool (__cdecl* rename) (const AddonInstance_VFSEntry* instance, const VFSURL* url, const VFSURL* url2);
-    bool (__cdecl* directory_exists) (const AddonInstance_VFSEntry* instance, const VFSURL* url);
-    bool (__cdecl* remove_directory) (const AddonInstance_VFSEntry* instance, const VFSURL* url);
-    bool (__cdecl* create_directory) (const AddonInstance_VFSEntry* instance, const VFSURL* url);
-    bool (__cdecl* get_directory) (const AddonInstance_VFSEntry* instance,
-                                  const VFSURL* url,
-                                  VFSDirEntry** entries,
+    KODI_HANDLE addonInstance;
+
+    void*(__cdecl* open)(const struct AddonInstance_VFSEntry* instance, const struct VFSURL* url);
+    void*(__cdecl* open_for_write)(const struct AddonInstance_VFSEntry* instance,
+                                   const struct VFSURL* url,
+                                   bool overwrite);
+    ssize_t(__cdecl* read)(const struct AddonInstance_VFSEntry* instance,
+                           void* context,
+                           void* buffer,
+                           size_t buf_size);
+    ssize_t(__cdecl* write)(const struct AddonInstance_VFSEntry* instance,
+                            void* context,
+                            const void* buffer,
+                            size_t buf_size);
+    int64_t(__cdecl* seek)(const struct AddonInstance_VFSEntry* instance,
+                           void* context,
+                           int64_t position,
+                           int whence);
+    int(__cdecl* truncate)(const struct AddonInstance_VFSEntry* instance,
+                           void* context,
+                           int64_t size);
+    int64_t(__cdecl* get_length)(const struct AddonInstance_VFSEntry* instance, void* context);
+    int64_t(__cdecl* get_position)(const struct AddonInstance_VFSEntry* instance, void* context);
+    int(__cdecl* get_chunk_size)(const struct AddonInstance_VFSEntry* instance, void* context);
+    int(__cdecl* io_control)(const struct AddonInstance_VFSEntry* instance,
+                             void* context,
+                             enum VFS_IOCTRL request,
+                             void* param);
+    int(__cdecl* stat)(const struct AddonInstance_VFSEntry* instance,
+                       const struct VFSURL* url,
+                       struct __stat64* buffer);
+    bool(__cdecl* close)(const struct AddonInstance_VFSEntry* instance, void* context);
+    bool(__cdecl* exists)(const struct AddonInstance_VFSEntry* instance, const struct VFSURL* url);
+    void(__cdecl* clear_out_idle)(const struct AddonInstance_VFSEntry* instance);
+    void(__cdecl* disconnect_all)(const struct AddonInstance_VFSEntry* instance);
+    bool(__cdecl* delete_it)(const struct AddonInstance_VFSEntry* instance,
+                             const struct VFSURL* url);
+    bool(__cdecl* rename)(const struct AddonInstance_VFSEntry* instance,
+                          const struct VFSURL* url,
+                          const struct VFSURL* url2);
+    bool(__cdecl* directory_exists)(const struct AddonInstance_VFSEntry* instance,
+                                    const struct VFSURL* url);
+    bool(__cdecl* remove_directory)(const struct AddonInstance_VFSEntry* instance,
+                                    const struct VFSURL* url);
+    bool(__cdecl* create_directory)(const struct AddonInstance_VFSEntry* instance,
+                                    const struct VFSURL* url);
+    bool(__cdecl* get_directory)(const struct AddonInstance_VFSEntry* instance,
+                                 const struct VFSURL* url,
+                                 struct VFSDirEntry** entries,
+                                 int* num_entries,
+                                 VFSGetDirectoryCallbacks* callbacks);
+    bool(__cdecl* contains_files)(const struct AddonInstance_VFSEntry* instance,
+                                  const struct VFSURL* url,
+                                  struct VFSDirEntry** entries,
                                   int* num_entries,
-                                  VFSGetDirectoryCallbacks* callbacks);
-    bool (__cdecl* contains_files) (const AddonInstance_VFSEntry* instance,
-                                   const VFSURL* url,
-                                   VFSDirEntry** entries,
-                                   int* num_entries,
-                                   char* rootpath);
-    void (__cdecl* free_directory) (const AddonInstance_VFSEntry* instance, VFSDirEntry* entries, int num_entries);
+                                  char* rootpath);
+    void(__cdecl* free_directory)(const struct AddonInstance_VFSEntry* instance,
+                                  struct VFSDirEntry* entries,
+                                  int num_entries);
   } KodiToAddonFuncTable_VFSEntry;
 
   typedef struct AddonInstance_VFSEntry /* internal */
   {
-    AddonProps_VFSEntry props;
-    AddonToKodiFuncTable_VFSEntry toKodi;
-    KodiToAddonFuncTable_VFSEntry toAddon;
+    AddonProps_VFSEntry* props;
+    AddonToKodiFuncTable_VFSEntry* toKodi;
+    KodiToAddonFuncTable_VFSEntry* toAddon;
   } AddonInstance_VFSEntry;
 
+#ifdef __cplusplus
 } /* extern "C" */
 
 namespace kodi
 {
 namespace addon
 {
-  class CInstanceVFS : public IAddonInstance
+
+//##############################################################################
+/// @defgroup cpp_kodi_addon_vfs_Defs Definitions, structures and enumerators
+/// \ingroup cpp_kodi_addon_vfs
+/// @brief **VFS add-on general variables**
+///
+/// Used to exchange the available options between Kodi and addon.
+///
+///
+
+//==============================================================================
+///
+/// \addtogroup cpp_kodi_addon_vfs
+/// @brief \cpp_class{ kodi::addon::CInstanceVFS }
+/// **Virtual Filesystem (VFS) add-on instance**
+///
+/// This instance type is used to allow Kodi various additional file system
+/// types. Be it a special file system, a compressed package or a system
+/// available over the network, everything is possible with it.
+///
+/// This usage can be requested under various conditions, for example explicitly
+/// by another addon, by a Mimetype protocol defined in <b>`addon.xml`</b> or supported
+/// file extensions.
+///
+/// Include the header @ref VFS.h "#include <kodi/addon-instance/VFS.h>"
+/// to use this class.
+///
+/// ----------------------------------------------------------------------------
+///
+/// Here is an example of what the <b>`addon.xml.in`</b> would look like for an VFS addon:
+///
+/// ~~~~~~~~~~~~~{.xml}
+/// <?xml version="1.0" encoding="UTF-8"?>
+/// <addon
+///   id="vfs.myspecialnamefor"
+///   version="1.0.0"
+///   name="My VFS addon"
+///   provider-name="Your Name">
+///   <requires>@ADDON_DEPENDS@</requires>
+///   <extension
+///     point="kodi.vfs"
+///     protocols="myprot"
+///     extensions=".abc|.def"
+///     files="true"
+///     filedirectories="true"
+///     directories="true"
+///     encodedhostname="true"
+///     supportDialog="true"
+///     supportPath="true"
+///     supportUsername="true"
+///     supportPassword="true"
+///     supportPort="true"
+///     supportBrowsing="true"
+///     supportWrite="true"
+///     defaultPort="1234"
+///     label="30000"
+///     zeroconf="your_special_zeroconf_allowed_identifier"
+///     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
+///   <extension point="xbmc.addon.metadata">
+///     <summary lang="en_GB">My VFS addon summary</summary>
+///     <description lang="en_GB">My VFS description</description>
+///     <platform>@PLATFORM@</platform>
+///   </extension>
+/// </addon>
+/// ~~~~~~~~~~~~~
+///
+/// @note Regarding boolean values with "false", these can also be omitted,
+/// since this would be the default.
+///
+///
+/// ### Standard values that can be declared for processing in `addon.xml`.
+///
+/// These values are used by Kodi to identify associated streams and file
+/// extensions and then to select the associated addon.
+///
+/// \table_start
+///   \table_h3{ Labels, Type,   Description }
+///   \table_row3{   <b>`point`</b>,
+///                  \anchor cpp_kodi_addon_vfs_point
+///                  string,
+///     The identification of the addon instance to VFS is mandatory <b>`kodi.vfs`</b>.
+///     In addition\, the instance declared in the first <b>`<extension ... />`</b> is also the main type of addon.
+///   }
+///   \table_row3{   <b>`defaultPort`</b>,
+///                  \anchor cpp_kodi_addon_vfs_defaultPort
+///                  integer,
+///     Default [networking port](https://en.wikipedia.org/wiki/Port_(computer_networking))
+///     to use for protocol.
+///   }
+///   \table_row3{   <b>`directories`</b>,
+///                  \anchor cpp_kodi_addon_vfs_directories
+///                  boolean,
+///     VFS entry can list directories.
+///   }
+///   \table_row3{   <b>`extensions`</b>,
+///                  \anchor cpp_kodi_addon_vfs_extensions
+///                  string,
+///     Extensions for VFS entry.\n
+///     It is possible to declare several using <b>`|`</b>\, e.g. <b>`.abc|.def|.ghi`</b>.
+///   }
+///   \table_row3{   <b>`encodedhostname`</b>,
+///                  \anchor cpp_kodi_addon_vfs_encodedhostname
+///                  boolean,
+///     URL protocol from add-ons use encoded hostnames.
+///   }
+///   \table_row3{   <b>`filedirectories`</b>,
+///                  \anchor cpp_kodi_addon_vfs_filedirectories
+///                  boolean,
+///     VFS entry contains file directories.
+///   }
+///   \table_row3{   <b>`files`</b>,
+///                  \anchor cpp_kodi_addon_vfs_directories
+///                  boolean,
+///     Set to declare that VFS provides files.
+///   }
+///   \table_row3{   <b>`protocols`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocols
+///                  boolean,
+///     Protocols for VFS entry.\n
+///     It is possible to declare several using <b>`|`</b>\, e.g. <b>`myprot1|myprot2`</b>.\n
+///     @note This field also used to show on GUI\, see <b>`supportBrowsing`</b> below about <b>*2:</b>.
+///     When used there\, however\, only a **single** protocol is possible!
+///   }
+///   \table_row3{   <b>`supportWrite`</b>,
+///                  \anchor cpp_kodi_addon_vfs_supportWrite
+///                  boolean,
+///     Protocol supports write operations.
+///   }
+///   \table_row3{   <b>`zeroconf`</b>,
+///                  \anchor cpp_kodi_addon_vfs_zeroconf
+///                  string,
+///     [Zero conf](https://en.wikipedia.org/wiki/Zero-configuration_networking) announce string for VFS protocol.
+///   }
+///   \table_row3{   <b>`library_@PLATFORM@`</b>,
+///                  \anchor cpp_kodi_addon_vfs_library
+///                  string,
+///     The runtime library used for the addon. This is usually declared by `cmake` and correctly displayed in the translated <b>`addon.xml`</b>.
+///   }
+/// \table_end
+///
+///
+/// ### User selectable parts of the addon.
+///
+/// The following table describes the values that can be defined by <b>`addon.xml`</b>
+/// and which part they relate to for user input.
+///
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`supportBrowsing`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocol_supportBrowsing
+///                  boolean,
+///     Protocol supports server browsing. Used to open related sources by users in the window.\n\n
+///     | Associated places in Kodi: |
+///     | :---- |
+///     | \image html cpp_kodi_addon_vfs_protocol_1.png |
+///     <br>
+///     <b>*1:</b> The entry in the menu represented by this option corresponds to the text given with <b>`label`</b>.
+///     When the button is pressed\, @ref CInstanceVFS::GetDirectory is called on the add-on to get its content.\n
+///     <b>*2:</b> Protocol name of the stream defined with <b>`protocols`</b> in xml.\n
+///     @remark See also <b>`supportDialog`</b> about <b>*3:</b>.
+///   }
+///   \table_row3{   <b>`supportDialog`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocol_supportDialog
+///                  boolean,
+///     To point out that Kodi assigns a dialog to this VFS in order to compare it with other values e.g. query supportPassword in it.\n
+///     This will be available when adding sources in Kodi under <b>"Add network location..."</b>.\n\n
+///     | Associated places in Kodi: |
+///     | :---- |
+///     | \image html cpp_kodi_addon_vfs_protocol_2.png |
+///     <br>
+///     <b>*1:</b> Field for selecting the VFS handler\, the addon will be available if <b>`supportDialog`</b> is set to <b>`true`</b>.\n
+///     <b>*2:</b> To set the associated server address. **Note:** *This field is always activated and cannot be changed by the addon.*\n
+///     <b>*3:</b> If <b>`supportBrowsing`</b> is set to <b>`true`</b>\, the button for opening a file selection dialog is given here too\, as in the file window.\n
+///     <b>*4:</b> This field is available if <b>`supportPath`</b> is set to <b>`true`</b>.\n
+///     <b>*5:</b> To edit the connection port. This field is available if <b>`supportPort`</b> is set to <b>`true`</b>.\n
+///     <b>*6:</b> This sets the required username and is available when <b>`supportUsername`</b> is set to <b>`true`</b>.\n
+///     <b>*7:</b> This sets the required password and is available when <b>`supportPassword`</b> is set to <b>`true`</b>.
+///   }
+///   \table_row3{   <b>`supportPath`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocol_supportPath
+///                  boolean,
+///     Protocol has path in addition to server name (see <b>`supportDialog`</b> about <b>*4:</b>).
+///   }
+///   \table_row3{   <b>`supportPort`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocol_supportPort
+///                  boolean,
+///     Protocol supports port customization (see <b>`supportDialog`</b> about <b>*5:</b>).
+///   }
+///   \table_row3{   <b>`supportUsername`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocol_supportUsername
+///                  boolean,
+///     Protocol uses logins (see <b>`supportDialog`</b> about <b>*6:</b>).
+///   }
+///   \table_row3{   <b>`supportPassword`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocol_supportPassword
+///                  boolean,
+///     Protocol supports passwords (see <b>`supportDialog`</b> about <b>*7:</b>).
+///   }
+///   \table_row3{   <b>`protocols`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocol_protocols
+///                  string,
+///     Protocols for VFS entry.
+///     @note This field is not editable and only used on GUI to show his name\, see <b>`supportBrowsing`</b> about <b>*2:</b>
+///   }
+///   \table_row3{   <b>`label`</b>,
+///                  \anchor cpp_kodi_addon_vfs_protocol_label
+///                  integer,
+///     The text identification number used in Kodi for display in the menu at <b>`supportDialog`</b>
+///     as a selection option and at <b>`supportBrowsing`</b> (see his image reference <b>*1</b>) as a menu entry.\n
+///     This can be a text identifier in Kodi or from addon.\n
+///     @remark For addon within <b>30000</b>-<b>30999</b> or <b>32000</b>-<b>32999</b>.
+///   }
+/// \table_end
+///
+/// @remark For more detailed description of the <b>`addon.xml`</b>, see also https://kodi.wiki/view/Addon.xml.
+///
+///
+/// --------------------------------------------------------------------------
+///
+///
+/// **Example:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/addon-instance/VFS.h>
+///
+/// class CMyVFS : public kodi::addon::CInstanceVFS
+/// {
+/// public:
+///   CMyVFS(KODI_HANDLE instance, const std::string& kodiVersion);
+///
+///   // Add all your required functions, the most CInstanceVFS functions of
+///   // must be included to have addon working correctly.
+///   ...
+/// };
+///
+/// CMyVFS::CMyVFS(KODI_HANDLE instance, const std::string& kodiVersion)
+///   : CInstanceVFS(instance, kodiVersion)
+/// {
+///   ...
+/// }
+///
+/// ...
+///
+/// /*----------------------------------------------------------------------*/
+///
+/// class CMyAddon : public kodi::addon::CAddonBase
+/// {
+/// public:
+///   CMyAddon() { }
+///   ADDON_STATUS CreateInstance(int instanceType,
+///                               const std::string& instanceID,
+///                               KODI_HANDLE instance,
+///                               const std::string& version,
+///                               KODI_HANDLE& addonInstance) override;
+/// };
+///
+/// // If you use only one instance in your add-on, can be instanceType and
+/// // instanceID ignored
+/// ADDON_STATUS CMyAddon::CreateInstance(int instanceType,
+///                                       const std::string& instanceID,
+///                                       KODI_HANDLE instance,
+///                                       const std::string& version,
+///                                       KODI_HANDLE& addonInstance)
+/// {
+///   if (instanceType == ADDON_INSTANCE_VFS)
+///   {
+///     kodi::Log(ADDON_LOG_NOTICE, "Creating my VFS instance");
+///     addonInstance = new CMyVFS(instance, version);
+///     return ADDON_STATUS_OK;
+///   }
+///   else if (...)
+///   {
+///     ...
+///   }
+///   return ADDON_STATUS_UNKNOWN;
+/// }
+///
+/// ADDONCREATOR(CMyAddon)
+/// ~~~~~~~~~~~~~
+///
+/// The destruction of the example class `CMyVFS` is called from
+/// Kodi's header. Manually deleting the add-on instance is not required.
+///
+//----------------------------------------------------------------------------
+class ATTRIBUTE_HIDDEN CInstanceVFS : public IAddonInstance
+{
+public:
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs
+  /// @brief VFS class constructor used to support multiple instance
+  /// types
+  ///
+  /// @param[in] instance               The instance value given to
+  ///                                   <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+  /// @param[in] kodiVersion            [opt] given from Kodi by @ref CAddonBase::CreateInstance
+  ///                                   to identify his instance API version
+  ///
+  /// @note Instance path as a single is not supported by this type. It must
+  /// ensure that it can be called up several times.
+  ///
+  /// @warning Only use `instance` from the @ref CAddonBase::CreateInstance or
+  /// @ref CAddonBase::CreateInstance call.
+  ///
+  explicit CInstanceVFS(KODI_HANDLE instance, const std::string& kodiVersion = "")
+    : IAddonInstance(ADDON_INSTANCE_VFS,
+                     !kodiVersion.empty() ? kodiVersion : GetKodiTypeVersion(ADDON_INSTANCE_VFS))
+  {
+    if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+      throw std::logic_error("kodi::addon::CInstanceVFS: Creation of multiple together with single "
+                             "instance way is not allowed!");
+
+    SetAddonStruct(instance);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs
+  /// @brief Destructor
+  ///
+  ~CInstanceVFS() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_vfs_general 1. General access functions
+  /// @ingroup cpp_kodi_addon_vfs
+  /// @brief **General access functions**
+  ///
+  /// This functions which are intended for getting folders, editing storage
+  /// locations and file system queries.
+  ///
+
+  //==========================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_vfs_filecontrol 2. File editing functions
+  /// @ingroup cpp_kodi_addon_vfs
+  /// @brief **File editing functions.**
+  ///
+  /// This value represents the addon-side handlers and to be able to identify
+  /// his own parts in the event of further access.
+  ///
+
+  //@{
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Open a file for input
+  ///
+  /// @param[in] url The URL of the file
+  /// @return Context for the opened file
+  virtual void* Open(const VFSURL& url) { return nullptr; }
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Open a file for output
+  ///
+  /// @param[in] url The URL of the file
+  /// @param[in] overWrite Whether or not to overwrite an existing file
+  /// @return Context for the opened file
+  ///
+  virtual void* OpenForWrite(const VFSURL& url, bool overWrite) { return nullptr; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Close a file
+  ///
+  /// @param[in] context The context of the file
+  /// @return True on success, false on failure
+  ///
+  virtual bool Close(void* context) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Read from a file
+  ///
+  /// @param[in] context The context of the file
+  /// @param[out] buffer The buffer to read data into
+  /// @param[in] uiBufSize Number of bytes to read
+  /// @return Number of bytes read
+  ///
+  virtual ssize_t Read(void* context, void* buffer, size_t uiBufSize) { return -1; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Write to a file
+  ///
+  /// @param[in] context The context of the file
+  /// @param[in] buffer The buffer to read data from
+  /// @param[in] uiBufSize Number of bytes to write
+  /// @return Number of bytes written
+  ///
+  virtual ssize_t Write(void* context, const void* buffer, size_t uiBufSize) { return -1; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Seek in a file
+  ///
+  /// @param[in] context The context of the file
+  /// @param[in] position The position to seek to
+  /// @param[in] whence Position in file 'position' is relative to (SEEK_CUR, SEEK_SET, SEEK_END)
+  /// @return Offset in file after seek
+  ///
+  virtual int64_t Seek(void* context, int64_t position, int whence) { return -1; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Truncate a file
+  ///
+  /// @param[in] context The context of the file
+  /// @param[in] size The size to truncate the file to
+  /// @return 0 on success, -1 on error
+  ///
+  virtual int Truncate(void* context, int64_t size) { return -1; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Get total size of a file
+  ///
+  /// @param[in] context The context of the file
+  /// @return Total file size
+  ///
+  virtual int64_t GetLength(void* context) { return 0; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Get current position in a file
+  ///
+  /// @param[in] context The context of the file
+  /// @return Current position
+  ///
+  virtual int64_t GetPosition(void* context) { return 0; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Get chunk size of a file
+  ///
+  /// @param[in] context The context of the file
+  /// @return Chunk size
+  ///
+  virtual int GetChunkSize(void* context) { return 1; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_filecontrol
+  /// @brief Perform an IO-control on the file
+  ///
+  /// @param[in] context The context of the file
+  /// @param[in] request The requested IO-control
+  /// @param[in] param Parameter attached to the IO-control
+  /// @return -1 on error, >= 0 on success
+  ///
+  virtual int IoControl(void* context, VFS_IOCTRL request, void* param) { return -1; }
+  //--------------------------------------------------------------------------
+  //@}
+
+  //@{
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Stat a file
+  ///
+  /// @param[in] url The URL of the file
+  /// @param[in] buffer The buffer to store results in
+  /// @return -1 on error, 0 otherwise
+  ///
+  virtual int Stat(const VFSURL& url, struct __stat64* buffer) { return 0; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Check for file existence
+  ///
+  /// @param[in] url The URL of the file
+  /// @return True if file exists, false otherwise
+  ///
+  virtual bool Exists(const VFSURL& url) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Clear out any idle connections
+  ///
+  virtual void ClearOutIdle() {}
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Disconnect all connections
+  ///
+  virtual void DisconnectAll() {}
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Delete a file
+  ///
+  /// @param[in] url The URL of the file
+  /// @return True if deletion was successful, false otherwise
+  ///
+  virtual bool Delete(const VFSURL& url) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Rename a file
+  ///
+  /// @param[in] url The URL of the source file
+  /// @param[in] url2 The URL of the destination file
+  /// @return True if deletion was successful, false otherwise
+  ///
+  virtual bool Rename(const VFSURL& url, const VFSURL& url2) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Check for directory existence
+  ///
+  /// @param[in] url The URL of the file
+  /// @return True if directory exists, false otherwise
+  ///
+  virtual bool DirectoryExists(const VFSURL& url) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Remove a directory
+  ///
+  /// @param[in] url The URL of the directory
+  /// @return True if removal was successful, false otherwise
+  ///
+  virtual bool RemoveDirectory(const VFSURL& url) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Create a directory
+  ///
+  /// @param[in] url The URL of the file
+  /// @return True if creation was successful, false otherwise
+  ///
+  virtual bool CreateDirectory(const VFSURL& url) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @defgroup cpp_kodi_addon_vfs_general_cb_GetDirectory **Callbacks GetDirectory()**
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Callback functions on GetDirectory()
+  ///
+  /// This functions becomes available during call of GetDirectory() from
+  /// Kodi.
+  ///
+  /// If GetDirectory() returns false becomes the parts from here used on
+  /// next call of the function.
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  ///
+  /// #include <kodi/addon-instance/VFS.h>
+  ///
+  /// ...
+  ///
+  /// bool CMyVFS::GetDirectory(const VFSURL& url, std::vector<kodi::vfs::CDirEntry>& items, CVFSCallbacks callbacks)
+  /// {
+  ///   std::string neededString;
+  ///   callbacks.GetKeyboardInput("Test", neededString, true);
+  ///   if (neededString.empty())
+  ///     return false;
+  ///
+  ///   // Do the work
+  ///   ...
+  ///   return true;
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  class CVFSCallbacks
   {
   public:
-    explicit CInstanceVFS(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_VFS)
-    {
-      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
-        throw std::logic_error("kodi::addon::CInstanceVFS: Creation of multiple together with single instance way is not allowed!");
-
-      SetAddonStruct(instance);
-    }
-
-    ~CInstanceVFS() override = default;
-
-    /// @brief Open a file for input
-    ///
-    /// @param[in] url The URL of the file
-    /// @return Context for the opened file
-    virtual void* Open(const VFSURL& url) { return nullptr; }
-
-    /// @brief Open a file for output
-    ///
-    /// @param[in] url The URL of the file
-    /// @param[in] overWrite Whether or not to overwrite an existing file
-    /// @return Context for the opened file
-    ///
-    virtual void* OpenForWrite(const VFSURL& url, bool overWrite) { return nullptr; }
-
-    /// @brief Read from a file
-    ///
-    /// @param[in] context The context of the file
-    /// @param[out] buffer The buffer to read data into
-    /// @param[in] uiBufSize Number of bytes to read
-    /// @return Number of bytes read
-    ///
-    virtual ssize_t Read(void* context, void* buffer, size_t uiBufSize) { return -1; }
-
-    /// @brief Write to a file
-    ///
-    /// @param[in] context The context of the file
-    /// @param[in] buffer The buffer to read data from
-    /// @param[in] uiBufSize Number of bytes to write
-    /// @return Number of bytes written
-    ///
-    virtual ssize_t Write(void* context, const void* buffer, size_t uiBufSize) { return -1; }
-
-    /// @brief Seek in a file
-    ///
-    /// @param[in] context The context of the file
-    /// @param[in] position The position to seek to
-    /// @param[in] whence Position in file 'position' is relative to (SEEK_CUR, SEEK_SET, SEEK_END)
-    /// @return Offset in file after seek
-    ///
-    virtual int64_t Seek(void* context, int64_t position, int whence) { return -1; }
-
-    /// @brief Truncate a file
-    ///
-    /// @param[in] context The context of the file
-    /// @param[in] size The size to truncate the file to
-    /// @return 0 on success, -1 on error
-    ///
-    virtual int Truncate(void* context, int64_t size) { return -1; }
-
-    /// @brief Get total size of a file
-    ///
-    /// @param[in] context The context of the file
-    /// @return Total file size
-    ///
-    virtual int64_t GetLength(void* context) { return 0; }
-
-    /// @brief Get current position in a file
-    ///
-    /// @param[in] context The context of the file
-    /// @return Current position
-    ///
-    virtual int64_t GetPosition(void* context) { return 0; }
-
-    /// @brief Get chunk size of a file
-    ///
-    /// @param[in] context The context of the file
-    /// @return Chunk size
-    ///
-    virtual int GetChunkSize(void* context) { return 1; }
-
-    /// @brief Perform an IO-control on the file
-    ///
-    /// @param[in] context The context of the file
-    /// @param[in] request The requested IO-control
-    /// @param[in] param Parameter attached to the IO-control
-    /// @return -1 on error, >= 0 on success
-    ///
-    virtual int IoControl(void* context, XFILE::EIoControl request, void* param) { return -1; }
-
-    /// @brief Close a file
-    ///
-    /// @param[in] context The context of the file
-    /// @return True on success, false on failure
-    ///
-    virtual bool Close(void* context) { return false; }
-
-    /// @brief Stat a file
-    ///
-    /// @param[in] url The URL of the file
-    /// @param[in] buffer The buffer to store results in
-    /// @return -1 on error, 0 otherwise
-    ///
-    virtual int Stat(const VFSURL& url, struct __stat64* buffer) { return 0; }
-
-    /// @brief Check for file existence
-    ///
-    /// @param[in] url The URL of the file
-    /// @return True if file exists, false otherwise
-    ///
-    virtual bool Exists(const VFSURL& url) { return false; }
-
-    /// @brief Clear out any idle connections
-    ///
-    virtual void ClearOutIdle() { }
-
-    /// @brief Disconnect all connections
-    ///
-    virtual void DisconnectAll() { }
-
-    /// @brief Delete a file
-    ///
-    /// @param[in] url The URL of the file
-    /// @return True if deletion was successful, false otherwise
-    ///
-    virtual bool Delete(const VFSURL& url) { return false; }
-
-    /// @brief Rename a file
-    ///
-    /// @param[in] url The URL of the source file
-    /// @param[in] url2 The URL of the destination file
-    /// @return True if deletion was successful, false otherwise
-    ///
-    virtual bool Rename(const VFSURL& url, const VFSURL& url2) { return false; }
-
-    /// @brief Check for directory existence
-    ///
-    /// @param[in] url The URL of the file
-    /// @return True if directory exists, false otherwise
-    ///
-    virtual bool DirectoryExists(const VFSURL& url) { return false; }
-
-    /// @brief Remove a directory
-    ///
-    /// @param[in] url The URL of the directory
-    /// @return True if removal was successful, false otherwise
-    ///
-    virtual bool RemoveDirectory(const VFSURL& url) { return false; }
-
-    /// @brief Create a directory
-    ///
-    /// @param[in] url The URL of the file
-    /// @return True if creation was successful, false otherwise
-    ///
-    virtual bool CreateDirectory(const VFSURL& url) { return false; }
-
-    /// @brief Callback functions on GetDirectory()
-    ///
-    /// This functions becomes available during call of GetDirectory() from
-    /// Kodi.
-    ///
-    /// If GetDirectory() returns false becomes the parts from here used on
-    /// next call of the function.
-    ///
-    /// **Example:**
-    /// ~~~~~~~~~~~~~{.cpp}
+    /// @ingroup cpp_kodi_addon_vfs_general_cb_GetDirectory
+    /// @brief Require keyboard input
     ///
-    /// #include <kodi/addon-instance/VFS.h>
+    /// Becomes called if GetDirectory() returns false and GetDirectory()
+    /// becomes after entry called again.
     ///
-    /// ...
+    /// @param[in] heading      The heading of the keyboard dialog
+    /// @param[out] input       The resulting string. Returns string after
+    ///                         second call!
+    /// @param[in] hiddenInput  To show input only as "*" on dialog
+    /// @return                 True if input was received, false otherwise
     ///
-    /// bool CMyFile::GetDirectory(const VFSURL& url, std::vector<kodi::vfs::CDirEntry>& items, CVFSCallbacks callbacks)
-    /// {
-    ///   std::string neededString;
-    ///   callbacks.GetKeyboardInput("Test", neededString, true);
-    ///   if (neededString.empty())
-    ///     return false;
-    ///
-    ///   /* Do the work */
-    ///   ...
-    ///   return true;
-    /// }
-    /// ~~~~~~~~~~~~~
-    ///
-    //@{
-    class CVFSCallbacks
+    bool GetKeyboardInput(const std::string& heading, std::string& input, bool hiddenInput = false)
     {
-    public:
-      /// @brief Require keyboard input
-      ///
-      /// Becomes called if GetDirectory() returns false and GetDirectory()
-      /// becomes after entry called again.
-      ///
-      /// @param[in] heading      The heading of the keyboard dialog
-      /// @param[out] input       The resulting string. Returns string after
-      ///                         second call!
-      /// @param[in] hiddenInput  To show input only as "*" on dialog
-      /// @return                 True if input was received, false otherwise
-      ///
-      bool GetKeyboardInput(const std::string& heading, std::string& input, bool hiddenInput = false)
-      {
-        char* cInput = nullptr;
-        bool ret = m_cb->get_keyboard_input(m_cb->ctx, heading.c_str(), &cInput, hiddenInput);
-        if (cInput)
-        {
-          input = cInput;
-          ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, cInput);
-        }
-        return ret;
-      }
-
-      /// @brief Display an error dialog
-      ///
-      /// @param[in] heading      The heading of the error dialog
-      /// @param[in] line1        The first line of the error dialog
-      /// @param[in] line2        [opt] The second line of the error dialog
-      /// @param[in] line3        [opt] The third line of the error dialog
-      ///
-      void SetErrorDialog(const std::string& heading, const std::string& line1, const std::string& line2 = "", const std::string& line3 = "")
-      {
-        m_cb->set_error_dialog(m_cb->ctx, heading.c_str(), line1.c_str(), line2.c_str(), line3.c_str());
-      }
-
-      /// @brief Prompt the user for authentication of a URL
-      ///
-      /// @param[in] url The URL
-      void RequireAuthentication(const std::string& url)
+      char* cInput = nullptr;
+      bool ret = m_cb->get_keyboard_input(m_cb->ctx, heading.c_str(), &cInput, hiddenInput);
+      if (cInput)
       {
-        m_cb->require_authentication(m_cb->ctx, url.c_str());
+        input = cInput;
+        ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(
+            ::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, cInput);
       }
+      return ret;
+    }
 
-      explicit CVFSCallbacks(const VFSGetDirectoryCallbacks* cb) : m_cb(cb) { }
-
-    private:
-      const VFSGetDirectoryCallbacks* m_cb;
-    };
-    //@}
-
-    /// @brief List a directory
-    ///
-    /// @param[in] url The URL of the directory
-    /// @param[out] entries The entries in the directory
-    /// @param[in] callbacks A callback structure
-    /// @return Context for the directory listing
-    ///
-    virtual bool GetDirectory(const VFSURL& url,
-                              std::vector<kodi::vfs::CDirEntry>& entries,
-                              CVFSCallbacks callbacks) { return false; }
-
-    /// @brief Check if file should be presented as a directory (multiple streams)
+    /// @ingroup cpp_kodi_addon_vfs_general_cb_GetDirectory
+    /// @brief Display an error dialog
     ///
-    /// @param[in] url The URL of the file
-    /// @param[out] entries The entries in the directory
-    /// @param[out] rootPath Path to root directory if multiple entries
-    /// @return Context for the directory listing
+    /// @param[in] heading      The heading of the error dialog
+    /// @param[in] line1        The first line of the error dialog
+    /// @param[in] line2        [opt] The second line of the error dialog
+    /// @param[in] line3        [opt] The third line of the error dialog
     ///
-    virtual bool ContainsFiles(const VFSURL& url,
-                               std::vector<kodi::vfs::CDirEntry>& entries,
-                               std::string& rootPath) { return false; }
-
-  private:
-    void SetAddonStruct(KODI_HANDLE instance)
-    {
-      if (instance == nullptr)
-        throw std::logic_error("kodi::addon::CInstanceVFS: Creation with empty addon structure not allowed, table must be given from Kodi!");
-
-      m_instanceData = static_cast<AddonInstance_VFSEntry*>(instance);
-      m_instanceData->toAddon.addonInstance = this;
-      m_instanceData->toAddon.open = ADDON_Open;
-      m_instanceData->toAddon.open_for_write = ADDON_OpenForWrite;
-      m_instanceData->toAddon.read = ADDON_Read;
-      m_instanceData->toAddon.write = ADDON_Write;
-      m_instanceData->toAddon.seek = ADDON_Seek;
-      m_instanceData->toAddon.truncate = ADDON_Truncate;
-      m_instanceData->toAddon.get_length = ADDON_GetLength;
-      m_instanceData->toAddon.get_position = ADDON_GetPosition;
-      m_instanceData->toAddon.get_chunk_size = ADDON_GetChunkSize;
-      m_instanceData->toAddon.io_control = ADDON_IoControl;
-      m_instanceData->toAddon.stat = ADDON_Stat;
-      m_instanceData->toAddon.close = ADDON_Close;
-      m_instanceData->toAddon.exists = ADDON_Exists;
-      m_instanceData->toAddon.clear_out_idle = ADDON_ClearOutIdle;
-      m_instanceData->toAddon.disconnect_all = ADDON_DisconnectAll;
-      m_instanceData->toAddon.delete_it = ADDON_Delete;
-      m_instanceData->toAddon.rename = ADDON_Rename;
-      m_instanceData->toAddon.directory_exists = ADDON_DirectoryExists;
-      m_instanceData->toAddon.remove_directory = ADDON_RemoveDirectory;
-      m_instanceData->toAddon.create_directory = ADDON_CreateDirectory;
-      m_instanceData->toAddon.get_directory = ADDON_GetDirectory;
-      m_instanceData->toAddon.free_directory = ADDON_FreeDirectory;
-      m_instanceData->toAddon.contains_files = ADDON_ContainsFiles;
-    }
-
-    inline static void* ADDON_Open(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+    void SetErrorDialog(const std::string& heading,
+                        const std::string& line1,
+                        const std::string& line2 = "",
+                        const std::string& line3 = "")
     {
-      return instance->toAddon.addonInstance->Open(*url);
+      m_cb->set_error_dialog(m_cb->ctx, heading.c_str(), line1.c_str(), line2.c_str(),
+                             line3.c_str());
     }
 
-    inline static void* ADDON_OpenForWrite(const AddonInstance_VFSEntry* instance, const VFSURL* url, bool overWrite)
+    /// @ingroup cpp_kodi_addon_vfs_general_cb_GetDirectory
+    /// @brief Prompt the user for authentication of a URL
+    ///
+    /// @param[in] url The URL
+    void RequireAuthentication(const std::string& url)
     {
-      return instance->toAddon.addonInstance->OpenForWrite(*url, overWrite);
+      m_cb->require_authentication(m_cb->ctx, url.c_str());
     }
 
-    inline static ssize_t ADDON_Read(const AddonInstance_VFSEntry* instance, void* context, void* buffer, size_t uiBufSize)
-    {
-      return instance->toAddon.addonInstance->Read(context, buffer, uiBufSize);
-    }
+    explicit CVFSCallbacks(const VFSGetDirectoryCallbacks* cb) : m_cb(cb) {}
 
-    inline static ssize_t ADDON_Write(const AddonInstance_VFSEntry* instance, void* context, const void* buffer, size_t uiBufSize)
-    {
-      return instance->toAddon.addonInstance->Write(context, buffer, uiBufSize);
-    }
+  private:
+    const VFSGetDirectoryCallbacks* m_cb;
+  };
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief List a directory
+  ///
+  /// @param[in] url The URL of the directory
+  /// @param[out] entries The entries in the directory, see
+  ///                     @ref cpp_kodi_vfs_CDirEntry "kodi::vfs::CDirEntry"
+  ///                     about his content
+  /// @param[in] callbacks A callback structure
+  /// @return Context for the directory listing
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// ### Callbacks:
+  /// @copydetails cpp_kodi_addon_vfs_general_cb_GetDirectory
+  ///
+  /// **Available callback functions**
+  /// | Function: | Description
+  /// |--|--
+  /// | CVFSCallbacks::GetKeyboardInput | @copybrief CVFSCallbacks::GetKeyboardInput @copydetails CVFSCallbacks::GetKeyboardInput
+  /// | CVFSCallbacks::SetErrorDialog | @copybrief CVFSCallbacks::SetErrorDialog @copydetails CVFSCallbacks::SetErrorDialog
+  /// | CVFSCallbacks::RequireAuthentication | @copybrief CVFSCallbacks::RequireAuthentication @copydetails CVFSCallbacks::RequireAuthentication
+  ///
+  virtual bool GetDirectory(const VFSURL& url,
+                            std::vector<kodi::vfs::CDirEntry>& entries,
+                            CVFSCallbacks callbacks)
+  {
+    return false;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_addon_vfs_general
+  /// @brief Check if file should be presented as a directory (multiple streams)
+  ///
+  /// @param[in] url The URL of the file
+  /// @param[out] entries The entries in the directory, see
+  ///                     @ref cpp_kodi_vfs_CDirEntry "kodi::vfs::CDirEntry"
+  ///                     about his content
+  /// @param[out] rootPath Path to root directory if multiple entries
+  /// @return Context for the directory listing
+  ///
+  virtual bool ContainsFiles(const VFSURL& url,
+                             std::vector<kodi::vfs::CDirEntry>& entries,
+                             std::string& rootPath)
+  {
+    return false;
+  }
+  //--------------------------------------------------------------------------
+  //@}
 
-    inline static int64_t ADDON_Seek(const AddonInstance_VFSEntry* instance, void* context, int64_t position, int whence)
-    {
-      return instance->toAddon.addonInstance->Seek(context, position, whence);
-    }
+private:
+  void SetAddonStruct(KODI_HANDLE instance)
+  {
+    if (instance == nullptr)
+      throw std::logic_error("kodi::addon::CInstanceVFS: Creation with empty addon structure not "
+                             "allowed, table must be given from Kodi!");
+
+    m_instanceData = static_cast<AddonInstance_VFSEntry*>(instance);
+    m_instanceData->toAddon->addonInstance = this;
+    m_instanceData->toAddon->open = ADDON_Open;
+    m_instanceData->toAddon->open_for_write = ADDON_OpenForWrite;
+    m_instanceData->toAddon->read = ADDON_Read;
+    m_instanceData->toAddon->write = ADDON_Write;
+    m_instanceData->toAddon->seek = ADDON_Seek;
+    m_instanceData->toAddon->truncate = ADDON_Truncate;
+    m_instanceData->toAddon->get_length = ADDON_GetLength;
+    m_instanceData->toAddon->get_position = ADDON_GetPosition;
+    m_instanceData->toAddon->get_chunk_size = ADDON_GetChunkSize;
+    m_instanceData->toAddon->io_control = ADDON_IoControl;
+    m_instanceData->toAddon->stat = ADDON_Stat;
+    m_instanceData->toAddon->close = ADDON_Close;
+    m_instanceData->toAddon->exists = ADDON_Exists;
+    m_instanceData->toAddon->clear_out_idle = ADDON_ClearOutIdle;
+    m_instanceData->toAddon->disconnect_all = ADDON_DisconnectAll;
+    m_instanceData->toAddon->delete_it = ADDON_Delete;
+    m_instanceData->toAddon->rename = ADDON_Rename;
+    m_instanceData->toAddon->directory_exists = ADDON_DirectoryExists;
+    m_instanceData->toAddon->remove_directory = ADDON_RemoveDirectory;
+    m_instanceData->toAddon->create_directory = ADDON_CreateDirectory;
+    m_instanceData->toAddon->get_directory = ADDON_GetDirectory;
+    m_instanceData->toAddon->free_directory = ADDON_FreeDirectory;
+    m_instanceData->toAddon->contains_files = ADDON_ContainsFiles;
+  }
+
+  inline static void* ADDON_Open(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Open(*url);
+  }
 
-    inline static int ADDON_Truncate(const AddonInstance_VFSEntry* instance, void* context, int64_t size)
-    {
-      return instance->toAddon.addonInstance->Truncate(context, size);
-    }
+  inline static void* ADDON_OpenForWrite(const AddonInstance_VFSEntry* instance,
+                                         const VFSURL* url,
+                                         bool overWrite)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+        ->OpenForWrite(*url, overWrite);
+  }
+
+  inline static ssize_t ADDON_Read(const AddonInstance_VFSEntry* instance,
+                                   void* context,
+                                   void* buffer,
+                                   size_t uiBufSize)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+        ->Read(context, buffer, uiBufSize);
+  }
+
+  inline static ssize_t ADDON_Write(const AddonInstance_VFSEntry* instance,
+                                    void* context,
+                                    const void* buffer,
+                                    size_t uiBufSize)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+        ->Write(context, buffer, uiBufSize);
+  }
+
+  inline static int64_t ADDON_Seek(const AddonInstance_VFSEntry* instance,
+                                   void* context,
+                                   int64_t position,
+                                   int whence)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+        ->Seek(context, position, whence);
+  }
 
-    inline static int64_t ADDON_GetLength(const AddonInstance_VFSEntry* instance, void* context)
-    {
-      return instance->toAddon.addonInstance->GetLength(context);
-    }
+  inline static int ADDON_Truncate(const AddonInstance_VFSEntry* instance,
+                                   void* context,
+                                   int64_t size)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Truncate(context, size);
+  }
 
-    inline static int64_t ADDON_GetPosition(const AddonInstance_VFSEntry* instance, void* context)
-    {
-      return instance->toAddon.addonInstance->GetPosition(context);
-    }
+  inline static int64_t ADDON_GetLength(const AddonInstance_VFSEntry* instance, void* context)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->GetLength(context);
+  }
 
-    inline static int ADDON_GetChunkSize(const AddonInstance_VFSEntry* instance, void* context)
-    {
-      return instance->toAddon.addonInstance->GetChunkSize(context);
-    }
+  inline static int64_t ADDON_GetPosition(const AddonInstance_VFSEntry* instance, void* context)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->GetPosition(context);
+  }
 
-    inline static int ADDON_IoControl(const AddonInstance_VFSEntry* instance, void* context, XFILE::EIoControl request, void* param)
-    {
-      return instance->toAddon.addonInstance->IoControl(context, request, param);
-    }
+  inline static int ADDON_GetChunkSize(const AddonInstance_VFSEntry* instance, void* context)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->GetChunkSize(context);
+  }
 
-    inline static int ADDON_Stat(const AddonInstance_VFSEntry* instance, const VFSURL* url, struct __stat64* buffer)
-    {
-      return instance->toAddon.addonInstance->Stat(*url, buffer);
-    }
+  inline static int ADDON_IoControl(const AddonInstance_VFSEntry* instance,
+                                    void* context,
+                                    enum VFS_IOCTRL request,
+                                    void* param)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+        ->IoControl(context, request, param);
+  }
 
-    inline static bool ADDON_Close(const AddonInstance_VFSEntry* instance, void* context)
-    {
-      return instance->toAddon.addonInstance->Close(context);
-    }
+  inline static int ADDON_Stat(const AddonInstance_VFSEntry* instance,
+                               const VFSURL* url,
+                               struct __stat64* buffer)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Stat(*url, buffer);
+  }
 
-    inline static bool ADDON_Exists(const AddonInstance_VFSEntry* instance, const VFSURL* url)
-    {
-      return instance->toAddon.addonInstance->Exists(*url);
-    }
+  inline static bool ADDON_Close(const AddonInstance_VFSEntry* instance, void* context)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Close(context);
+  }
 
-    inline static void ADDON_ClearOutIdle(const AddonInstance_VFSEntry* instance)
-    {
-      return instance->toAddon.addonInstance->ClearOutIdle();
-    }
+  inline static bool ADDON_Exists(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Exists(*url);
+  }
 
-    inline static void ADDON_DisconnectAll(const AddonInstance_VFSEntry* instance)
-    {
-      return instance->toAddon.addonInstance->DisconnectAll();
-    }
+  inline static void ADDON_ClearOutIdle(const AddonInstance_VFSEntry* instance)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->ClearOutIdle();
+  }
 
-    inline static bool ADDON_Delete(const AddonInstance_VFSEntry* instance, const VFSURL* url)
-    {
-      return instance->toAddon.addonInstance->Delete(*url);
-    }
+  inline static void ADDON_DisconnectAll(const AddonInstance_VFSEntry* instance)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->DisconnectAll();
+  }
 
-    inline static bool ADDON_Rename(const AddonInstance_VFSEntry* instance, const VFSURL* url, const VFSURL* url2)
-    {
-      return instance->toAddon.addonInstance->Rename(*url, *url2);
-    }
+  inline static bool ADDON_Delete(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Delete(*url);
+  }
 
-    inline static bool ADDON_DirectoryExists(const AddonInstance_VFSEntry* instance, const VFSURL* url)
-    {
-      return instance->toAddon.addonInstance->DirectoryExists(*url);
-    }
+  inline static bool ADDON_Rename(const AddonInstance_VFSEntry* instance,
+                                  const VFSURL* url,
+                                  const VFSURL* url2)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->Rename(*url, *url2);
+  }
 
-    inline static bool ADDON_RemoveDirectory(const AddonInstance_VFSEntry* instance, const VFSURL* url)
-    {
-      return instance->toAddon.addonInstance->RemoveDirectory(*url);
-    }
+  inline static bool ADDON_DirectoryExists(const AddonInstance_VFSEntry* instance,
+                                           const VFSURL* url)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->DirectoryExists(*url);
+  }
 
-    inline static bool ADDON_CreateDirectory(const AddonInstance_VFSEntry* instance, const VFSURL* url)
-    {
-      return instance->toAddon.addonInstance->CreateDirectory(*url);
-    }
+  inline static bool ADDON_RemoveDirectory(const AddonInstance_VFSEntry* instance,
+                                           const VFSURL* url)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->RemoveDirectory(*url);
+  }
 
-    inline static bool ADDON_GetDirectory(const AddonInstance_VFSEntry* instance,
-                                          const VFSURL* url,
-                                          VFSDirEntry** retEntries,
-                                          int* num_entries,
-                                          VFSGetDirectoryCallbacks* callbacks)
+  inline static bool ADDON_CreateDirectory(const AddonInstance_VFSEntry* instance,
+                                           const VFSURL* url)
+  {
+    return static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)->CreateDirectory(*url);
+  }
+
+  inline static bool ADDON_GetDirectory(const AddonInstance_VFSEntry* instance,
+                                        const VFSURL* url,
+                                        VFSDirEntry** retEntries,
+                                        int* num_entries,
+                                        VFSGetDirectoryCallbacks* callbacks)
+  {
+    std::vector<kodi::vfs::CDirEntry> addonEntries;
+    bool ret = static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+                   ->GetDirectory(*url, addonEntries, CVFSCallbacks(callbacks));
+    if (ret)
     {
-      std::vector<kodi::vfs::CDirEntry> addonEntries;
-      bool ret = instance->toAddon.addonInstance->GetDirectory(*url, addonEntries, CVFSCallbacks(callbacks));
-      if (ret)
+      VFSDirEntry* entries =
+          static_cast<VFSDirEntry*>(malloc(sizeof(VFSDirEntry) * addonEntries.size()));
+      for (unsigned int i = 0; i < addonEntries.size(); ++i)
       {
-        VFSDirEntry* entries = static_cast<VFSDirEntry*>(malloc(sizeof(VFSDirEntry) * addonEntries.size()));
-        for (unsigned int i = 0; i < addonEntries.size(); ++i)
+        entries[i].label = strdup(addonEntries[i].Label().c_str());
+        entries[i].title = strdup(addonEntries[i].Title().c_str());
+        entries[i].path = strdup(addonEntries[i].Path().c_str());
+        entries[i].folder = addonEntries[i].IsFolder();
+        entries[i].size = addonEntries[i].Size();
+        entries[i].date_time = addonEntries[i].DateTime();
+
+        entries[i].num_props = 0;
+        const std::map<std::string, std::string>& props = addonEntries[i].GetProperties();
+        if (!props.empty())
         {
-          entries[i].label = strdup(addonEntries[i].Label().c_str());
-          entries[i].title = strdup(addonEntries[i].Title().c_str());
-          entries[i].path = strdup(addonEntries[i].Path().c_str());
-          entries[i].folder = addonEntries[i].IsFolder();
-          entries[i].size = addonEntries[i].Size();
-
-          entries[i].num_props = 0;
-          const std::map<std::string, std::string>& props = addonEntries[i].GetProperties();
-          if (!props.empty())
+          entries[i].properties =
+              static_cast<VFSProperty*>(malloc(sizeof(VFSProperty) * props.size()));
+          for (const auto& prop : props)
           {
-            entries[i].properties = static_cast<VFSProperty*>(malloc(sizeof(VFSProperty)*props.size()));
-            for (const auto& prop : props)
-            {
-              entries[i].properties[entries[i].num_props].name = strdup(prop.first.c_str());
-              entries[i].properties[entries[i].num_props].val = strdup(prop.second.c_str());
-              ++entries[i].num_props;
-            }
+            entries[i].properties[entries[i].num_props].name = strdup(prop.first.c_str());
+            entries[i].properties[entries[i].num_props].val = strdup(prop.second.c_str());
+            ++entries[i].num_props;
           }
-          else
-            entries[i].properties = nullptr;
         }
-        *retEntries = entries;
-        *num_entries = static_cast<int>(addonEntries.size());
+        else
+          entries[i].properties = nullptr;
       }
-      return ret;
+      *retEntries = entries;
+      *num_entries = static_cast<int>(addonEntries.size());
     }
+    return ret;
+  }
 
-    inline static void ADDON_FreeDirectory(const AddonInstance_VFSEntry* instance, VFSDirEntry* entries, int num_entries)
+  inline static void ADDON_FreeDirectory(const AddonInstance_VFSEntry* instance,
+                                         VFSDirEntry* entries,
+                                         int num_entries)
+  {
+    for (int i = 0; i < num_entries; ++i)
     {
-      for (int i = 0; i < num_entries; ++i)
+      if (entries[i].properties)
       {
-        if (entries[i].properties)
+        for (unsigned int j = 0; j < entries[i].num_props; ++j)
         {
-          for (unsigned int j = 0; j < entries[i].num_props; ++j)
-          {
-            free(entries[i].properties[j].name);
-            free(entries[i].properties[j].val);
-          }
-          free(entries[i].properties);
+          free(entries[i].properties[j].name);
+          free(entries[i].properties[j].val);
         }
-        free(entries[i].label);
-        free(entries[i].title);
-        free(entries[i].path);
+        free(entries[i].properties);
       }
-      free(entries);
+      free(entries[i].label);
+      free(entries[i].title);
+      free(entries[i].path);
     }
-
-    inline static bool ADDON_ContainsFiles(const AddonInstance_VFSEntry* instance,
-                                           const VFSURL* url,
-                                           VFSDirEntry** retEntries,
-                                           int* num_entries,
-                                           char* rootpath)
+    free(entries);
+  }
+
+  inline static bool ADDON_ContainsFiles(const AddonInstance_VFSEntry* instance,
+                                         const VFSURL* url,
+                                         VFSDirEntry** retEntries,
+                                         int* num_entries,
+                                         char* rootpath)
+  {
+    std::string cppRootPath;
+    std::vector<kodi::vfs::CDirEntry> addonEntries;
+    bool ret = static_cast<CInstanceVFS*>(instance->toAddon->addonInstance)
+                   ->ContainsFiles(*url, addonEntries, cppRootPath);
+    if (ret)
     {
-      std::string cppRootPath;
-      std::vector<kodi::vfs::CDirEntry> addonEntries;
-      bool ret = instance->toAddon.addonInstance->ContainsFiles(*url, addonEntries, cppRootPath);
-      if (ret)
-      {
-        strncpy(rootpath, cppRootPath.c_str(), ADDON_STANDARD_STRING_LENGTH);
+      strncpy(rootpath, cppRootPath.c_str(), ADDON_STANDARD_STRING_LENGTH);
 
-        VFSDirEntry* entries = static_cast<VFSDirEntry*>(malloc(sizeof(VFSDirEntry) * addonEntries.size()));
-        for (size_t i = 0; i < addonEntries.size(); ++i)
+      VFSDirEntry* entries =
+          static_cast<VFSDirEntry*>(malloc(sizeof(VFSDirEntry) * addonEntries.size()));
+      for (size_t i = 0; i < addonEntries.size(); ++i)
+      {
+        entries[i].label = strdup(addonEntries[i].Label().c_str());
+        entries[i].title = strdup(addonEntries[i].Title().c_str());
+        entries[i].path = strdup(addonEntries[i].Path().c_str());
+        entries[i].folder = addonEntries[i].IsFolder();
+        entries[i].size = addonEntries[i].Size();
+        entries[i].date_time = addonEntries[i].DateTime();
+
+        entries[i].num_props = 0;
+        const std::map<std::string, std::string>& props = addonEntries[i].GetProperties();
+        if (!props.empty())
         {
-          entries[i].label = strdup(addonEntries[i].Label().c_str());
-          entries[i].title = strdup(addonEntries[i].Title().c_str());
-          entries[i].path = strdup(addonEntries[i].Path().c_str());
-          entries[i].folder = addonEntries[i].IsFolder();
-          entries[i].size = addonEntries[i].Size();
-
-          entries[i].num_props = 0;
-          const std::map<std::string, std::string>& props = addonEntries[i].GetProperties();
-          if (!props.empty())
+          entries[i].properties =
+              static_cast<VFSProperty*>(malloc(sizeof(VFSProperty) * props.size()));
+          for (const auto& prop : props)
           {
-            entries[i].properties = static_cast<VFSProperty*>(malloc(sizeof(VFSProperty)*props.size()));
-            for (const auto& prop : props)
-            {
-              entries[i].properties[entries[i].num_props].name = strdup(prop.first.c_str());
-              entries[i].properties[entries[i].num_props].val = strdup(prop.second.c_str());
-              ++entries[i].num_props;
-            }
+            entries[i].properties[entries[i].num_props].name = strdup(prop.first.c_str());
+            entries[i].properties[entries[i].num_props].val = strdup(prop.second.c_str());
+            ++entries[i].num_props;
           }
-          else
-            entries[i].properties = nullptr;
         }
-        *retEntries = entries;
-        *num_entries = static_cast<int>(addonEntries.size());
+        else
+          entries[i].properties = nullptr;
       }
-      return ret;
+      *retEntries = entries;
+      *num_entries = static_cast<int>(addonEntries.size());
     }
+    return ret;
+  }
 
-    AddonInstance_VFSEntry* m_instanceData;
-  };
+  AddonInstance_VFSEntry* m_instanceData;
+};
 
 } /* namespace addon */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
index 9c33fbf..54246f0 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
@@ -80,13 +80,13 @@ extern "C"
 
     int64_t pts;
 
-    void *buffer; //< will be passed in release_frame_buffer
+    KODI_HANDLE buffer; //< will be passed in release_frame_buffer
   };
 
   enum VIDEOCODEC_RETVAL
   {
     VC_NONE = 0,        //< noop
-    VC_ERROR,           //< an error occured, no other messages will be returned
+    VC_ERROR,           //< an error occurred, no other messages will be returned
     VC_BUFFER,          //< the decoder needs more data
     VC_PICTURE,         //< the decoder got a picture
     VC_EOF,             //< the decoder signals EOF
@@ -143,11 +143,13 @@ namespace kodi
   namespace addon
   {
 
-    class CInstanceVideoCodec : public IAddonInstance
+    class ATTRIBUTE_HIDDEN CInstanceVideoCodec : public IAddonInstance
     {
     public:
-      explicit CInstanceVideoCodec(KODI_HANDLE instance)
-        : IAddonInstance(ADDON_INSTANCE_VIDEOCODEC)
+      explicit CInstanceVideoCodec(KODI_HANDLE instance, const std::string& kodiVersion = "")
+        : IAddonInstance(ADDON_INSTANCE_VIDEOCODEC,
+                         !kodiVersion.empty() ? kodiVersion
+                                              : GetKodiTypeVersion(ADDON_INSTANCE_VIDEOCODEC))
       {
         if (CAddonBase::m_interface->globalSingleInstance != nullptr)
           throw std::logic_error("kodi::addon::CInstanceVideoCodec: Creation of multiple together with single instance way is not allowed!");
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
index 6c29693..4be785d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
@@ -14,6 +14,7 @@
  */
 
 #include "../AddonBase.h"
+#include "../gui/renderHelper.h"
 
 namespace kodi { namespace addon { class CInstanceVisualization; }}
 
@@ -59,6 +60,7 @@ typedef struct AddonToKodiFuncTable_Visualization /* internal */
 {
   KODI_HANDLE kodiInstance;
   void (__cdecl* transfer_preset) (void* kodiInstance, const char* preset);
+  void (__cdecl* clear_presets) (void* kodiInstance);
 } AddonToKodiFuncTable_Visualization;
 
 typedef struct KodiToAddonFuncTable_Visualization /* internal */
@@ -78,9 +80,9 @@ typedef struct KodiToAddonFuncTable_Visualization /* internal */
 
 typedef struct AddonInstance_Visualization /* internal */
 {
-  AddonProps_Visualization props;
-  AddonToKodiFuncTable_Visualization toKodi;
-  KodiToAddonFuncTable_Visualization toAddon;
+  AddonProps_Visualization* props;
+  AddonToKodiFuncTable_Visualization* toKodi;
+  KodiToAddonFuncTable_Visualization* toAddon;
 } AddonInstance_Visualization;
 
 //============================================================================
@@ -296,7 +298,7 @@ namespace addon
   /// Kodi's header. Manually deleting the add-on instance is not required.
   ///
   //----------------------------------------------------------------------------
-  class CInstanceVisualization : public IAddonInstance
+  class ATTRIBUTE_HIDDEN CInstanceVisualization : public IAddonInstance
   {
   public:
     //==========================================================================
@@ -307,7 +309,8 @@ namespace addon
     /// Used by an add-on that only supports visualizations.
     ///
     CInstanceVisualization()
-      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION)
+      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION,
+                       GetKodiTypeVersion(ADDON_INSTANCE_VISUALIZATION))
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstanceVisualization: Cannot create multiple instances of add-on.");
@@ -325,11 +328,16 @@ namespace addon
     ///
     /// @param[in] instance               The instance value given to
     ///                                   <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+    /// @param[in] kodiVersion [opt] Version used in Kodi for this instance, to
+    ///                        allow compatibility to older Kodi versions.
+    ///                        @note Recommended to set.
     ///
     /// @warning Only use `instance` from the CreateInstance call
     ///
-    explicit CInstanceVisualization(KODI_HANDLE instance)
-      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION)
+    explicit CInstanceVisualization(KODI_HANDLE instance, const std::string& kodiVersion = "")
+      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION,
+                       !kodiVersion.empty() ? kodiVersion
+                                            : GetKodiTypeVersion(ADDON_INSTANCE_VISUALIZATION))
     {
       if (CAddonBase::m_interface->globalSingleInstance != nullptr)
         throw std::logic_error("kodi::addon::CInstanceVisualization: Creation of multiple together with single instance way is not allowed!");
@@ -548,6 +556,26 @@ namespace addon
     //==========================================================================
     ///
     /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief To transfer available presets on addon
+    ///
+    /// Used if @ref GetPresets not possible to use, e.g. where available presets
+    /// are only known during @ref Start call.
+    ///
+    /// @param[in] presets List to store available presets.
+    ///
+    /// @note The function should only be called once, if possible
+    ///
+    inline void TransferPresets(const std::vector<std::string>& presets)
+    {
+      m_instanceData->toKodi->clear_presets(m_instanceData->toKodi->kodiInstance);
+      for (auto it : presets)
+        m_instanceData->toKodi->transfer_preset(m_instanceData->toKodi->kodiInstance, it.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
     /// @brief Device that represents the display adapter
     ///
     /// @return A pointer to the used device
@@ -555,7 +583,7 @@ namespace addon
     /// @note This is only available on **DirectX**, It us unused (`nullptr`) on
     /// **OpenGL**
     ///
-    inline void* Device() { return m_instanceData->props.device; }
+    inline void* Device() { return m_instanceData->props->device; }
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -565,7 +593,7 @@ namespace addon
     ///
     /// @return The X position, in pixels
     ///
-    inline int X() { return m_instanceData->props.x; }
+    inline int X() { return m_instanceData->props->x; }
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -575,7 +603,7 @@ namespace addon
     ///
     /// @return The Y position, in pixels
     ///
-    inline int Y() { return m_instanceData->props.y; }
+    inline int Y() { return m_instanceData->props->y; }
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -585,7 +613,7 @@ namespace addon
     ///
     /// @return The width, in pixels
     ///
-    inline int Width() { return m_instanceData->props.width; }
+    inline int Width() { return m_instanceData->props->width; }
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -595,7 +623,7 @@ namespace addon
     ///
     /// @return The height, in pixels
     ///
-    inline int Height() { return m_instanceData->props.height; }
+    inline int Height() { return m_instanceData->props->height; }
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -606,7 +634,7 @@ namespace addon
     ///
     /// @return The pixel aspect ratio used by the display
     ///
-    inline float PixelRatio() { return m_instanceData->props.pixelRatio; }
+    inline float PixelRatio() { return m_instanceData->props->pixelRatio; }
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -616,7 +644,7 @@ namespace addon
     ///
     /// @return The add-on name
     ///
-    inline std::string Name() { return m_instanceData->props.name; }
+    inline std::string Name() { return m_instanceData->props->name; }
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -626,7 +654,7 @@ namespace addon
     ///
     /// @return The add-on installation path
     ///
-    inline std::string Presets() { return m_instanceData->props.presets; }
+    inline std::string Presets() { return m_instanceData->props->presets; }
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -640,7 +668,7 @@ namespace addon
     ///
     /// @return Path to the user profile
     ///
-    inline std::string Profile() { return m_instanceData->props.profile; }
+    inline std::string Profile() { return m_instanceData->props->profile; }
     //--------------------------------------------------------------------------
     //@}
 
@@ -651,46 +679,53 @@ namespace addon
         throw std::logic_error("kodi::addon::CInstanceVisualization: Null pointer instance passed.");
 
       m_instanceData = static_cast<AddonInstance_Visualization*>(instance);
-      m_instanceData->toAddon.addonInstance = this;
-      m_instanceData->toAddon.start = ADDON_Start;
-      m_instanceData->toAddon.stop = ADDON_Stop;
-      m_instanceData->toAddon.audio_data = ADDON_AudioData;
-      m_instanceData->toAddon.render = ADDON_Render;
-      m_instanceData->toAddon.get_info = ADDON_GetInfo;
-      m_instanceData->toAddon.on_action = ADDON_OnAction;
-      m_instanceData->toAddon.get_presets = ADDON_GetPresets;
-      m_instanceData->toAddon.get_active_preset = ADDON_GetActivePreset;
-      m_instanceData->toAddon.is_locked = ADDON_IsLocked;
+      m_instanceData->toAddon->addonInstance = this;
+      m_instanceData->toAddon->start = ADDON_Start;
+      m_instanceData->toAddon->stop = ADDON_Stop;
+      m_instanceData->toAddon->audio_data = ADDON_AudioData;
+      m_instanceData->toAddon->is_dirty = ADDON_IsDirty;
+      m_instanceData->toAddon->render = ADDON_Render;
+      m_instanceData->toAddon->get_info = ADDON_GetInfo;
+      m_instanceData->toAddon->on_action = ADDON_OnAction;
+      m_instanceData->toAddon->get_presets = ADDON_GetPresets;
+      m_instanceData->toAddon->get_active_preset = ADDON_GetActivePreset;
+      m_instanceData->toAddon->is_locked = ADDON_IsLocked;
     }
 
     inline static bool ADDON_Start(const AddonInstance_Visualization* addon, int channels, int samplesPerSec, int bitsPerSample, const char* songName)
     {
-      return addon->toAddon.addonInstance->Start(channels, samplesPerSec, bitsPerSample, songName);
+      addon->toAddon->addonInstance->m_renderHelper = kodi::gui::GetRenderHelper();
+      return addon->toAddon->addonInstance->Start(channels, samplesPerSec, bitsPerSample, songName);
     }
 
     inline static void ADDON_Stop(const AddonInstance_Visualization* addon)
     {
-      addon->toAddon.addonInstance->Stop();
+      addon->toAddon->addonInstance->Stop();
+      addon->toAddon->addonInstance->m_renderHelper = nullptr;
     }
 
     inline static void ADDON_AudioData(const AddonInstance_Visualization* addon, const float* audioData, int audioDataLength, float *freqData, int freqDataLength)
     {
-      addon->toAddon.addonInstance->AudioData(audioData, audioDataLength, freqData, freqDataLength);
+      addon->toAddon->addonInstance->AudioData(audioData, audioDataLength, freqData, freqDataLength);
     }
 
     inline static bool ADDON_IsDirty(const AddonInstance_Visualization* addon)
     {
-      return addon->toAddon.addonInstance->IsDirty();
+      return addon->toAddon->addonInstance->IsDirty();
     }
 
     inline static void ADDON_Render(const AddonInstance_Visualization* addon)
     {
-      addon->toAddon.addonInstance->Render();
+      if (!addon->toAddon->addonInstance->m_renderHelper)
+        return;
+      addon->toAddon->addonInstance->m_renderHelper->Begin();
+      addon->toAddon->addonInstance->Render();
+      addon->toAddon->addonInstance->m_renderHelper->End();
     }
 
     inline static void ADDON_GetInfo(const AddonInstance_Visualization* addon, VIS_INFO *info)
     {
-      addon->toAddon.addonInstance->GetInfo(info->bWantsFreq, info->iSyncDelay);
+      addon->toAddon->addonInstance->GetInfo(info->bWantsFreq, info->iSyncDelay);
     }
 
     inline static bool ADDON_OnAction(const AddonInstance_Visualization* addon, VIS_ACTION action, const void *param)
@@ -698,24 +733,24 @@ namespace addon
       switch (action)
       {
         case VIS_ACTION_NEXT_PRESET:
-          return addon->toAddon.addonInstance->NextPreset();
+          return addon->toAddon->addonInstance->NextPreset();
         case VIS_ACTION_PREV_PRESET:
-          return addon->toAddon.addonInstance->PrevPreset();
+          return addon->toAddon->addonInstance->PrevPreset();
         case VIS_ACTION_LOAD_PRESET:
-          return addon->toAddon.addonInstance->LoadPreset(*static_cast<const int*>(param));
+          return addon->toAddon->addonInstance->LoadPreset(*static_cast<const int*>(param));
         case VIS_ACTION_RANDOM_PRESET:
-          return addon->toAddon.addonInstance->RandomPreset();
+          return addon->toAddon->addonInstance->RandomPreset();
         case VIS_ACTION_LOCK_PRESET:
-          addon->toAddon.addonInstance->m_presetLockedByUser = !addon->toAddon.addonInstance->m_presetLockedByUser;
-          return addon->toAddon.addonInstance->LockPreset(addon->toAddon.addonInstance->m_presetLockedByUser);
+          addon->toAddon->addonInstance->m_presetLockedByUser = !addon->toAddon->addonInstance->m_presetLockedByUser;
+          return addon->toAddon->addonInstance->LockPreset(addon->toAddon->addonInstance->m_presetLockedByUser);
         case VIS_ACTION_RATE_PRESET_PLUS:
-          return addon->toAddon.addonInstance->RatePreset(true);
+          return addon->toAddon->addonInstance->RatePreset(true);
         case VIS_ACTION_RATE_PRESET_MINUS:
-          return addon->toAddon.addonInstance->RatePreset(false);
+          return addon->toAddon->addonInstance->RatePreset(false);
         case VIS_ACTION_UPDATE_ALBUMART:
-          return addon->toAddon.addonInstance->UpdateAlbumart(static_cast<const char*>(param));
+          return addon->toAddon->addonInstance->UpdateAlbumart(static_cast<const char*>(param));
         case VIS_ACTION_UPDATE_TRACK:
-          return addon->toAddon.addonInstance->UpdateTrack(*static_cast<const VisTrack*>(param));
+          return addon->toAddon->addonInstance->UpdateTrack(*static_cast<const VisTrack*>(param));
         case VIS_ACTION_NONE:
         default:
           break;
@@ -726,10 +761,10 @@ namespace addon
     inline static unsigned int ADDON_GetPresets(const AddonInstance_Visualization* addon)
     {
       std::vector<std::string> presets;
-      if (addon->toAddon.addonInstance->GetPresets(presets))
+      if (addon->toAddon->addonInstance->GetPresets(presets))
       {
         for (auto it : presets)
-          addon->toAddon.addonInstance->m_instanceData->toKodi.transfer_preset(addon->toKodi.kodiInstance, it.c_str());
+          addon->toAddon->addonInstance->m_instanceData->toKodi->transfer_preset(addon->toKodi->kodiInstance, it.c_str());
       }
 
       return static_cast<unsigned int>(presets.size());
@@ -737,14 +772,15 @@ namespace addon
 
     inline static int ADDON_GetActivePreset(const AddonInstance_Visualization* addon)
     {
-      return addon->toAddon.addonInstance->GetActivePreset();
+      return addon->toAddon->addonInstance->GetActivePreset();
     }
 
     inline static bool ADDON_IsLocked(const AddonInstance_Visualization* addon)
     {
-      return addon->toAddon.addonInstance->IsLocked();
+      return addon->toAddon->addonInstance->IsLocked();
     }
 
+    std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
     bool m_presetLockedByUser = false;
     AddonInstance_Visualization* m_instanceData;
   };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/CMakeLists.txt
new file mode 100644
index 0000000..946849e
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(HEADERS ChannelGroups.h
+            Channels.h
+            EDL.h
+            EPG.h
+            General.h
+            MenuHook.h
+            Recordings.h
+            Stream.h
+            Timers.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-addon-dev-kit_include_kodi_addon-instance_pvr)
+endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h
new file mode 100644
index 0000000..17995bb
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/ChannelGroups.h
@@ -0,0 +1,271 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 3 - PVR channel group
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup class PVRChannelGroup
+/// @ingroup cpp_kodi_addon_pvr_Defs_ChannelGroup
+/// @brief **PVR add-on channel group**\n
+/// To define a group for channels, this becomes be asked from
+/// @ref kodi::addon::CInstancePVRClient::GetChannelGroups() and used on
+/// @ref kodi::addon::CInstancePVRClient::GetChannelGroupMembers() to get his
+/// content with @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember "PVRChannelGroupMember".
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup_Help
+///
+///@{
+class PVRChannelGroup : public CStructHdl<PVRChannelGroup, PVR_CHANNEL_GROUP>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRChannelGroup() { memset(m_cStructure, 0, sizeof(PVR_CHANNEL_GROUP)); }
+  PVRChannelGroup(const PVRChannelGroup& channel) : CStructHdl(channel) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **Group name** | `std::string` | @ref PVRChannelGroup::SetGroupName "SetGroupName" | @ref PVRChannelGroup::GetGroupName "GetGroupName" | *required to set*
+  /// | **Is radio** | `bool` | @ref PVRChannelGroup::SetIsRadio "SetIsRadio" | @ref PVRChannelGroup::GetIsRadio "GetIsRadio" | *required to set*
+  /// | **Position** | `unsigned int` | @ref PVRChannelGroup::SetPosition "SetPosition" | @ref PVRChannelGroup::GetPosition "GetPosition" | *optional*
+  ///
+
+  /// @ingroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup
+  ///@{
+
+  /// @brief **required**\n
+  /// Name of this channel group.
+  void SetGroupName(const std::string& groupName)
+  {
+    strncpy(m_cStructure->strGroupName, groupName.c_str(), sizeof(m_cStructure->strGroupName) - 1);
+  }
+
+  /// @brief To get with @ref SetGroupName changed values.
+  std::string GetGroupName() const { return m_cStructure->strGroupName; }
+
+  /// @brief **required**\n
+  /// **true** If this is a radio channel group, **false** otherwise.
+  void SetIsRadio(bool isRadio) { m_cStructure->bIsRadio = isRadio; }
+
+  /// @brief To get with @ref SetIsRadio changed values.
+  bool GetIsRadio() const { return m_cStructure->bIsRadio; }
+
+  /// @brief **optional**\n
+  /// Sort position of the group (<b>`0`</b> indicates that the backend doesn't
+  /// support sorting of groups).
+  void SetPosition(unsigned int position) { m_cStructure->iPosition = position; }
+
+  /// @brief To get with @ref SetPosition changed values.
+  unsigned int GetPosition() const { return m_cStructure->iPosition; }
+
+  ///@}
+
+private:
+  PVRChannelGroup(const PVR_CHANNEL_GROUP* channel) : CStructHdl(channel) {}
+  PVRChannelGroup(PVR_CHANNEL_GROUP* channel) : CStructHdl(channel) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupsResultSet class PVRChannelGroupsResultSet
+/// @ingroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroup
+/// @brief **PVR add-on channel group member transfer class**\n
+/// To transfer the content of @ref kodi::addon::CInstancePVRClient::GetChannelGroups().
+///
+///@{
+class PVRChannelGroupsResultSet
+{
+public:
+  /*! \cond PRIVATE */
+  PVRChannelGroupsResultSet() = delete;
+  PVRChannelGroupsResultSet(const AddonInstance_PVR* instance, ADDON_HANDLE handle)
+    : m_instance(instance), m_handle(handle)
+  {
+  }
+  /*! \endcond */
+
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupsResultSet
+  ///@{
+
+  /// @brief To add and give content from addon to Kodi on related call.
+  ///
+  /// @param[in] tag The to transferred data.
+  void Add(const kodi::addon::PVRChannelGroup& tag)
+  {
+    m_instance->toKodi->TransferChannelGroup(m_instance->toKodi->kodiInstance, m_handle, tag);
+  }
+
+  ///@}
+
+private:
+  const AddonInstance_PVR* m_instance = nullptr;
+  const ADDON_HANDLE m_handle;
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember class PVRChannelGroupMember
+/// @ingroup cpp_kodi_addon_pvr_Defs_ChannelGroup
+/// @brief **PVR add-on channel group member**\n
+/// To define the content of @ref kodi::addon::CInstancePVRClient::GetChannelGroups()
+/// given groups.
+///
+/// This content becomes then requested with @ref kodi::addon::CInstancePVRClient::GetChannelGroupMembers().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember_Help
+///
+///@{
+class PVRChannelGroupMember : public CStructHdl<PVRChannelGroupMember, PVR_CHANNEL_GROUP_MEMBER>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRChannelGroupMember() { memset(m_cStructure, 0, sizeof(PVR_CHANNEL_GROUP_MEMBER)); }
+  PVRChannelGroupMember(const PVRChannelGroupMember& channel) : CStructHdl(channel) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |-------|-------|-----------|----------|-----------
+  /// | **Group name** | `std::string` | @ref PVRChannelGroupMember::SetGroupName "SetGroupName" | @ref PVRChannelGroupMember::GetGroupName "GetGroupName" | *required to set*
+  /// | **Channel unique id** | `unsigned int` | @ref PVRChannelGroupMember::SetChannelUniqueId "SetChannelUniqueId" | @ref PVRChannelGroupMember::GetChannelUniqueId "GetChannelUniqueId" | *required to set*
+  /// | **Channel Number** | `unsigned int` | @ref PVRChannelGroupMember::SetChannelNumber "SetChannelNumber" | @ref PVRChannelGroupMember::GetChannelNumber "GetChannelNumber" | *optional*
+  /// | **Sub channel number** | `unsigned int` | @ref PVRChannelGroupMember::SetSubChannelNumber "SetSubChannelNumber"| @ref PVRChannelGroupMember::GetSubChannelNumber "GetSubChannelNumber" | *optional*
+  /// | **Order** | `int` | @ref PVRChannel::SetOrder "SetOrder" | @ref PVRChannel::GetOrder "GetOrder" | *optional*
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember
+  ///@{
+
+  /// @brief **required**\n
+  /// Name of the channel group to add the channel to.
+  void SetGroupName(const std::string& groupName)
+  {
+    strncpy(m_cStructure->strGroupName, groupName.c_str(), sizeof(m_cStructure->strGroupName) - 1);
+  }
+
+  /// @brief To get with @ref SetGroupName changed values.
+  std::string GetGroupName() const { return m_cStructure->strGroupName; }
+
+  /// @brief **required**\n
+  /// Unique id of the member.
+  void SetChannelUniqueId(unsigned int channelUniqueId)
+  {
+    m_cStructure->iChannelUniqueId = channelUniqueId;
+  }
+
+  /// @brief To get with @ref SetChannelUniqueId changed values.
+  unsigned int GetChannelUniqueId() const { return m_cStructure->iChannelUniqueId; }
+
+  /// @brief **optional**\n
+  /// Channel number within the group.
+  void SetChannelNumber(unsigned int channelNumber)
+  {
+    m_cStructure->iChannelNumber = channelNumber;
+  }
+
+  /// @brief To get with @ref SetChannelNumber changed values.
+  unsigned int GetChannelNumber() const { return m_cStructure->iChannelNumber; }
+
+  /// @brief **optional**\n
+  /// Sub channel number within the group (ATSC).
+  void SetSubChannelNumber(unsigned int subChannelNumber)
+  {
+    m_cStructure->iSubChannelNumber = subChannelNumber;
+  }
+
+  /// @brief To get with @ref SetSubChannelNumber changed values.
+  unsigned int GetSubChannelNumber() const { return m_cStructure->iSubChannelNumber; }
+
+  /// @brief **optional**\n
+  /// The value denoting the order of this channel in the <b>'All channels'</b> group.
+  void SetOrder(bool order) { m_cStructure->iOrder = order; }
+
+  /// @brief To get with @ref SetOrder changed values.
+  bool GetOrder() const { return m_cStructure->iOrder; }
+
+  ///@}
+
+private:
+  PVRChannelGroupMember(const PVR_CHANNEL_GROUP_MEMBER* channel) : CStructHdl(channel) {}
+  PVRChannelGroupMember(PVR_CHANNEL_GROUP_MEMBER* channel) : CStructHdl(channel) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMembersResultSet class PVRChannelGroupMembersResultSet
+/// @ingroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMember
+/// @brief **PVR add-on channel group member transfer class**\n
+/// To transfer the content of @ref kodi::addon::CInstancePVRClient::GetChannelGroupMembers().
+///
+///@{
+class PVRChannelGroupMembersResultSet
+{
+public:
+  /*! \cond PRIVATE */
+  PVRChannelGroupMembersResultSet() = delete;
+  PVRChannelGroupMembersResultSet(const AddonInstance_PVR* instance, ADDON_HANDLE handle)
+    : m_instance(instance), m_handle(handle)
+  {
+  }
+  /*! \endcond */
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_ChannelGroup_PVRChannelGroupMembersResultSet
+  ///@{
+
+  /// @brief To add and give content from addon to Kodi on related call.
+  ///
+  /// @param[in] tag The to transferred data.
+  void Add(const kodi::addon::PVRChannelGroupMember& tag)
+  {
+    m_instance->toKodi->TransferChannelGroupMember(m_instance->toKodi->kodiInstance, m_handle, tag);
+  }
+
+  ///@}
+
+private:
+  const AddonInstance_PVR* m_instance = nullptr;
+  const ADDON_HANDLE m_handle;
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h
new file mode 100644
index 0000000..9c2f5d2
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Channels.h
@@ -0,0 +1,518 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 2 - PVR channel
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Channel_PVRChannel class PVRChannel
+/// @ingroup cpp_kodi_addon_pvr_Defs_Channel
+/// @brief **Channel data structure**\n
+/// Representation of a TV or radio channel.
+///
+/// This is used to store all the necessary TV or radio channel data and can
+/// either provide the necessary data from / to Kodi for the associated
+/// functions or can also be used in the addon to store its data.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Channel_PVRChannel_Help
+///
+///@{
+class PVRChannel : public CStructHdl<PVRChannel, PVR_CHANNEL>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRChannel() { memset(m_cStructure, 0, sizeof(PVR_CHANNEL)); }
+  PVRChannel(const PVRChannel& channel) : CStructHdl(channel) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Channel_PVRChannel_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Channel_PVRChannel
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Channel_PVRChannel :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **Unique id** | `unsigned int` | @ref PVRChannel::SetUniqueId "SetUniqueId" | @ref PVRChannel::GetUniqueId "GetUniqueId" | *required to set*
+  /// | **Is radio** | `bool` | @ref PVRChannel::SetIsRadio "SetIsRadio" | @ref PVRChannel::GetIsRadio "GetIsRadio" | *required to set*
+  /// | **Channel number** | `unsigned int` | @ref PVRChannel::SetChannelNumber "SetChannelNumber" | @ref PVRChannel::GetChannelNumber "GetChannelNumber" | *optional*
+  /// | **Sub channel number** | `unsigned int` | @ref PVRChannel::SetSubChannelNumber "SetSubChannelNumber" | @ref PVRChannel::GetSubChannelNumber "GetSubChannelNumber" | *optional*
+  /// | **Channel name** | `std::string` | @ref PVRChannel::SetChannelName "SetChannelName" | @ref PVRChannel::GetChannelName "GetChannelName" | *optional*
+  /// | **Mime type** | `std::string` | @ref PVRChannel::SetMimeType "SetMimeType" | @ref PVRChannel::GetMimeType "GetMimeType" | *optional*
+  /// | **Encryption system** | `unsigned int` | @ref PVRChannel::SetEncryptionSystem "SetEncryptionSystem" | @ref PVRChannel::GetEncryptionSystem "GetEncryptionSystem" | *optional*
+  /// | **Icon path** | `std::string` | @ref PVRChannel::SetIconPath "SetIconPath" | @ref PVRChannel::GetIconPath "GetIconPath" | *optional*
+  /// | **Is hidden** | `bool` | @ref PVRChannel::SetIsHidden "SetIsHidden" | @ref PVRChannel::GetIsHidden "GetIsHidden" | *optional*
+  /// | **Has archive** | `bool` | @ref PVRChannel::SetHasArchive "SetHasArchive" | @ref PVRChannel::GetHasArchive "GetHasArchive" | *optional*
+  /// | **Order** | `int` | @ref PVRChannel::SetOrder "SetOrder" | @ref PVRChannel::GetOrder "GetOrder" | *optional*
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Channel_PVRChannel
+  ///@{
+
+  /// @brief **required**\n
+  /// Unique identifier for this channel.
+  void SetUniqueId(unsigned int uniqueId) { m_cStructure->iUniqueId = uniqueId; }
+
+  /// @brief To get with @ref SetUniqueId changed values.
+  unsigned int GetUniqueId() const { return m_cStructure->iUniqueId; }
+
+  /// @brief **required**\n
+  /// **true** if this is a radio channel, **false** if it's a TV channel.
+  void SetIsRadio(bool isRadio) { m_cStructure->bIsRadio = isRadio; }
+
+  /// @brief To get with @ref SetIsRadio changed values.
+  bool GetIsRadio() const { return m_cStructure->bIsRadio; }
+
+  /// @brief **optional**\n
+  /// Channel number of this channel on the backend.
+  void SetChannelNumber(unsigned int channelNumber)
+  {
+    m_cStructure->iChannelNumber = channelNumber;
+  }
+
+  /// @brief To get with @ref SetChannelNumber changed values.
+  unsigned int GetChannelNumber() const { return m_cStructure->iChannelNumber; }
+
+  /// @brief **optional**\n
+  /// Sub channel number of this channel on the backend (ATSC).
+  void SetSubChannelNumber(unsigned int subChannelNumber)
+  {
+    m_cStructure->iSubChannelNumber = subChannelNumber;
+  }
+
+  /// @brief To get with @ref SetSubChannelNumber changed values.
+  unsigned int GetSubChannelNumber() const { return m_cStructure->iSubChannelNumber; }
+
+  /// @brief **optional**\n
+  /// Channel name given to this channel.
+  void SetChannelName(const std::string& channelName)
+  {
+    strncpy(m_cStructure->strChannelName, channelName.c_str(),
+            sizeof(m_cStructure->strChannelName) - 1);
+  }
+
+  /// @brief To get with @ref SetChannelName changed values.
+  std::string GetChannelName() const { return m_cStructure->strChannelName; }
+
+  /// @brief **optional**\n
+  /// Input format mime type.
+  ///
+  /// Available types can be found in https://www.iana.org/assignments/media-types/media-types.xhtml
+  /// on "application" and "video" or leave empty if unknown.
+  ///
+  void SetMimeType(const std::string& inputFormat)
+  {
+    strncpy(m_cStructure->strMimeType, inputFormat.c_str(), sizeof(m_cStructure->strMimeType) - 1);
+  }
+
+  /// @brief To get with @ref SetMimeType changed values.
+  std::string GetMimeType() const { return m_cStructure->strMimeType; }
+
+  /// @brief **optional**\n
+  /// The encryption ID or CaID of this channel (Conditional access systems).
+  ///
+  /// Lists about available ID's:
+  /// - http://www.dvb.org/index.php?id=174
+  /// - http://en.wikipedia.org/wiki/Conditional_access_system
+  ///
+  void SetEncryptionSystem(unsigned int encryptionSystem)
+  {
+    m_cStructure->iEncryptionSystem = encryptionSystem;
+  }
+
+  /// @brief To get with @ref SetEncryptionSystem changed values.
+  unsigned int GetEncryptionSystem() const { return m_cStructure->iEncryptionSystem; }
+
+  /// @brief **optional**\n
+  /// Path to the channel icon (if present).
+  void SetIconPath(const std::string& iconPath)
+  {
+    strncpy(m_cStructure->strIconPath, iconPath.c_str(), sizeof(m_cStructure->strIconPath) - 1);
+  }
+
+  /// @brief To get with @ref SetIconPath changed values.
+  std::string GetIconPath() const { return m_cStructure->strIconPath; }
+
+  /// @brief **optional**\n
+  /// **true** if this channel is marked as hidden.
+  void SetIsHidden(bool isHidden) { m_cStructure->bIsHidden = isHidden; }
+
+  /// @brief To get with @ref GetIsRadio changed values.
+  bool GetIsHidden() const { return m_cStructure->bIsHidden; }
+
+  /// @brief **optional**\n
+  /// **true** if this channel has a server-side back buffer.
+  void SetHasArchive(bool hasArchive) { m_cStructure->bHasArchive = hasArchive; }
+
+  /// @brief To get with @ref GetIsRadio changed values.
+  bool GetHasArchive() const { return m_cStructure->bHasArchive; }
+
+  /// @brief **optional**\n
+  /// The value denoting the order of this channel in the 'All channels' group.
+  void SetOrder(bool order) { m_cStructure->iOrder = order; }
+
+  /// @brief To get with @ref SetOrder changed values.
+  bool GetOrder() const { return m_cStructure->iOrder; }
+  ///@}
+
+private:
+  PVRChannel(const PVR_CHANNEL* channel) : CStructHdl(channel) {}
+  PVRChannel(PVR_CHANNEL* channel) : CStructHdl(channel) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Channel_PVRChannelsResultSet class PVRChannelsResultSet
+/// @ingroup cpp_kodi_addon_pvr_Defs_Channel_PVRChannel
+/// @brief **PVR add-on channel transfer class**\n
+/// To transfer the content of @ref kodi::addon::CInstancePVRClient::GetChannels().
+///
+///@{
+class PVRChannelsResultSet
+{
+public:
+  /*! \cond PRIVATE */
+  PVRChannelsResultSet() = delete;
+  PVRChannelsResultSet(const AddonInstance_PVR* instance, ADDON_HANDLE handle)
+    : m_instance(instance), m_handle(handle)
+  {
+  }
+  /*! \endcond */
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Channel_PVRChannelsResultSet
+  ///@{
+
+  /// @brief To add and give content from addon to Kodi on related call.
+  ///
+  /// @param[in] tag The to transferred data.
+  void Add(const kodi::addon::PVRChannel& tag)
+  {
+    m_instance->toKodi->TransferChannelEntry(m_instance->toKodi->kodiInstance, m_handle, tag);
+  }
+
+  ///@}
+
+private:
+  const AddonInstance_PVR* m_instance = nullptr;
+  const ADDON_HANDLE m_handle;
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Channel_PVRSignalStatus class PVRSignalStatus
+/// @ingroup cpp_kodi_addon_pvr_Defs_Channel
+/// @brief **PVR Signal status information**\n
+/// This class gives current status information from stream to Kodi.
+///
+/// Used to get information for user by call of @ref kodi::addon::CInstancePVRClient::GetSignalStatus()
+/// to see current quality and source.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Channel_PVRSignalStatus_Help
+///
+///@{
+class PVRSignalStatus : public CStructHdl<PVRSignalStatus, PVR_SIGNAL_STATUS>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRSignalStatus() = default;
+  PVRSignalStatus(const PVRSignalStatus& type) : CStructHdl(type) {}
+  /*! \endcond */
+
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Channel_PVRSignalStatus_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Channel_PVRSignalStatus
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Channel_PVRSignalStatus :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **Adapter name** | `std::string` | @ref PVRSignalStatus::SetAdapterName "SetAdapterName" | @ref PVRSignalStatus::GetAdapterName "GetAdapterName" | *optional*
+  /// | **Adapter status** | `std::string` | @ref PVRSignalStatus::SetAdapterStatus "SetAdapterStatus" | @ref PVRSignalStatus::GetAdapterStatus "GetAdapterStatus" | *optional*
+  /// | **Service name** | `std::string` | @ref PVRSignalStatus::SetServiceName "SetServiceName" | @ref PVRSignalStatus::GetServiceName "GetServiceName" | *optional*
+  /// | **Provider name** | `std::string` | @ref PVRSignalStatus::SetProviderName "SetProviderName" | @ref PVRSignalStatus::GetProviderName "GetProviderName" | *optional*
+  /// | **Mux name** | `std::string` | @ref PVRSignalStatus::SetMuxName "SetMuxName" | @ref PVRSignalStatus::GetMuxName "GetMuxName" | *optional*
+  /// | **Signal/noise ratio** | `int` | @ref PVRSignalStatus::SetSNR "SetSNR" | @ref PVRSignalStatus::GetSNR "GetSNR" | *optional*
+  /// | **Signal strength** | `int` | @ref PVRSignalStatus::SetSignal "SetSignal" | @ref PVRSignalStatus::GetSignal "GetSignal" | *optional*
+  /// | **Bit error rate** | `long` | @ref PVRSignalStatus::SetBER "SetBER" | @ref PVRSignalStatus::GetBER "GetBER" | *optional*
+  /// | **Uncorrected blocks** | `long` | @ref PVRSignalStatus::SetUNC "SetUNC" | @ref PVRSignalStatus::GetUNC "GetUNC" | *optional*
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Channel_PVRSignalStatus
+  ///@{
+
+  /// @brief **optional**\n
+  /// Name of the adapter that's being used.
+  void SetAdapterName(const std::string& adapterName)
+  {
+    strncpy(m_cStructure->strAdapterName, adapterName.c_str(),
+            sizeof(m_cStructure->strAdapterName) - 1);
+  }
+
+  /// @brief To get with @ref SetAdapterName changed values.
+  std::string GetAdapterName() const { return m_cStructure->strAdapterName; }
+
+  /// @brief **optional**\n
+  /// Status of the adapter that's being used.
+  void SetAdapterStatus(const std::string& adapterStatus)
+  {
+    strncpy(m_cStructure->strAdapterStatus, adapterStatus.c_str(),
+            sizeof(m_cStructure->strAdapterStatus) - 1);
+  }
+
+  /// @brief To get with @ref SetAdapterStatus changed values.
+  std::string GetAdapterStatus() const { return m_cStructure->strAdapterStatus; }
+
+  /// @brief **optional**\n
+  /// Name of the current service.
+  void SetServiceName(const std::string& serviceName)
+  {
+    strncpy(m_cStructure->strServiceName, serviceName.c_str(),
+            sizeof(m_cStructure->strServiceName) - 1);
+  }
+
+  /// @brief To get with @ref SetServiceName changed values.
+  std::string GetServiceName() const { return m_cStructure->strServiceName; }
+
+  /// @brief **optional**\n
+  /// Name of the current service's provider.
+  void SetProviderName(const std::string& providerName)
+  {
+    strncpy(m_cStructure->strProviderName, providerName.c_str(),
+            sizeof(m_cStructure->strProviderName) - 1);
+  }
+
+  /// @brief To get with @ref SetProviderName changed values.
+  std::string GetProviderName() const { return m_cStructure->strProviderName; }
+
+  /// @brief **optional**\n
+  /// Name of the current mux.
+  void SetMuxName(const std::string& muxName)
+  {
+    strncpy(m_cStructure->strMuxName, muxName.c_str(), sizeof(m_cStructure->strMuxName) - 1);
+  }
+
+  /// @brief To get with @ref SetMuxName changed values.
+  std::string GetMuxName() const { return m_cStructure->strMuxName; }
+
+  /// @brief **optional**\n
+  /// Signal/noise ratio.
+  ///
+  /// @note 100% is 0xFFFF 65535
+  void SetSNR(int snr) { m_cStructure->iSNR = snr; }
+
+  /// @brief To get with @ref SetSNR changed values.
+  int GetSNR() const { return m_cStructure->iSNR; }
+
+  /// @brief **optional**\n
+  /// Signal strength.
+  ///
+  /// @note 100% is 0xFFFF 65535
+  void SetSignal(int signal) { m_cStructure->iSignal = signal; }
+
+  /// @brief To get with @ref SetSignal changed values.
+  int GetSignal() const { return m_cStructure->iSignal; }
+
+  /// @brief **optional**\n
+  /// Bit error rate.
+  void SetBER(long ber) { m_cStructure->iBER = ber; }
+
+  /// @brief To get with @ref SetBER changed values.
+  long GetBER() const { return m_cStructure->iBER; }
+
+  /// @brief **optional**\n
+  /// Uncorrected blocks:
+  void SetUNC(long unc) { m_cStructure->iUNC = unc; }
+
+  /// @brief To get with @ref SetBER changed values.
+  long GetUNC() const { return m_cStructure->iUNC; }
+  ///@}
+
+private:
+  PVRSignalStatus(const PVR_SIGNAL_STATUS* type) : CStructHdl(type) {}
+  PVRSignalStatus(PVR_SIGNAL_STATUS* type) : CStructHdl(type) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo class PVRDescrambleInfo
+/// @ingroup cpp_kodi_addon_pvr_Defs_Channel
+/// @brief **Data structure for descrample info**\n
+/// Information data to give via this to Kodi.
+///
+/// As description see also here https://en.wikipedia.org/wiki/Conditional_access.
+///
+/// Used on @ref kodi::addon::CInstancePVRClient::GetDescrambleInfo().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo_Help
+///
+///@{
+class PVRDescrambleInfo : public CStructHdl<PVRDescrambleInfo, PVR_DESCRAMBLE_INFO>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRDescrambleInfo()
+  {
+    m_cStructure->iPid = PVR_DESCRAMBLE_INFO_NOT_AVAILABLE;
+    m_cStructure->iCaid = PVR_DESCRAMBLE_INFO_NOT_AVAILABLE;
+    m_cStructure->iProvid = PVR_DESCRAMBLE_INFO_NOT_AVAILABLE;
+    m_cStructure->iEcmTime = PVR_DESCRAMBLE_INFO_NOT_AVAILABLE;
+    m_cStructure->iHops = PVR_DESCRAMBLE_INFO_NOT_AVAILABLE;
+  }
+  PVRDescrambleInfo(const PVRDescrambleInfo& type) : CStructHdl(type) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **Packet identifier** | `int` | @ref PVRDescrambleInfo::SetPID "SetPID" | @ref PVRDescrambleInfo::GetPID "GetPID" | *optional*
+  /// | **Conditional access identifier** | `int` | @ref PVRDescrambleInfo::SetCAID "SetCAID" | @ref PVRDescrambleInfo::GetCAID "GetCAID" | *optional*
+  /// | **Provider-ID** | `int` | @ref PVRDescrambleInfo::SetProviderID "SetProviderID" | @ref PVRDescrambleInfo::GetProviderID "GetProviderID" | *optional*
+  /// | **ECM time** | `int` | @ref PVRDescrambleInfo::SetECMTime "SetECMTime" | @ref PVRDescrambleInfo::GetECMTime "GetECMTime" | *optional*
+  /// | **Hops** | `int` | @ref PVRDescrambleInfo::SetHops "SetHops" | @ref PVRDescrambleInfo::GetHops "GetHops" | *optional*
+  /// | **Descramble card system** | `std::string` | @ref PVRDescrambleInfo::SetHops "SetHops" | @ref PVRDescrambleInfo::GetHops "GetHops" | *optional*
+  /// | **Reader** | `std::string` | @ref PVRDescrambleInfo::SetReader "SetReader" | @ref PVRDescrambleInfo::GetReader "GetReader" | *optional*
+  /// | **From** | `std::string` | @ref PVRDescrambleInfo::SetFrom "SetFrom" | @ref PVRDescrambleInfo::GetFrom "GetFrom" | *optional*
+  /// | **Protocol** | `std::string` | @ref PVRDescrambleInfo::SetProtocol "SetProtocol" | @ref PVRDescrambleInfo::GetProtocol "GetProtocol" | *optional*
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo
+  ///@{
+
+  /// @brief **optional**\n
+  /// Packet identifier.
+  ///
+  /// Each table or elementary stream in a transport stream is identified by
+  /// a 13-bit packet identifier (PID).
+  ///
+  /// Is @ref PVR_DESCRAMBLE_INFO_NOT_AVAILABLE as default, if not available
+  void SetPID(int pid) { m_cStructure->iPid = pid; }
+
+  /// @brief To get with @ref SetPID changed values
+  int GetPID() const { return m_cStructure->iPid; }
+
+  /// @brief **optional**\n
+  /// Conditional access identifier.
+  ///
+  /// Conditional access (abbreviated CA) or conditional access system (abbreviated CAS)
+  /// is the protection of content by requiring certain criteria to be met before granting
+  /// access to the content.
+  ///
+  /// Available CA system ID's listed here https://www.dvbservices.com/identifiers/ca_system_id.
+  ///
+  /// @ref PVR_DESCRAMBLE_INFO_NOT_AVAILABLE if not available.
+  void SetCAID(int iCaid) { m_cStructure->iCaid = iCaid; }
+
+  /// @brief To get with @ref SetCAID changed values.
+  int GetCAID() const { return m_cStructure->iCaid; }
+
+  /// @brief **optional**\n
+  /// Provider-ID.
+  ///
+  /// Is @ref PVR_DESCRAMBLE_INFO_NOT_AVAILABLE as default, if not available.
+  void SetProviderID(int provid) { m_cStructure->iProvid = provid; }
+
+  /// @brief To get with @ref SetProviderID changed values
+  int GetProviderID() const { return m_cStructure->iProvid; }
+
+  /// @brief **optional**\n
+  /// ECM time.
+  ///
+  /// Is @ref PVR_DESCRAMBLE_INFO_NOT_AVAILABLE as default, if not available.
+  void SetECMTime(int ecmTime) { m_cStructure->iEcmTime = ecmTime; }
+
+  /// @brief To get with @ref SetECMTime changed values.
+  int GetECMTime() const { return m_cStructure->iEcmTime; }
+
+  /// @brief **optional**\n
+  /// Hops.
+  ///
+  /// Is @ref PVR_DESCRAMBLE_INFO_NOT_AVAILABLE as default, if not available.
+  void SetHops(int hops) { m_cStructure->iHops = hops; }
+
+  /// @brief To get with @ref SetHops changed values.
+  int GetHops() const { return m_cStructure->iHops; }
+
+  /// @brief **optional**\n
+  /// Empty string if not available.
+  void SetCardSystem(const std::string& cardSystem)
+  {
+    strncpy(m_cStructure->strCardSystem, cardSystem.c_str(),
+            sizeof(m_cStructure->strCardSystem) - 1);
+  }
+
+  /// @brief To get with @ref SetCardSystem changed values.
+  std::string GetCardSystem() const { return m_cStructure->strCardSystem; }
+
+  /// @brief **optional**\n
+  /// Empty string if not available.
+  void SetReader(const std::string& reader)
+  {
+    strncpy(m_cStructure->strReader, reader.c_str(), sizeof(m_cStructure->strReader) - 1);
+  }
+
+  /// @brief To get with @ref SetReader changed values.
+  std::string GetReader() const { return m_cStructure->strReader; }
+
+  /// @brief **optional**\n
+  /// Empty string if not available.
+  void SetFrom(const std::string& from)
+  {
+    strncpy(m_cStructure->strFrom, from.c_str(), sizeof(m_cStructure->strFrom) - 1);
+  }
+
+  /// @brief To get with @ref SetFrom changed values.
+  std::string GetFrom() const { return m_cStructure->strFrom; }
+
+  /// @brief **optional**\n
+  /// Empty string if not available.
+  void SetProtocol(const std::string& protocol)
+  {
+    strncpy(m_cStructure->strProtocol, protocol.c_str(), sizeof(m_cStructure->strProtocol) - 1);
+  }
+
+  /// @brief To get with @ref SetProtocol changed values.
+  std::string GetProtocol() const { return m_cStructure->strProtocol; }
+  ///@}
+
+private:
+  PVRDescrambleInfo(const PVR_DESCRAMBLE_INFO* type) : CStructHdl(type) {}
+  PVRDescrambleInfo(PVR_DESCRAMBLE_INFO* type) : CStructHdl(type) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EDL.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EDL.h
new file mode 100644
index 0000000..34c7c41
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EDL.h
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr/pvr_edl.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 8 - PVR Edit definition list (EDL)
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry class PVREDLEntry
+/// @ingroup cpp_kodi_addon_pvr_Defs_EDLEntry
+/// @brief **Edit definition list (EDL) entry**\n
+/// Time places and type of related fields.
+///
+/// This used within @ref cpp_kodi_addon_pvr_EPGTag "EPG" and
+/// @ref cpp_kodi_addon_pvr_Recordings "recordings".
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry_Help
+///
+///@{
+class PVREDLEntry : public CStructHdl<PVREDLEntry, PVR_EDL_ENTRY>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVREDLEntry() { memset(m_cStructure, 0, sizeof(PVR_EDL_ENTRY)); }
+  PVREDLEntry(const PVREDLEntry& type) : CStructHdl(type) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **Start time** | `int64_t` | @ref PVREDLEntry::SetStart "SetStart" | @ref PVREDLEntry::GetStart "GetStart" | *required to set*
+  /// | **End time** | `int64_t` | @ref PVREDLEntry::SetEnd "SetEnd" | @ref PVREDLEntry::GetEnd "GetEnd" | *required to set*
+  /// | **Type** | @ref PVR_EDL_TYPE | @ref PVREDLEntry::SetType "SetType" | @ref PVREDLEntry::GetType "GetType" | *required to set*
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry
+  ///@{
+
+  /// @brief Start time in milliseconds.
+  void SetStart(int64_t start) { m_cStructure->start = start; }
+
+  /// @brief To get with @ref SetStart() changed values.
+  int64_t GetStart() const { return m_cStructure->start; }
+
+  /// @brief End time in milliseconds.
+  void SetEnd(int64_t end) { m_cStructure->end = end; }
+
+  /// @brief To get with @ref SetEnd() changed values.
+  int64_t GetEnd() const { return m_cStructure->end; }
+
+  /// @brief The with @ref PVR_EDL_TYPE used definition list type.
+  void SetType(PVR_EDL_TYPE type) { m_cStructure->type = type; }
+
+  /// @brief To get with @ref SetType() changed values.
+  PVR_EDL_TYPE GetType() const { return m_cStructure->type; }
+  ///@}
+
+private:
+  PVREDLEntry(const PVR_EDL_ENTRY* type) : CStructHdl(type) {}
+  PVREDLEntry(PVR_EDL_ENTRY* type) : CStructHdl(type) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h
new file mode 100644
index 0000000..e1fc04f
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/EPG.h
@@ -0,0 +1,500 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 4 - PVR EPG
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_epg_PVREPGTag class PVREPGTag
+/// @ingroup cpp_kodi_addon_pvr_Defs_epg
+/// @brief **PVR add-on EPG data tag**\n
+/// Representation of an EPG event.
+///
+/// Herewith all EPG related data are saved in one class whereby the data can
+/// be exchanged with Kodi, or can also be used on the addon to save there.
+///
+/// See @ref cpp_kodi_addon_pvr_EPGTag "EPG methods" about usage.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_epg_PVREPGTag_Help
+///
+///@{
+class PVREPGTag : public CStructHdl<PVREPGTag, EPG_TAG>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVREPGTag()
+  {
+    memset(m_cStructure, 0, sizeof(EPG_TAG));
+    m_cStructure->iSeriesNumber = EPG_TAG_INVALID_SERIES_EPISODE;
+    m_cStructure->iEpisodeNumber = EPG_TAG_INVALID_SERIES_EPISODE;
+    m_cStructure->iEpisodePartNumber = EPG_TAG_INVALID_SERIES_EPISODE;
+  }
+  PVREPGTag(const PVREPGTag& epg) : CStructHdl(epg)
+  {
+    m_title = epg.m_title;
+    m_plotOutline = epg.m_plotOutline;
+    m_plot = epg.m_plot;
+    m_originalTitle = epg.m_originalTitle;
+    m_cast = epg.m_cast;
+    m_director = epg.m_director;
+    m_writer = epg.m_writer;
+    m_IMDBNumber = epg.m_IMDBNumber;
+    m_iconPath = epg.m_iconPath;
+    m_genreDescription = epg.m_genreDescription;
+    m_episodeName = epg.m_episodeName;
+    m_seriesLink = epg.m_seriesLink;
+    m_firstAired = epg.m_firstAired;
+  }
+  /*! \endcond */
+
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_epg_PVREPGTag_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_PVREPGTag
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|---------
+  /// | **Unique broadcast id** | `unsigned int` | @ref PVREPGTag::SetUniqueBroadcastId "SetUniqueBroadcastId" | @ref PVREPGTag::GetUniqueBroadcastId "GetUniqueBroadcastId" | *required to set*
+  /// | **Unique channel id** | `unsigned int` | @ref PVREPGTag::SetUniqueChannelId "SetUniqueChannelId" | @ref PVREPGTag::GetUniqueChannelId "GetUniqueChannelId" | *required to set*
+  /// | **Title** | `std::string` | @ref PVREPGTag::SetTitle "SetTitle" | @ref PVREPGTag::GetTitle "GetTitle" | *required to set*
+  /// | **Start time** | `time_t` | @ref PVREPGTag::SetStartTime "SetStartTime" | @ref PVREPGTag::GetStartTime "GetStartTime" | *required to set*
+  /// | **End time** | `time_t` | @ref PVREPGTag::SetEndTime "SetEndTime" | @ref PVREPGTag::GetEndTime "GetEndTime" | *required to set*
+  /// | **Plot outline** | `std::string` | @ref PVREPGTag::SetPlotOutline "SetPlotOutline" | @ref PVREPGTag::GetPlotOutline "GetPlotOutline" | *optional*
+  /// | **Plot** | `std::string` | @ref PVREPGTag::SetPlot "SetPlot" | @ref PVREPGTag::GetPlot "GetPlot" | *optional*
+  /// | **Original title** | `std::string` | @ref PVREPGTag::SetOriginalTitle "SetOriginalTitle" | @ref PVREPGTag::GetOriginalTitle "GetOriginalTitle" | *optional*
+  /// | **Cast** | `std::string` | @ref PVREPGTag::SetCast "SetCast" | @ref PVREPGTag::GetCast "GetCast" | *optional*
+  /// | **Director** | `std::string` | @ref PVREPGTag::SetDirector "SetDirector" | @ref PVREPGTag::GetDirector "GetDirector" | *optional*
+  /// | **Writer** | `std::string` | @ref PVREPGTag::SetWriter "SetWriter" | @ref PVREPGTag::GetWriter "GetWriter" | *optional*
+  /// | **Year** | `int` | @ref PVREPGTag::SetYear "SetYear" | @ref PVREPGTag::GetYear "GetYear" | *optional*
+  /// | **IMDB number** | `std::string` | @ref PVREPGTag::SetIMDBNumber "SetIMDBNumber" | @ref PVREPGTag::GetIMDBNumber "GetIMDBNumber" | *optional*
+  /// | **Icon path** | `std::string` | @ref PVREPGTag::SetIconPath "SetIconPath" | @ref PVREPGTag::GetIconPath "GetIconPath" | *optional*
+  /// | **Genre type** | `int` | @ref PVREPGTag::SetGenreType "SetGenreType" | @ref PVREPGTag::GetGenreType "GetGenreType" | *optional*
+  /// | **Genre sub type** | `int` | @ref PVREPGTag::SetGenreSubType "SetGenreSubType" | @ref PVREPGTag::GetGenreSubType "GetGenreSubType" | *optional*
+  /// | **Genre description** | `std::string` | @ref PVREPGTag::SetGenreDescription "SetGenreDescription" | @ref PVREPGTag::GetGenreDescription "GetGenreDescription" | *optional*
+  /// | **First aired** | `time_t` | @ref PVREPGTag::SetFirstAired "SetFirstAired" | @ref PVREPGTag::GetFirstAired "GetFirstAired" | *optional*
+  /// | **Parental rating** | `int` | @ref PVREPGTag::SetParentalRating "SetParentalRating" | @ref PVREPGTag::GetParentalRating "GetParentalRating" | *optional*
+  /// | **Star rating** | `int` | @ref PVREPGTag::SetStarRating "SetStarRating" | @ref PVREPGTag::GetStarRating "GetStarRating" | *optional*
+  /// | **Series number** | `int` | @ref PVREPGTag::SetSeriesNumber "SetSeriesNumber" | @ref PVREPGTag::GetSeriesNumber "GetSeriesNumber" | *optional*
+  /// | **Episode number** | `int` | @ref PVREPGTag::SetEpisodeNumber "SetEpisodeNumber" | @ref PVREPGTag::GetEpisodeNumber "GetEpisodeNumber" | *optional*
+  /// | **Episode part number** | `int` | @ref PVREPGTag::SetEpisodePartNumber "SetEpisodePartNumber" | @ref PVREPGTag::GetEpisodePartNumber "GetEpisodePartNumber" | *optional*
+  /// | **Episode name** | `std::string` | @ref PVREPGTag::SetEpisodeName "SetEpisodeName" | @ref PVREPGTag::GetEpisodeName "GetEpisodeName" | *optional*
+  /// | **Flags** | `unsigned int` | @ref PVREPGTag::SetFlags "SetFlags" | @ref PVREPGTag::GetFlags "GetFlags" | *optional*
+  /// | **Series link** | `std::string` | @ref PVREPGTag::SetSeriesLink "SetSeriesLink" | @ref PVREPGTag::GetSeriesLink "GetSeriesLink" | *optional*
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_epg_PVREPGTag
+  ///@{
+
+  /// @brief **required**\n
+  /// Identifier for this event. Event uids must be unique for a channel. Valid uids must be greater than @ref EPG_TAG_INVALID_UID.
+  void SetUniqueBroadcastId(unsigned int uniqueBroadcastId)
+  {
+    m_cStructure->iUniqueBroadcastId = uniqueBroadcastId;
+  }
+
+  /// @brief To get with @ref SetUniqueBroadcastId changed values.
+  unsigned int GetUniqueBroadcastId() const { return m_cStructure->iUniqueBroadcastId; }
+
+  /// @brief **required**\n
+  /// Unique identifier of the channel this event belongs to.
+  void SetUniqueChannelId(unsigned int uniqueChannelId)
+  {
+    m_cStructure->iUniqueChannelId = uniqueChannelId;
+  }
+
+  /// @brief To get with @ref SetUniqueChannelId changed values
+  unsigned int GetUniqueChannelId() const { return m_cStructure->iUniqueChannelId; }
+
+  /// @brief **required**\n
+  /// This event's title.
+  void SetTitle(const std::string& title) { m_title = title; }
+
+  /// @brief To get with @ref SetTitle changed values.
+  std::string GetTitle() const { return m_title; }
+
+  /// @brief **required**\n
+  /// Start time in UTC.
+  ///
+  /// Seconds elapsed since 00:00 hours, Jan 1, 1970 UTC.
+  void SetStartTime(time_t startTime) { m_cStructure->startTime = startTime; }
+
+  /// @brief To get with @ref SetStartTime changed values.
+  time_t GetStartTime() const { return m_cStructure->startTime; }
+
+  /// @brief **required**\n
+  /// End time in UTC.
+  ///
+  /// Seconds elapsed since 00:00 hours, Jan 1, 1970 UTC.
+  void SetEndTime(time_t endTime) { m_cStructure->endTime = endTime; }
+
+  /// @brief To get with @ref SetEndTime changed values.
+  time_t GetEndTime() const { return m_cStructure->endTime; }
+
+  /// @brief **optional**\n
+  /// Plot outline name.
+  void SetPlotOutline(const std::string& plotOutline) { m_plotOutline = plotOutline; }
+
+  /// @brief To get with @ref SetPlotOutline changed values.
+  std::string GetPlotOutline() const { return m_plotOutline; }
+
+  /// @brief **optional**\n
+  /// Plot name.
+  void SetPlot(const std::string& plot) { m_plot = plot; }
+
+  /// @brief To get with @ref GetPlot changed values.
+  std::string GetPlot() const { return m_plot; }
+
+  /// @brief **optional**\n
+  /// Original title.
+  void SetOriginalTitle(const std::string& originalTitle) { m_originalTitle = originalTitle; }
+
+  /// @brief To get with @ref SetOriginalTitle changed values
+  std::string GetOriginalTitle() const { return m_originalTitle; }
+
+  /// @brief **optional**\n
+  /// Cast name(s).
+  ///
+  /// @note Use @ref EPG_STRING_TOKEN_SEPARATOR to separate different persons.
+  void SetCast(const std::string& cast) { m_cast = cast; }
+
+  /// @brief To get with @ref SetCast changed values
+  std::string GetCast() const { return m_cast; }
+
+  /// @brief **optional**\n
+  /// Director name(s).
+  ///
+  /// @note Use @ref EPG_STRING_TOKEN_SEPARATOR to separate different persons.
+  void SetDirector(const std::string& director) { m_director = director; }
+
+  /// @brief To get with @ref SetDirector changed values.
+  std::string GetDirector() const { return m_director; }
+
+  /// @brief **optional**\n
+  /// Writer name(s).
+  ///
+  /// @note Use @ref EPG_STRING_TOKEN_SEPARATOR to separate different persons.
+  void SetWriter(const std::string& writer) { m_writer = writer; }
+
+  /// @brief To get with @ref SetDirector changed values
+  std::string GetWriter() const { return m_writer; }
+
+  /// @brief **optional**\n
+  /// Year.
+  void SetYear(int year) { m_cStructure->iYear = year; }
+
+  /// @brief To get with @ref SetYear changed values.
+  int GetYear() const { return m_cStructure->iYear; }
+
+  /// @brief **optional**\n
+  /// [IMDB](https://en.wikipedia.org/wiki/IMDb) identification number.
+  void SetIMDBNumber(const std::string& IMDBNumber) { m_IMDBNumber = IMDBNumber; }
+
+  /// @brief To get with @ref SetIMDBNumber changed values.
+  std::string GetIMDBNumber() const { return m_IMDBNumber; }
+
+  /// @brief **optional**\n
+  /// Icon path.
+  void SetIconPath(const std::string& iconPath) { m_iconPath = iconPath; }
+
+  /// @brief To get with @ref SetIconPath changed values.
+  std::string GetIconPath() const { return m_iconPath; }
+
+  /// @brief **optional**\n
+  /// Genre type.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails EPG_EVENT_CONTENTMASK
+  ///
+  /// Use @ref EPG_GENRE_USE_STRING if type becomes given by @ref SetGenreDescription.
+  ///
+  /// @note If confirmed that backend brings the types in [ETSI EN 300 468](https://www.etsi.org/deliver/etsi_en/300400_300499/300468/01.14.01_60/en_300468v011401p.pdf)
+  /// conform values, can be @ref EPG_EVENT_CONTENTMASK ignored and to set here
+  /// with backend value.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example 1:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVREPGTag tag;
+  /// tag.SetGenreType(EPG_EVENT_CONTENTMASK_MOVIEDRAMA);
+  /// ~~~~~~~~~~~~~
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example 2** (in case of other, not ETSI EN 300 468 conform genre types):
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVREPGTag tag;
+  /// tag.SetGenreType(EPG_GENRE_USE_STRING);
+  /// tag.SetGenreDescription("My special genre name"); // Should use (if possible) kodi::GetLocalizedString(...) to have match user language.
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetGenreType(int genreType) { m_cStructure->iGenreType = genreType; }
+
+  /// @brief To get with @ref SetGenreType changed values
+  int GetGenreType() const { return m_cStructure->iGenreType; }
+
+  /// @brief **optional**\n
+  /// Genre sub type.
+  ///
+  /// @copydetails EPG_EVENT_CONTENTMASK
+  ///
+  /// Subtypes groups related to set by @ref SetGenreType:
+  /// | Main genre type | List with available sub genre types
+  /// |-----------------|-----------------------------------------
+  /// | @ref EPG_EVENT_CONTENTMASK_UNDEFINED | Nothing, should be 0
+  /// | @ref EPG_EVENT_CONTENTMASK_MOVIEDRAMA | @ref EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA
+  /// | @ref EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS | @ref EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS
+  /// | @ref EPG_EVENT_CONTENTMASK_SHOW | @ref EPG_EVENT_CONTENTSUBMASK_SHOW
+  /// | @ref EPG_EVENT_CONTENTMASK_SPORTS | @ref EPG_EVENT_CONTENTSUBMASK_SPORTS
+  /// | @ref EPG_EVENT_CONTENTMASK_CHILDRENYOUTH | @ref EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH
+  /// | @ref EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE | @ref EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE
+  /// | @ref EPG_EVENT_CONTENTMASK_ARTSCULTURE | @ref EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE
+  /// | @ref EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS | @ref EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS
+  /// | @ref EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE | @ref EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE
+  /// | @ref EPG_EVENT_CONTENTMASK_LEISUREHOBBIES | @ref EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES
+  /// | @ref EPG_EVENT_CONTENTMASK_SPECIAL | @ref EPG_EVENT_CONTENTSUBMASK_SPECIAL
+  /// | @ref EPG_EVENT_CONTENTMASK_USERDEFINED | Can be defined by you
+  /// | @ref EPG_GENRE_USE_STRING | **Kodi's own value**, which declares that the type with @ref SetGenreDescription is given.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVREPGTag tag;
+  /// tag.SetGenreType(EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE);
+  /// tag.SetGenreSubType(EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_JAZZ);
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetGenreSubType(int genreSubType) { m_cStructure->iGenreSubType = genreSubType; }
+
+  /// @brief To get with @ref SetGenreSubType changed values.
+  int GetGenreSubType() const { return m_cStructure->iGenreSubType; }
+
+  /// @brief **optional**\n genre. Will be used only when genreType == @ref EPG_GENRE_USE_STRING
+  /// or genreSubType == @ref EPG_GENRE_USE_STRING.
+  ///
+  /// Use @ref EPG_STRING_TOKEN_SEPARATOR to separate different genres.
+  ///
+  /// In case of other, not [ETSI EN 300 468](https://www.etsi.org/deliver/etsi_en/300400_300499/300468/01.14.01_60/en_300468v011401p.pdf)
+  /// conform genre types or something special.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVREPGTag tag;
+  /// tag.SetGenreType(EPG_GENRE_USE_STRING);
+  /// tag.SetGenreDescription("Action" + EPG_STRING_TOKEN_SEPARATOR + "Thriller");
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetGenreDescription(const std::string& genreDescription)
+  {
+    m_genreDescription = genreDescription;
+  }
+
+  /// @brief To get with @ref SetGenreDescription changed values.
+  std::string GetGenreDescription() const { return m_genreDescription; }
+
+  /// @brief **optional**\n
+  /// First aired in UTC.
+  void SetFirstAired(const std::string& firstAired) { m_firstAired = firstAired; }
+
+  /// @brief To get with @ref SetFirstAired changed values.
+  std::string GetFirstAired() const { return m_firstAired; }
+
+  /// @brief **optional**\n
+  /// Parental rating.
+  void SetParentalRating(int parentalRating) { m_cStructure->iParentalRating = parentalRating; }
+
+  /// @brief To get with @ref SetParentalRatinge changed values.
+  int GetParentalRating() const { return m_cStructure->iParentalRating; }
+
+  /// @brief **optional**\n
+  /// Star rating.
+  void SetStarRating(int starRating) { m_cStructure->iStarRating = starRating; }
+
+  /// @brief To get with @ref SetStarRating changed values.
+  int GetStarRating() const { return m_cStructure->iStarRating; }
+
+  /// @brief **optional**\n
+  /// Series number.
+  void SetSeriesNumber(int seriesNumber) { m_cStructure->iSeriesNumber = seriesNumber; }
+
+  /// @brief To get with @ref SetSeriesNumber changed values.
+  int GetSeriesNumber() const { return m_cStructure->iSeriesNumber; }
+
+  /// @brief **optional**\n
+  /// Episode number.
+  void SetEpisodeNumber(int episodeNumber) { m_cStructure->iEpisodeNumber = episodeNumber; }
+
+  /// @brief To get with @ref SetEpisodeNumber changed values.
+  int GetEpisodeNumber() const { return m_cStructure->iEpisodeNumber; }
+
+  /// @brief **optional**\n
+  /// Episode part number.
+  void SetEpisodePartNumber(int episodePartNumber)
+  {
+    m_cStructure->iEpisodePartNumber = episodePartNumber;
+  }
+
+  /// @brief To get with @ref SetEpisodePartNumber changed values.
+  int GetEpisodePartNumber() const { return m_cStructure->iEpisodePartNumber; }
+
+  /// @brief **optional**\n
+  /// Episode name.
+  void SetEpisodeName(const std::string& episodeName) { m_episodeName = episodeName; }
+
+  /// @brief To get with @ref SetEpisodeName changed values.
+  std::string GetEpisodeName() const { return m_episodeName; }
+
+  /// @brief **optional**\n
+  /// Bit field of independent flags associated with the EPG entry.
+  ///
+  /// See @ref cpp_kodi_addon_pvr_Defs_epg_EPG_TAG_FLAG for available bit flags.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_epg_EPG_TAG_FLAG
+  ///
+  void SetFlags(unsigned int flags) { m_cStructure->iFlags = flags; }
+
+  /// @brief To get with @ref SetFlags changed values.
+  unsigned int GetFlags() const { return m_cStructure->iFlags; }
+
+  /// @brief **optional**\n
+  /// Series link for this event.
+  void SetSeriesLink(const std::string& seriesLink) { m_seriesLink = seriesLink; }
+
+  /// @brief To get with @ref SetSeriesLink changed values.
+  std::string GetSeriesLink() const { return m_seriesLink; }
+
+  ///@}
+
+  // Internal used, as this have own memory for strings and to translate them to "C"
+  EPG_TAG* GetTag() const
+  {
+    m_cStructure->strTitle = m_title.c_str();
+    m_cStructure->strPlotOutline = m_plotOutline.c_str();
+    m_cStructure->strPlot = m_plot.c_str();
+    m_cStructure->strOriginalTitle = m_originalTitle.c_str();
+    m_cStructure->strCast = m_cast.c_str();
+    m_cStructure->strDirector = m_director.c_str();
+    m_cStructure->strWriter = m_writer.c_str();
+    m_cStructure->strIMDBNumber = m_IMDBNumber.c_str();
+    m_cStructure->strIconPath = m_iconPath.c_str();
+    m_cStructure->strGenreDescription = m_genreDescription.c_str();
+    m_cStructure->strEpisodeName = m_episodeName.c_str();
+    m_cStructure->strSeriesLink = m_seriesLink.c_str();
+    m_cStructure->strFirstAired = m_firstAired.c_str();
+
+    return m_cStructure;
+  }
+
+private:
+  PVREPGTag(const EPG_TAG* epg) : CStructHdl(epg) { SetData(epg); }
+  PVREPGTag(EPG_TAG* epg) : CStructHdl(epg) { SetData(epg); }
+
+  const PVREPGTag& operator=(const PVREPGTag& right);
+  const PVREPGTag& operator=(const EPG_TAG& right);
+  operator EPG_TAG*();
+
+  std::string m_title;
+  std::string m_plotOutline;
+  std::string m_plot;
+  std::string m_originalTitle;
+  std::string m_cast;
+  std::string m_director;
+  std::string m_writer;
+  std::string m_IMDBNumber;
+  std::string m_episodeName;
+  std::string m_iconPath;
+  std::string m_seriesLink;
+  std::string m_genreDescription;
+  std::string m_firstAired;
+
+  void SetData(const EPG_TAG* tag)
+  {
+    m_title = tag->strTitle == nullptr ? "" : tag->strTitle;
+    m_plotOutline = tag->strPlotOutline == nullptr ? "" : tag->strPlotOutline;
+    m_plot = tag->strPlot == nullptr ? "" : tag->strPlot;
+    m_originalTitle = tag->strOriginalTitle == nullptr ? "" : tag->strOriginalTitle;
+    m_cast = tag->strCast == nullptr ? "" : tag->strCast;
+    m_director = tag->strDirector == nullptr ? "" : tag->strDirector;
+    m_writer = tag->strWriter == nullptr ? "" : tag->strWriter;
+    m_IMDBNumber = tag->strIMDBNumber == nullptr ? "" : tag->strIMDBNumber;
+    m_iconPath = tag->strIconPath == nullptr ? "" : tag->strIconPath;
+    m_genreDescription = tag->strGenreDescription == nullptr ? "" : tag->strGenreDescription;
+    m_episodeName = tag->strEpisodeName == nullptr ? "" : tag->strEpisodeName;
+    m_seriesLink = tag->strSeriesLink == nullptr ? "" : tag->strSeriesLink;
+    m_firstAired = tag->strFirstAired == nullptr ? "" : tag->strFirstAired;
+  }
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_epg_PVREPGTagsResultSet class PVREPGTagsResultSet
+/// @ingroup cpp_kodi_addon_pvr_Defs_epg_PVREPGTag
+/// @brief **PVR add-on EPG entry transfer class**\n
+/// To transfer the content of @ref kodi::addon::CInstancePVRClient::GetEPGForChannel().
+///
+/// @note This becomes only be used on addon call above, not usable outside on
+/// addon itself.
+///@{
+class PVREPGTagsResultSet
+{
+public:
+  /*! \cond PRIVATE */
+  PVREPGTagsResultSet() = delete;
+  PVREPGTagsResultSet(const AddonInstance_PVR* instance, ADDON_HANDLE handle)
+    : m_instance(instance), m_handle(handle)
+  {
+  }
+  /*! \endcond */
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_epg_PVREPGTagsResultSet
+  ///@{
+
+  /// @brief To add and give content from addon to Kodi on related call.
+  ///
+  /// @param[in] tag The to transferred data.
+  void Add(const kodi::addon::PVREPGTag& tag)
+  {
+    m_instance->toKodi->TransferEpgEntry(m_instance->toKodi->kodiInstance, m_handle, tag.GetTag());
+  }
+
+  ///@}
+
+private:
+  const AddonInstance_PVR* m_instance = nullptr;
+  const ADDON_HANDLE m_handle;
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/General.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/General.h
new file mode 100644
index 0000000..c7977c2
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/General.h
@@ -0,0 +1,511 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr/pvr_general.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 1 - General PVR
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_PVRTypeIntValue class PVRTypeIntValue
+/// @ingroup cpp_kodi_addon_pvr_Defs_General
+/// @brief **PVR add-on type value**\n
+/// Representation of a <b>`<int, std::string>`</b> event related value.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_PVRTypeIntValue_Help
+///
+///@{
+class PVRTypeIntValue : public CStructHdl<PVRTypeIntValue, PVR_ATTRIBUTE_INT_VALUE>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRTypeIntValue(const PVRTypeIntValue& data) : CStructHdl(data) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_PVRTypeIntValue_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_PVRTypeIntValue
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_PVRTypeIntValue :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Value** | `int` | @ref PVRTypeIntValue::SetValue "SetValue" | @ref PVRTypeIntValue::GetValue "GetValue"
+  /// | **Description** | `std::string` | @ref PVRTypeIntValue::SetDescription "SetDescription" | @ref PVRTypeIntValue::GetDescription "GetDescription"
+  ///
+  /// @remark Further can there be used his class constructor to set values.
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_PVRTypeIntValue
+  ///@{
+
+  /// @brief Default class constructor.
+  ///
+  /// @note Values must be set afterwards.
+  PVRTypeIntValue() = default;
+
+  /// @brief Class constructor with integrated value set.
+  ///
+  /// @param[in] value Type identification value
+  /// @param[in] description Type description text
+  PVRTypeIntValue(int value, const std::string& description)
+  {
+    SetValue(value);
+    SetDescription(description);
+  }
+
+  /// @brief To set with the identification value.
+  void SetValue(int value) { m_cStructure->iValue = value; }
+
+  /// @brief To get with the identification value.
+  int GetValue() const { return m_cStructure->iValue; }
+
+  /// @brief To set with the description text of the value.
+  void SetDescription(const std::string& description)
+  {
+    strncpy(m_cStructure->strDescription, description.c_str(),
+            sizeof(m_cStructure->strDescription) - 1);
+  }
+
+  /// @brief To get with the description text of the value.
+  std::string GetDescription() const { return m_cStructure->strDescription; }
+  ///@}
+
+private:
+  PVRTypeIntValue(const PVR_ATTRIBUTE_INT_VALUE* data) : CStructHdl(data) {}
+  PVRTypeIntValue(PVR_ATTRIBUTE_INT_VALUE* data) : CStructHdl(data) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_PVRCapabilities class PVRCapabilities
+/// @ingroup cpp_kodi_addon_pvr_Defs_General
+/// @brief **PVR add-on capabilities**\n
+/// This class is needed to tell Kodi which options are supported on the addon.
+///
+/// If a capability is set to **true**, then the corresponding methods from
+/// @ref cpp_kodi_addon_pvr "kodi::addon::CInstancePVRClient" need to be
+/// implemented.
+///
+/// As default them all set to **false**.
+///
+/// Used on @ref kodi::addon::CInstancePVRClient::GetCapabilities().
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_PVRCapabilities_Help
+///
+///@{
+class PVRCapabilities
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  explicit PVRCapabilities() = delete;
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_PVRCapabilities_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_PVRCapabilities
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_PVRCapabilities :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Supports EPG** | `boolean` | @ref PVRCapabilities::SetSupportsEPG "SetSupportsEPG" | @ref PVRCapabilities::GetSupportsEPG "GetSupportsEPG"
+  /// | **Supports EPG EDL** | `boolean` | @ref PVRCapabilities::SetSupportsEPGEdl "SetSupportsEPGEdl" | @ref PVRCapabilities::GetSupportsEPGEdl "GetSupportsEPGEdl"
+  /// | **Supports TV** | `boolean` | @ref PVRCapabilities::SetSupportsTV "SetSupportsTV" | @ref PVRCapabilities::GetSupportsTV "GetSupportsTV"
+  /// | **Supports radio** | `boolean` | @ref PVRCapabilities::SetSupportsRadio "SetSupportsRadio" | @ref PVRCapabilities::GetSupportsRadio "GetSupportsRadio"
+  /// | **Supports recordings** | `boolean` | @ref PVRCapabilities::SetSupportsRecordings "SetSupportsRecordings" | @ref PVRCapabilities::GetSupportsRecordings "GetSupportsRecordings"
+  /// | **Supports recordings undelete** | `boolean` | @ref PVRCapabilities::SetSupportsRecordingsUndelete "SetSupportsRecordingsUndelete" | @ref PVRCapabilities::GetSupportsRecordingsUndelete "SetSupportsRecordingsUndelete"
+  /// | **Supports timers** | `boolean` | @ref PVRCapabilities::SetSupportsTimers "SetSupportsTimers" | @ref PVRCapabilities::GetSupportsTimers "GetSupportsTimers"
+  /// | **Supports channel groups** | `boolean` | @ref PVRCapabilities::SetSupportsChannelGroups "SetSupportsChannelGroups" | @ref PVRCapabilities::GetSupportsChannelGroups "GetSupportsChannelGroups"
+  /// | **Supports channel scan** | `boolean` | @ref PVRCapabilities::SetSupportsChannelScan "SetSupportsChannelScan" | @ref PVRCapabilities::GetSupportsChannelScan "GetSupportsChannelScan"
+  /// | **Supports channel settings** | `boolean` | @ref PVRCapabilities::SetSupportsChannelSettings "SetSupportsChannelSettings" | @ref PVRCapabilities::GetSupportsChannelSettings "GetSupportsChannelSettings"
+  /// | **Handles input stream** | `boolean` | @ref PVRCapabilities::SetHandlesInputStream "SetHandlesInputStream" | @ref PVRCapabilities::GetHandlesInputStream "GetHandlesInputStream"
+  /// | **Handles demuxing** | `boolean` | @ref PVRCapabilities::SetHandlesDemuxing "SetHandlesDemuxing" | @ref PVRCapabilities::GetHandlesDemuxing "GetHandlesDemuxing"
+  /// | **Supports recording play count** | `boolean` | @ref PVRCapabilities::SetSupportsRecordingPlayCount "SetSupportsRecordingPlayCount" | @ref PVRCapabilities::GetSupportsRecordingPlayCount "GetSupportsRecordingPlayCount"
+  /// | **Supports last played position** | `boolean` | @ref PVRCapabilities::SetSupportsLastPlayedPosition "SetSupportsLastPlayedPosition" | @ref PVRCapabilities::GetSupportsLastPlayedPosition "GetSupportsLastPlayedPosition"
+  /// | **Supports recording EDL** | `boolean` | @ref PVRCapabilities::SetSupportsRecordingEdl "SetSupportsRecordingEdl" | @ref PVRCapabilities::GetSupportsRecordingEdl "GetSupportsRecordingEdl"
+  /// | **Supports recordings rename** | `boolean` | @ref PVRCapabilities::SetSupportsRecordingsRename "SetSupportsRecordingsRename" | @ref PVRCapabilities::GetSupportsRecordingsRename "GetSupportsRecordingsRename"
+  /// | **Supports recordings lifetime change** | `boolean` | @ref PVRCapabilities::SetSupportsRecordingsLifetimeChange "SetSupportsRecordingsLifetimeChange" | @ref PVRCapabilities::GetSupportsRecordingsLifetimeChange "GetSupportsRecordingsLifetimeChange"
+  /// | **Supports descramble info** | `boolean` | @ref PVRCapabilities::SetSupportsDescrambleInfo "SetSupportsDescrambleInfo" | @ref PVRCapabilities::GetSupportsDescrambleInfo "GetSupportsDescrambleInfo"
+  /// | **Supports async EPG transfer** | `boolean` | @ref PVRCapabilities::SetSupportsAsyncEPGTransfer "SetSupportsAsyncEPGTransfer" | @ref PVRCapabilities::GetSupportsAsyncEPGTransfer "GetSupportsAsyncEPGTransfer"
+  /// | **Supports recording size** | `boolean` | @ref PVRCapabilities::SetSupportsRecordingSize "SetSupportsRecordingSize" | @ref PVRCapabilities::GetSupportsRecordingSize "GetSupportsRecordingSize"
+  /// | **Recordings lifetime values** | @ref cpp_kodi_addon_pvr_Defs_PVRTypeIntValue "PVRTypeIntValue" | @ref PVRCapabilities::SetRecordingsLifetimeValues "SetRecordingsLifetimeValues" | @ref PVRCapabilities::GetRecordingsLifetimeValues "GetRecordingsLifetimeValues"
+  ///
+  /// @warning This class can not be used outside of @ref kodi::addon::CInstancePVRClient::GetCapabilities()
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_PVRCapabilities
+  ///@{
+
+  /// @brief Set **true** if the add-on provides EPG information.
+  void SetSupportsEPG(bool supportsEPG) { m_capabilities->bSupportsEPG = supportsEPG; }
+
+  /// @brief To get with @ref SetSupportsEPG changed values.
+  bool GetSupportsEPG() const { return m_capabilities->bSupportsEPG; }
+
+  /// @brief Set **true** if the backend supports retrieving an edit decision
+  /// list for an EPG tag.
+  void SetSupportsEPGEdl(bool supportsEPGEdl) { m_capabilities->bSupportsEPGEdl = supportsEPGEdl; }
+
+  /// @brief To get with @ref SetSupportsEPGEdl changed values.
+  bool GetSupportsEPGEdl() const { return m_capabilities->bSupportsEPGEdl; }
+
+  /// @brief Set **true** if this add-on provides TV channels.
+  void SetSupportsTV(bool supportsTV) { m_capabilities->bSupportsTV = supportsTV; }
+
+  /// @brief To get with @ref SetSupportsTV changed values.
+  bool GetSupportsTV() const { return m_capabilities->bSupportsTV; }
+
+  /// @brief Set **true** if this add-on provides TV channels.
+  void SetSupportsRadio(bool supportsRadio) { m_capabilities->bSupportsRadio = supportsRadio; }
+
+  /// @brief To get with @ref SetSupportsRadio changed values.
+  bool GetSupportsRadio() const { return m_capabilities->bSupportsRadio; }
+
+  /// @brief **true** if this add-on supports playback of recordings stored on
+  /// the backend.
+  void SetSupportsRecordings(bool supportsRecordings)
+  {
+    m_capabilities->bSupportsRecordings = supportsRecordings;
+  }
+
+  /// @brief To get with @ref SetSupportsRecordings changed values.
+  bool GetSupportsRecordings() const { return m_capabilities->bSupportsRecordings; }
+
+  /// @brief Set **true** if this add-on supports undelete of recordings stored
+  /// on the backend.
+  void SetSupportsRecordingsUndelete(bool supportsRecordingsUndelete)
+  {
+    m_capabilities->bSupportsRecordingsUndelete = supportsRecordingsUndelete;
+  }
+
+  /// @brief To get with @ref SetSupportsRecordings changed values.
+  bool GetSupportsRecordingsUndelete() const { return m_capabilities->bSupportsRecordingsUndelete; }
+
+  /// @brief Set **true** if this add-on supports the creation and editing of
+  /// timers.
+  void SetSupportsTimers(bool supportsTimers) { m_capabilities->bSupportsTimers = supportsTimers; }
+
+  /// @brief To get with @ref SetSupportsTimers changed values.
+  bool GetSupportsTimers() const { return m_capabilities->bSupportsTimers; }
+
+  /// @brief Set **true** if this add-on supports channel groups.
+  ///
+  /// It use the following functions:
+  /// - @ref kodi::addon::CInstancePVRClient::GetChannelGroupsAmount()
+  /// - @ref kodi::addon::CInstancePVRClient::GetChannelGroups()
+  /// - @ref kodi::addon::CInstancePVRClient::GetChannelGroupMembers()
+  void SetSupportsChannelGroups(bool supportsChannelGroups)
+  {
+    m_capabilities->bSupportsChannelGroups = supportsChannelGroups;
+  }
+
+  /// @brief To get with @ref SetSupportsChannelGroups changed values.
+  bool GetSupportsChannelGroups() const { return m_capabilities->bSupportsChannelGroups; }
+
+  /// @brief Set **true** if this add-on support scanning for new channels on
+  /// the backend.
+  ///
+  /// It use the following function:
+  /// - @ref kodi::addon::CInstancePVRClient::OpenDialogChannelScan()
+  void SetSupportsChannelScan(bool supportsChannelScan)
+  {
+    m_capabilities->bSupportsChannelScan = supportsChannelScan;
+  }
+
+  /// @brief To get with @ref SetSupportsChannelScan changed values.
+  bool GetSupportsChannelScan() const { return m_capabilities->bSupportsChannelScan; }
+
+  /// @brief Set **true** if this add-on supports channel edit.
+  ///
+  /// It use the following functions:
+  /// - @ref kodi::addon::CInstancePVRClient::DeleteChannel()
+  /// - @ref kodi::addon::CInstancePVRClient::RenameChannel()
+  /// - @ref kodi::addon::CInstancePVRClient::OpenDialogChannelSettings()
+  /// - @ref kodi::addon::CInstancePVRClient::OpenDialogChannelAdd()
+  void SetSupportsChannelSettings(bool supportsChannelSettings)
+  {
+    m_capabilities->bSupportsChannelSettings = supportsChannelSettings;
+  }
+
+  /// @brief To get with @ref SetSupportsChannelSettings changed values.
+  bool GetSupportsChannelSettings() const { return m_capabilities->bSupportsChannelSettings; }
+
+  /// @brief Set **true** if this add-on provides an input stream. false if Kodi
+  /// handles the stream.
+  void SetHandlesInputStream(bool handlesInputStream)
+  {
+    m_capabilities->bHandlesInputStream = handlesInputStream;
+  }
+
+  /// @brief To get with @ref SetHandlesInputStream changed values.
+  bool GetHandlesInputStream() const { return m_capabilities->bHandlesInputStream; }
+
+  /// @brief Set **true** if this add-on demultiplexes packets.
+  void SetHandlesDemuxing(bool handlesDemuxing)
+  {
+    m_capabilities->bHandlesDemuxing = handlesDemuxing;
+  }
+
+  /// @brief To get with @ref SetHandlesDemuxing changed values.
+  bool GetHandlesDemuxing() const { return m_capabilities->bHandlesDemuxing; }
+
+  /// @brief Set **true** if the backend supports play count for recordings.
+  void SetSupportsRecordingPlayCount(bool supportsRecordingPlayCount)
+  {
+    m_capabilities->bSupportsRecordingPlayCount = supportsRecordingPlayCount;
+  }
+
+  /// @brief To get with @ref SetSupportsRecordingPlayCount changed values.
+  bool GetSupportsRecordingPlayCount() const { return m_capabilities->bSupportsRecordingPlayCount; }
+
+  /// @brief Set **true** if the backend supports store/retrieve of last played
+  /// position for recordings.
+  void SetSupportsLastPlayedPosition(bool supportsLastPlayedPosition)
+  {
+    m_capabilities->bSupportsLastPlayedPosition = supportsLastPlayedPosition;
+  }
+
+  /// @brief To get with @ref SetSupportsLastPlayedPosition changed values.
+  bool GetSupportsLastPlayedPosition() const { return m_capabilities->bSupportsLastPlayedPosition; }
+
+  /// @brief Set **true** if the backend supports retrieving an edit decision
+  /// list for recordings.
+  void SetSupportsRecordingEdl(bool supportsRecordingEdl)
+  {
+    m_capabilities->bSupportsRecordingEdl = supportsRecordingEdl;
+  }
+
+  /// @brief To get with @ref SetSupportsRecordingEdl changed values.
+  bool GetSupportsRecordingEdl() const { return m_capabilities->bSupportsRecordingEdl; }
+
+  /// @brief Set **true** if the backend supports renaming recordings.
+  void SetSupportsRecordingsRename(bool supportsRecordingsRename)
+  {
+    m_capabilities->bSupportsRecordingsRename = supportsRecordingsRename;
+  }
+
+  /// @brief To get with @ref SetSupportsRecordingsRename changed values.
+  bool GetSupportsRecordingsRename() const { return m_capabilities->bSupportsRecordingsRename; }
+
+  /// @brief Set **true** if the backend supports changing lifetime for
+  /// recordings.
+  void SetSupportsRecordingsLifetimeChange(bool supportsRecordingsLifetimeChange)
+  {
+    m_capabilities->bSupportsRecordingsLifetimeChange = supportsRecordingsLifetimeChange;
+  }
+
+  /// @brief To get with @ref SetSupportsRecordingsLifetimeChange changed
+  /// values.
+  bool GetSupportsRecordingsLifetimeChange() const
+  {
+    return m_capabilities->bSupportsRecordingsLifetimeChange;
+  }
+
+  /// @brief Set **true** if the backend supports descramble information for
+  /// playing channels.
+  void SetSupportsDescrambleInfo(bool supportsDescrambleInfo)
+  {
+    m_capabilities->bSupportsDescrambleInfo = supportsDescrambleInfo;
+  }
+
+  /// @brief To get with @ref SetSupportsDescrambleInfo changed values.
+  bool GetSupportsDescrambleInfo() const { return m_capabilities->bSupportsDescrambleInfo; }
+
+  /// @brief Set **true** if this addon-on supports asynchronous transfer of epg
+  /// events to Kodi using the callback function
+  /// @ref kodi::addon::CInstancePVRClient::EpgEventStateChange().
+  void SetSupportsAsyncEPGTransfer(bool supportsAsyncEPGTransfer)
+  {
+    m_capabilities->bSupportsAsyncEPGTransfer = supportsAsyncEPGTransfer;
+  }
+
+  /// @brief To get with @ref SetSupportsAsyncEPGTransfer changed values.
+  bool GetSupportsAsyncEPGTransfer() const { return m_capabilities->bSupportsAsyncEPGTransfer; }
+
+  /// @brief Set **true** if this addon-on supports retrieving size of recordings.
+  void SetSupportsRecordingSize(bool supportsRecordingSize)
+  {
+    m_capabilities->bSupportsRecordingSize = supportsRecordingSize;
+  }
+
+  /// @brief To get with @ref SetSupportsRecordingSize changed values.
+  bool GetSupportsRecordingSize() const { return m_capabilities->bSupportsRecordingSize; }
+
+  /// @brief **optional**\n
+  /// Set array containing the possible values for @ref PVRRecording::SetLifetime().
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_PVRTypeIntValue_Help
+  void SetRecordingsLifetimeValues(
+      const std::vector<PVRTypeIntValue>& recordingsLifetimeValues)
+  {
+    m_capabilities->iRecordingsLifetimesSize = 0;
+    for (unsigned int i = 0; i < recordingsLifetimeValues.size() &&
+                             i < sizeof(m_capabilities->recordingsLifetimeValues);
+         ++i)
+    {
+      m_capabilities->recordingsLifetimeValues[i].iValue =
+          recordingsLifetimeValues[i].GetCStructure()->iValue;
+      strncpy(m_capabilities->recordingsLifetimeValues[i].strDescription,
+              recordingsLifetimeValues[i].GetCStructure()->strDescription,
+              sizeof(m_capabilities->recordingsLifetimeValues[i].strDescription) - 1);
+      ++m_capabilities->iRecordingsLifetimesSize;
+    }
+  }
+
+  /// @brief To get with @ref SetRecordingsLifetimeValues changed values.
+  std::vector<PVRTypeIntValue> GetRecordingsLifetimeValues() const
+  {
+    std::vector<PVRTypeIntValue> recordingsLifetimeValues;
+    for (unsigned int i = 0; i < m_capabilities->iRecordingsLifetimesSize; ++i)
+      recordingsLifetimeValues.emplace_back(
+          m_capabilities->recordingsLifetimeValues[i].iValue,
+          m_capabilities->recordingsLifetimeValues[i].strDescription);
+    return recordingsLifetimeValues;
+  }
+  ///@}
+
+private:
+  PVRCapabilities(PVR_ADDON_CAPABILITIES* capabilities) : m_capabilities(capabilities) {}
+
+  PVR_ADDON_CAPABILITIES* m_capabilities;
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_General_Inputstream_PVRStreamProperty class PVRStreamProperty
+/// @ingroup cpp_kodi_addon_pvr_Defs_General_Inputstream
+/// @brief **PVR stream property value handler**\n
+/// To set for Kodi wanted stream properties.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_General_Inputstream_PVRStreamProperty_Help
+///
+///---------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// ...
+///
+/// PVR_ERROR CMyPVRInstance::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel,
+///                                                      std::vector<kodi::addon::PVRStreamProperty>& properties)
+/// {
+///   ...
+///   properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM, "inputstream.adaptive");
+///   return PVR_ERROR_NO_ERROR;
+/// }
+///
+/// ...
+/// ~~~~~~~~~~~~~
+///
+///
+/// **Example 2:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// ...
+///
+/// PVR_ERROR CMyPVRInstance::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel,
+///                                                      std::vector<kodi::addon::PVRStreamProperty>& properties)
+/// {
+///   ...
+///   kodi::addon::PVRStreamProperty property;
+///   property.SetName(PVR_STREAM_PROPERTY_INPUTSTREAM);
+///   property.SetValue("inputstream.adaptive");
+///   properties.emplace_back(property);
+///   return PVR_ERROR_NO_ERROR;
+/// }
+///
+/// ...
+/// ~~~~~~~~~~~~~
+///
+///@{
+class PVRStreamProperty : public CStructHdl<PVRStreamProperty, PVR_NAMED_VALUE>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRStreamProperty(const PVRStreamProperty& data) : CStructHdl(data) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_General_Inputstream_PVRStreamProperty_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_General_Inputstream_PVRStreamProperty
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_General_Inputstream_PVRStreamProperty :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Name** | `int` | @ref PVRStreamProperty::SetValue "SetName" | @ref PVRStreamProperty::GetName "GetName"
+  /// | **Value** | `std::string` | @ref PVRStreamProperty::SetValue "SetValue" | @ref PVRStreamProperty::GetValue "GetValue"
+  ///
+  /// @remark Further can there be used his class constructor to set values.
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_General_Inputstream_PVRStreamProperty
+  ///@{
+
+  /// @brief Default class constructor.
+  ///
+  /// @note Values must be set afterwards.
+  PVRStreamProperty() = default;
+
+  /// @brief Class constructor with integrated value set.
+  ///
+  /// @param[in] name Type identification
+  /// @param[in] value Type used property value
+  PVRStreamProperty(const std::string& name, const std::string& value)
+  {
+    SetName(name);
+    SetValue(value);
+  }
+
+  /// @brief To set with the identification name.
+  void SetName(const std::string& name)
+  {
+    strncpy(m_cStructure->strName, name.c_str(), sizeof(m_cStructure->strName) - 1);
+  }
+
+  /// @brief To get with the identification name.
+  std::string GetName() const { return m_cStructure->strName; }
+
+  /// @brief To set with the used property value.
+  void SetValue(const std::string& value)
+  {
+    strncpy(m_cStructure->strValue, value.c_str(), sizeof(m_cStructure->strValue) - 1);
+  }
+
+  /// @brief To get with the used property value.
+  std::string GetValue() const { return m_cStructure->strValue; }
+  ///@}
+
+private:
+  PVRStreamProperty(const PVR_NAMED_VALUE* data) : CStructHdl(data) {}
+  PVRStreamProperty(PVR_NAMED_VALUE* data) : CStructHdl(data) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/MenuHook.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/MenuHook.h
new file mode 100644
index 0000000..053a4d5
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/MenuHook.h
@@ -0,0 +1,130 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr/pvr_menu_hook.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 7 - Menu hook
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook class PVRMenuhook
+/// @ingroup cpp_kodi_addon_pvr_Defs_Menuhook
+/// @brief **Context menu hook**\n
+/// Menu hooks that are available in the context menus while playing a stream via this add-on.
+/// And in the Live TV settings dialog.
+///
+/// Possible menu's given to Kodi.
+///
+/// This can be becomes used on this, if @ref kodi::addon::CInstancePVRClient::AddMenuHook()
+/// was set to related type:
+/// - @ref kodi::addon::CInstancePVRClient::CallSettingsMenuHook()
+/// - @ref kodi::addon::CInstancePVRClient::CallChannelMenuHook()
+/// - @ref kodi::addon::CInstancePVRClient::CallEPGMenuHook()
+/// - @ref kodi::addon::CInstancePVRClient::CallRecordingMenuHook()
+/// - @ref kodi::addon::CInstancePVRClient::CallTimerMenuHook()
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook_Help
+///
+///@{
+class PVRMenuhook : public CStructHdl<PVRMenuhook, PVR_MENUHOOK>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook
+  /// @brief Optional class constructor with value set.
+  ///
+  /// @param[in] hookId This hook's identifier
+  /// @param[in] localizedStringId Localized string identifier
+  /// @param[in] category Category of menu hook, defined with @ref PVR_MENUHOOK_CAT
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// AddMenuHook(kodi::addon::PVRMenuhook(1, 30001, PVR_MENUHOOK_CHANNEL));
+  /// ~~~~~~~~~~~~~
+  ///
+  PVRMenuhook(unsigned int hookId, unsigned int localizedStringId, PVR_MENUHOOK_CAT category)
+  {
+    m_cStructure->iHookId = hookId;
+    m_cStructure->iLocalizedStringId = localizedStringId;
+    m_cStructure->category = category;
+  }
+
+  /*! \cond PRIVATE */
+  PVRMenuhook()
+  {
+    m_cStructure->iHookId = 0;
+    m_cStructure->iLocalizedStringId = 0;
+    m_cStructure->category = PVR_MENUHOOK_UNKNOWN;
+  }
+  PVRMenuhook(const PVRMenuhook& data) : CStructHdl(data) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **This hook's identifier** | `unsigned int` | @ref PVRMenuhook::SetHookId "SetHookId" | @ref PVRMenuhook::GetHookId "GetHookId" | *required to set*
+  /// | **Localized string Identifier** | `unsigned int` | @ref PVRMenuhook::SetLocalizedStringId "SetLocalizedStringId" | @ref PVRMenuhook::GetLocalizedStringId "GetLocalizedStringId" | *required to set*
+  /// | **Category of menu hook** | @ref PVR_MENUHOOK_CAT | @ref PVRMenuhook::SetCategory "SetCategory" | @ref PVRMenuhook::GetCategory "GetCategory" | *required to set*
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Menuhook_PVRMenuhook
+  ///@{
+
+  /// @brief **required**\n
+  /// This hook's identifier.
+  void SetHookId(unsigned int hookId) { m_cStructure->iHookId = hookId; }
+
+  /// @brief To get with @ref SetHookId() changed values.
+  unsigned int GetHookId() const { return m_cStructure->iHookId; }
+
+  /// @brief **required**\n
+  /// The id of the label for this hook in @ref kodi::GetLocalizedString().
+  void SetLocalizedStringId(unsigned int localizedStringId)
+  {
+    m_cStructure->iLocalizedStringId = localizedStringId;
+  }
+
+  /// @brief To get with @ref SetLocalizedStringId() changed values.
+  unsigned int GetLocalizedStringId() const { return m_cStructure->iLocalizedStringId; }
+
+  /// @brief **required**\n
+  /// Category of menu hook.
+  void SetCategory(PVR_MENUHOOK_CAT category) { m_cStructure->category = category; }
+
+  /// @brief To get with @ref SetCategory() changed values.
+  PVR_MENUHOOK_CAT GetCategory() const { return m_cStructure->category; }
+  ///@}
+
+private:
+  PVRMenuhook(const PVR_MENUHOOK* data) : CStructHdl(data) {}
+  PVRMenuhook(PVR_MENUHOOK* data) : CStructHdl(data) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h
new file mode 100644
index 0000000..24ecf11
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Recordings.h
@@ -0,0 +1,520 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 5 - PVR recordings
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecording class PVRRecording
+/// @ingroup cpp_kodi_addon_pvr_Defs_Recording
+/// @brief **Data structure with available recordings data**\n
+/// With this, recordings related data are transferred between addon and Kodi
+/// and can also be used by the addon itself.
+///
+/// The related values here are automatically initiated to defaults and need
+/// only be set if supported and used.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Recording_PVRRecording_Help
+///
+///@{
+class PVRRecording : public CStructHdl<PVRRecording, PVR_RECORDING>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRRecording()
+  {
+    m_cStructure->iSeriesNumber = PVR_RECORDING_INVALID_SERIES_EPISODE;
+    m_cStructure->iEpisodeNumber = PVR_RECORDING_INVALID_SERIES_EPISODE;
+    m_cStructure->recordingTime = 0;
+    m_cStructure->iDuration = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+    m_cStructure->iPriority = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+    m_cStructure->iLifetime = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+    m_cStructure->iGenreType = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+    m_cStructure->iGenreSubType = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+    m_cStructure->iPlayCount = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+    m_cStructure->iLastPlayedPosition = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+    m_cStructure->bIsDeleted = false;
+    m_cStructure->iEpgEventId = 0;
+    m_cStructure->iChannelUid = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+    m_cStructure->channelType = PVR_RECORDING_CHANNEL_TYPE_UNKNOWN;
+    m_cStructure->iFlags = 0;
+    m_cStructure->sizeInBytes = PVR_RECORDING_VALUE_NOT_AVAILABLE;
+  }
+  PVRRecording(const PVRRecording& recording) : CStructHdl(recording) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecording_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Recording_PVRRecording :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **Recording id** | `std::string` | @ref PVRRecording::SetRecordingId "SetRecordingId" | @ref PVRRecording::GetRecordingId "GetRecordingId" | *required to set*
+  /// | **Title** | `std::string` | @ref PVRRecording::SetTitle "SetTitle" | @ref PVRRecording::GetTitle "GetTitle" | *required to set*
+  /// | **Episode name** | `std::string` | @ref PVRRecording::SetEpisodeName "SetEpisodeName" | @ref PVRRecording::GetEpisodeName "GetEpisodeName" | *optional*
+  /// | **Series number** | `int` | @ref PVRRecording::SetSeriesNumber "SetSeriesNumber" | @ref PVRRecording::GetSeriesNumber "GetSeriesNumber" | *optional*
+  /// | **Episode number** | `int` | @ref PVRRecording::SetEpisodeNumber "SetEpisodeNumber" | @ref PVRRecording::GetEpisodeNumber "GetEpisodeNumber" | *optional*
+  /// | **Year** | `int` | @ref PVRRecording::SetYear "SetYear" | @ref PVRRecording::GetYear "GetYear" | *optional*
+  /// | **Directory** | `std::string` | @ref PVRRecording::SetDirectory "SetDirectory" | @ref PVRRecording::GetDirectory "GetDirectory" | *optional*
+  /// | **Plot outline** | `std::string` | @ref PVRRecording::SetPlotOutline "SetPlotOutline" | @ref PVRRecording::GetPlotOutline "GetPlotOutline" | *optional*
+  /// | **Plot** | `std::string` | @ref PVRRecording::SetPlot "SetPlot" | @ref PVRRecording::GetPlot "GetPlot" | *optional*
+  /// | **Genre description** | `std::string` | @ref PVRRecording::SetGenreDescription "SetGenreDescription" | @ref PVRRecording::GetGenreDescription "GetGenreDescription" | *optional*
+  /// | **Channel name** | `std::string` | @ref PVRRecording::SetChannelName "SetChannelName" | @ref PVRRecording::GetChannelName "GetChannelName" | *optional*
+  /// | **Icon path** | `std::string` | @ref PVRRecording::SetIconPath "SetIconPath" | @ref PVRRecording::GetIconPath "GetIconPath" | *optional*
+  /// | **Thumbnail path** | `std::string` | @ref PVRRecording::SetThumbnailPath "SetThumbnailPath" | @ref PVRRecording::GetThumbnailPath "GetThumbnailPath" | *optional*
+  /// | **Fanart path** | `std::string` | @ref PVRRecording::SetFanartPath "SetFanartPath" | @ref PVRRecording::GetFanartPath "GetFanartPath" | *optional*
+  /// | **Recording time** | `time_t` | @ref PVRRecording::SetRecordingTime "SetRecordingTime" | @ref PVRRecording::GetRecordingTime "GetRecordingTime" | *optional*
+  /// | **Duration** | `int` | @ref PVRRecording::SetDuration "SetDuration" | @ref PVRRecording::GetDuration "GetDuration" | *optional*
+  /// | **Priority** | `int` | @ref PVRRecording::SetPriority "SetPriority" | @ref PVRRecording::GetPriority "GetPriority" | *optional*
+  /// | **Lifetime** | `int` | @ref PVRRecording::SetLifetime "SetLifetime" | @ref PVRRecording::GetLifetime "GetLifetime" | *optional*
+  /// | **Genre type** | `int` | @ref PVRRecording::SetGenreType "SetGenreType" | @ref PVRRecording::GetGenreType "GetGenreType" | *optional*
+  /// | **Genre sub type** | `int` | @ref PVRRecording::SetGenreSubType "SetGenreSubType" | @ref PVRRecording::GetGenreSubType "GetGenreSubType" | *optional*
+  /// | **Play count** | `int` | @ref PVRRecording::SetPlayCount "SetPlayCount" | @ref PVRRecording::GetPlayCount "GetPlayCount" | *optional*
+  /// | **Last played position** | `int` | @ref PVRRecording::SetLastPlayedPosition "SetLastPlayedPosition" | @ref PVRRecording::GetLastPlayedPosition "GetLastPlayedPosition" | *optional*
+  /// | **Is deleted** | `bool` | @ref PVRRecording::SetIsDeleted "SetIsDeleted" | @ref PVRRecording::GetIsDeleted "GetIsDeleted" | *optional*
+  /// | **EPG event id** | `unsigned int` | @ref PVRRecording::SetEPGEventId "SetEPGEventId" | @ref PVRRecording::GetEPGEventId "GetEPGEventId" | *optional*
+  /// | **Channel unique id** | `int` | @ref PVRRecording::SetChannelUid "SetChannelUid" | @ref PVRRecording::GetChannelUid "GetChannelUid" | *optional*
+  /// | **Channel type** | @ref PVR_RECORDING_CHANNEL_TYPE | @ref PVRRecording::SetChannelType "SetChannelType" | @ref PVRRecording::GetChannelType "GetChannelType" | *optional*
+  /// | **First aired** | `std::string` | @ref PVRRecording::SetFirstAired "SetFirstAired" | @ref PVRRecording::GetFirstAired "GetFirstAired" | *optional*
+  /// | **Flags** | `std::string` | @ref PVRRecording::SetFlags "SetFlags" | @ref PVRRecording::GetFlags "GetFlags" | *optional*
+  /// | **Size in bytes** | `std::string` | @ref PVRRecording::SetSizeInBytes "SetSizeInBytes" | @ref PVRRecording::GetSizeInBytes "GetSizeInBytes" | *optional*
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  ///@{
+
+  /// @brief **required**\n
+  /// Unique identifier of the recording on the client.
+  void SetRecordingId(const std::string& recordingId)
+  {
+    strncpy(m_cStructure->strRecordingId, recordingId.c_str(),
+            sizeof(m_cStructure->strRecordingId) - 1);
+  }
+
+  /// @brief To get with @ref SetRecordingId changed values.
+  std::string GetRecordingId() const { return m_cStructure->strRecordingId; }
+
+  /// @brief **required**\n
+  /// The title of this recording.
+  void SetTitle(const std::string& title)
+  {
+    strncpy(m_cStructure->strTitle, title.c_str(), sizeof(m_cStructure->strTitle) - 1);
+  }
+
+  /// @brief To get with @ref SetTitle changed values.
+  std::string GetTitle() const { return m_cStructure->strTitle; }
+
+  /// @brief **optional**\n
+  /// Episode name (also known as subtitle).
+  void SetEpisodeName(const std::string& episodeName)
+  {
+    strncpy(m_cStructure->strEpisodeName, episodeName.c_str(),
+            sizeof(m_cStructure->strEpisodeName) - 1);
+  }
+
+  /// @brief To get with @ref SetEpisodeName changed values.
+  std::string GetEpisodeName() const { return m_cStructure->strEpisodeName; }
+
+  /// @brief **optional**\n
+  /// Series number (usually called season).
+  ///
+  /// Set to "0" for specials/pilot. For 'invalid' see @ref SetEpisodeNumber or set to -1.
+  void SetSeriesNumber(int seriesNumber) { m_cStructure->iSeriesNumber = seriesNumber; }
+
+  /// @brief To get with @ref SetSeriesNumber changed values.
+  int GetSeriesNumber() const { return m_cStructure->iSeriesNumber; }
+
+  /// @brief **optional**\n
+  /// Eepisode number within the "iSeriesNumber" season.
+  ///
+  /// For 'invalid' set to -1 or seriesNumber=episodeNumber=0 to show both are invalid.
+  void SetEpisodeNumber(int episodeNumber) { m_cStructure->iEpisodeNumber = episodeNumber; }
+
+  /// @brief To get with @ref SetEpisodeNumber changed values.
+  int GetEpisodeNumber() const { return m_cStructure->iEpisodeNumber; }
+
+  /// @brief **optional**\n
+  /// Year of first release (use to identify a specific movie re-make) / first
+  /// airing for TV shows.
+  ///
+  /// Set to '0' for invalid.
+  void SetYear(int year) { m_cStructure->iYear = year; }
+
+  /// @brief To get with @ref SetYear changed values.
+  int GetYear() const { return m_cStructure->iYear; }
+
+  /// @brief **optional**\n
+  ///
+  /// Directory of this recording on the client.
+  void SetDirectory(const std::string& directory)
+  {
+    strncpy(m_cStructure->strDirectory, directory.c_str(), sizeof(m_cStructure->strDirectory) - 1);
+  }
+
+  /// @brief To get with @ref SetDirectory changed values.
+  std::string GetDirectory() const { return m_cStructure->strDirectory; }
+
+  /// @brief **optional**\n
+  /// Plot outline name.
+  void SetPlotOutline(const std::string& plotOutline)
+  {
+    strncpy(m_cStructure->strPlotOutline, plotOutline.c_str(),
+            sizeof(m_cStructure->strPlotOutline) - 1);
+  }
+
+  /// @brief To get with @ref SetPlotOutline changed values.
+  std::string GetPlotOutline() const { return m_cStructure->strPlotOutline; }
+
+  /// @brief **optional**\n
+  /// Plot name.
+  void SetPlot(const std::string& plot)
+  {
+    strncpy(m_cStructure->strPlot, plot.c_str(), sizeof(m_cStructure->strPlot) - 1);
+  }
+
+  /// @brief To get with @ref SetPlot changed values.
+  std::string GetPlot() const { return m_cStructure->strPlot; }
+
+  /// @brief **optional**\n
+  /// Channel name.
+  void SetChannelName(const std::string& channelName)
+  {
+    strncpy(m_cStructure->strChannelName, channelName.c_str(),
+            sizeof(m_cStructure->strChannelName) - 1);
+  }
+
+  /// @brief To get with @ref SetChannelName changed values.
+  std::string GetChannelName() const { return m_cStructure->strChannelName; }
+
+  /// @brief **optional**\n
+  /// Channel logo (icon) path.
+  void SetIconPath(const std::string& iconPath)
+  {
+    strncpy(m_cStructure->strIconPath, iconPath.c_str(), sizeof(m_cStructure->strIconPath) - 1);
+  }
+
+  /// @brief To get with @ref SetIconPath changed values.
+  std::string GetIconPath() const { return m_cStructure->strIconPath; }
+
+  /// @brief **optional**\n
+  /// Thumbnail path.
+  void SetThumbnailPath(const std::string& thumbnailPath)
+  {
+    strncpy(m_cStructure->strThumbnailPath, thumbnailPath.c_str(),
+            sizeof(m_cStructure->strThumbnailPath) - 1);
+  }
+
+  /// @brief To get with @ref SetThumbnailPath changed values.
+  std::string GetThumbnailPath() const { return m_cStructure->strThumbnailPath; }
+
+  /// @brief **optional**\n
+  /// Fanart path.
+  void SetFanartPath(const std::string& fanartPath)
+  {
+    strncpy(m_cStructure->strFanartPath, fanartPath.c_str(),
+            sizeof(m_cStructure->strFanartPath) - 1);
+  }
+
+  /// @brief To get with @ref SetFanartPath changed values.
+  std::string GetFanartPath() const { return m_cStructure->strFanartPath; }
+
+  /// @brief **optional**\n
+  /// Start time of the recording.
+  void SetRecordingTime(time_t recordingTime) { m_cStructure->recordingTime = recordingTime; }
+
+  /// @brief To get with @ref SetRecordingTime changed values.
+  time_t GetRecordingTime() const { return m_cStructure->recordingTime; }
+
+  /// @brief **optional**\n
+  /// Duration of the recording in seconds.
+  void SetDuration(int duration) { m_cStructure->iDuration = duration; }
+
+  /// @brief To get with @ref SetDuration changed values.
+  int GetDuration() const { return m_cStructure->iDuration; }
+
+  /// @brief **optional**\n
+  /// Priority of this recording (from 0 - 100).
+  void SetPriority(int priority) { m_cStructure->iPriority = priority; }
+
+  /// @brief To get with @ref SetPriority changed values.
+  int GetPriority() const { return m_cStructure->iPriority; }
+
+  /// @brief **optional**\n
+  /// Life time in days of this recording.
+  void SetLifetime(int lifetime) { m_cStructure->iLifetime = lifetime; }
+
+  /// @brief To get with @ref SetLifetime changed values.
+  int GetLifetime() const { return m_cStructure->iLifetime; }
+
+  /// @brief **optional**\n
+  /// Genre type.
+  ///
+  /// Use @ref EPG_GENRE_USE_STRING if type becomes given by @ref SetGenreDescription.
+  ///
+  /// @note If confirmed that backend brings the types in [ETSI EN 300 468](https://www.etsi.org/deliver/etsi_en/300400_300499/300468/01.14.01_60/en_300468v011401p.pdf)
+  /// conform values, can be @ref EPG_EVENT_CONTENTMASK ignored and to set here
+  /// with backend value.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example 1:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRRecording tag;
+  /// tag.SetGenreType(EPG_EVENT_CONTENTMASK_MOVIEDRAMA);
+  /// ~~~~~~~~~~~~~
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example 2** (in case of other, not ETSI EN 300 468 conform genre types):
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRRecording tag;
+  /// tag.SetGenreType(EPG_GENRE_USE_STRING);
+  /// tag.SetGenreDescription("My special genre name"); // Should use (if possible) kodi::GetLocalizedString(...) to have match user language.
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetGenreType(int genreType) { m_cStructure->iGenreType = genreType; }
+
+  /// @brief To get with @ref SetGenreType changed values.
+  int GetGenreType() const { return m_cStructure->iGenreType; }
+
+  /// @brief **optional**\n
+  /// Genre sub type.
+  ///
+  /// Subtypes groups related to set by @ref SetGenreType:
+  /// | Main genre type | List with available sub genre types
+  /// |-----------------|-----------------------------------------
+  /// | @ref EPG_EVENT_CONTENTMASK_UNDEFINED | Nothing, should be 0
+  /// | @ref EPG_EVENT_CONTENTMASK_MOVIEDRAMA | @ref EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA
+  /// | @ref EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS | @ref EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS
+  /// | @ref EPG_EVENT_CONTENTMASK_SHOW | @ref EPG_EVENT_CONTENTSUBMASK_SHOW
+  /// | @ref EPG_EVENT_CONTENTMASK_SPORTS | @ref EPG_EVENT_CONTENTSUBMASK_SPORTS
+  /// | @ref EPG_EVENT_CONTENTMASK_CHILDRENYOUTH | @ref EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH
+  /// | @ref EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE | @ref EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE
+  /// | @ref EPG_EVENT_CONTENTMASK_ARTSCULTURE | @ref EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE
+  /// | @ref EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS | @ref EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS
+  /// | @ref EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE | @ref EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE
+  /// | @ref EPG_EVENT_CONTENTMASK_LEISUREHOBBIES | @ref EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES
+  /// | @ref EPG_EVENT_CONTENTMASK_SPECIAL | @ref EPG_EVENT_CONTENTSUBMASK_SPECIAL
+  /// | @ref EPG_EVENT_CONTENTMASK_USERDEFINED | Can be defined by you
+  /// | @ref EPG_GENRE_USE_STRING | **Kodi's own value**, which declares that the type with @ref SetGenreDescription is given.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRRecording tag;
+  /// tag.SetGenreType(EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE);
+  /// tag.SetGenreSubType(EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_JAZZ);
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetGenreSubType(int genreSubType) { m_cStructure->iGenreSubType = genreSubType; }
+
+  /// @brief To get with @ref SetGenreSubType changed values.
+  int GetGenreSubType() const { return m_cStructure->iGenreSubType; }
+
+  /// @brief **optional**\n
+  /// To set own genre description name.
+  ///
+  /// Will be used only when genreType == @ref EPG_GENRE_USE_STRING or
+  /// genreSubType == @ref EPG_GENRE_USE_STRING.
+  ///
+  /// Use @ref EPG_STRING_TOKEN_SEPARATOR to separate different genres.
+  ///
+  /// In case of other, not [ETSI EN 300 468](https://www.etsi.org/deliver/etsi_en/300400_300499/300468/01.14.01_60/en_300468v011401p.pdf)
+  /// conform genre types or something special.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRRecording tag;
+  /// tag.SetGenreType(EPG_GENRE_USE_STRING);
+  /// tag.SetGenreDescription("Action" + EPG_STRING_TOKEN_SEPARATOR + "Thriller");
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetGenreDescription(const std::string& genreDescription)
+  {
+    strncpy(m_cStructure->strGenreDescription, genreDescription.c_str(),
+            sizeof(m_cStructure->strGenreDescription) - 1);
+  }
+
+  /// @brief To get with @ref SetGenreDescription changed values.
+  std::string GetGenreDescription() const { return m_cStructure->strGenreDescription; }
+
+  /// @brief **optional**\n
+  /// Play count of this recording on the client.
+  void SetPlayCount(int playCount) { m_cStructure->iPlayCount = playCount; }
+
+  /// @brief To get with @ref SetPlayCount changed values.
+  int GetPlayCount() const { return m_cStructure->iPlayCount; }
+
+  /// @brief **optional**\n
+  /// Last played position of this recording on the client.
+  void SetLastPlayedPosition(int lastPlayedPosition)
+  {
+    m_cStructure->iLastPlayedPosition = lastPlayedPosition;
+  }
+
+  /// @brief To get with @ref SetLastPlayedPosition changed values.
+  int GetLastPlayedPosition() const { return m_cStructure->iLastPlayedPosition; }
+
+  /// @brief **optional**\n
+  /// Shows this recording is deleted and can be undelete.
+  void SetIsDeleted(int isDeleted) { m_cStructure->bIsDeleted = isDeleted; }
+
+  /// @brief To get with @ref SetIsDeleted changed values.
+  int GetIsDeleted() const { return m_cStructure->bIsDeleted; }
+
+  /// @brief **optional**\n
+  /// EPG event id associated with this recording. Valid ids must be greater than @ref EPG_TAG_INVALID_UID.
+  void SetEPGEventId(unsigned int epgEventId) { m_cStructure->iEpgEventId = epgEventId; }
+
+  /// @brief To get with @ref SetEPGEventId changed values.
+  unsigned int GetEPGEventId() const { return m_cStructure->iEpgEventId; }
+
+  /// @brief **optional**\n
+  /// Unique identifier of the channel for this recording. @ref PVR_CHANNEL_INVALID_UID
+  /// denotes that channel uid is not available.
+  void SetChannelUid(int channelUid) { m_cStructure->iChannelUid = channelUid; }
+
+  /// @brief To get with @ref SetChannelUid changed values
+  int GetChannelUid() const { return m_cStructure->iChannelUid; }
+
+  /// @brief **optional**\n
+  /// Channel type.
+  ///
+  /// Set to @ref PVR_RECORDING_CHANNEL_TYPE_UNKNOWN if the type cannot be
+  /// determined.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRRecording tag;
+  /// tag.SetChannelType(PVR_RECORDING_CHANNEL_TYPE_TV);
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetChannelType(PVR_RECORDING_CHANNEL_TYPE channelType)
+  {
+    m_cStructure->channelType = channelType;
+  }
+
+  /// @brief To get with @ref SetChannelType changed values
+  PVR_RECORDING_CHANNEL_TYPE GetChannelType() const { return m_cStructure->channelType; }
+
+  /// @brief **optional**\n
+  /// First aired date of this recording.
+  ///
+  /// Used only for display purposes. Specify in W3C date format "YYYY-MM-DD".
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// Example:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRRecording tag;
+  /// tag.SetFirstAired(1982-10-22);
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetFirstAired(const std::string& firstAired)
+  {
+    strncpy(m_cStructure->strFirstAired, firstAired.c_str(),
+            sizeof(m_cStructure->strFirstAired) - 1);
+  }
+
+  /// @brief To get with @ref SetFirstAired changed values
+  std::string GetFirstAired() const { return m_cStructure->strFirstAired; }
+
+  /// @brief **optional**\n
+  /// Bit field of independent flags associated with the recording.
+  ///
+  /// See @ref cpp_kodi_addon_pvr_Defs_Recording_PVR_RECORDING_FLAG for
+  /// available bit flags.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_Recording_PVR_RECORDING_FLAG
+  ///
+  void SetFlags(unsigned int flags) { m_cStructure->iFlags = flags; }
+
+  /// @brief To get with @ref SetFlags changed values.
+  unsigned int GetFlags() const { return m_cStructure->iFlags; }
+
+  /// @brief **optional**\n
+  /// Size of the recording in bytes.
+  void SetSizeInBytes(int64_t sizeInBytes) { m_cStructure->sizeInBytes = sizeInBytes; }
+
+  /// @brief To get with @ref SetSizeInBytes changed values.
+  int64_t GetSizeInBytes() const { return m_cStructure->sizeInBytes; }
+  ///@}
+
+private:
+  PVRRecording(const PVR_RECORDING* recording) : CStructHdl(recording) {}
+  PVRRecording(PVR_RECORDING* recording) : CStructHdl(recording) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecordingsResultSet class PVRRecordingsResultSet
+/// @ingroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+/// @brief **PVR add-on recording transfer class**\n
+/// To transfer the content of @ref kodi::addon::CInstancePVRClient::GetRecordings().
+///
+/// @note This becomes only be used on addon call above, not usable outside on
+/// addon itself.
+///@{
+class PVRRecordingsResultSet
+{
+public:
+  /*! \cond PRIVATE */
+  PVRRecordingsResultSet() = delete;
+  PVRRecordingsResultSet(const AddonInstance_PVR* instance, ADDON_HANDLE handle)
+    : m_instance(instance), m_handle(handle)
+  {
+  }
+  /*! \endcond */
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecordingsResultSet
+  ///@{
+
+  /// @brief To add and give content from addon to Kodi on related call.
+  ///
+  /// @param[in] tag The to transferred data.
+  void Add(const kodi::addon::PVRRecording& tag)
+  {
+    m_instance->toKodi->TransferRecordingEntry(m_instance->toKodi->kodiInstance, m_handle, tag);
+  }
+
+  ///@}
+
+private:
+  const AddonInstance_PVR* m_instance = nullptr;
+  const ADDON_HANDLE m_handle;
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Stream.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Stream.h
new file mode 100644
index 0000000..5613947
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Stream.h
@@ -0,0 +1,330 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr/pvr_stream.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 9 - PVR stream definitions (NOTE: Becomes replaced
+// in future by inputstream addon instance way)
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Stream_PVRCodec class PVRCodec
+/// @ingroup cpp_kodi_addon_pvr_Defs_Stream
+/// @brief **PVR codec identifier**\n
+/// Used to exchange the desired codec type between Kodi and addon.
+///
+/// @ref kodi::addon::CInstancePVRClient::GetCodecByName is used to get this data.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Stream_PVRCodec_Help
+///
+///@{
+class PVRCodec : public CStructHdl<PVRCodec, PVR_CODEC>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRCodec()
+  {
+    m_cStructure->codec_type = PVR_CODEC_TYPE_UNKNOWN;
+    m_cStructure->codec_id = PVR_INVALID_CODEC_ID;
+  }
+  PVRCodec(const PVRCodec& type) : CStructHdl(type) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Stream_PVRCodec_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Stream_PVRCodec
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Stream_PVRCodec :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Codec type** | @ref PVR_CODEC_TYPE | @ref PVRCodec::SetCodecType "SetCodecType" | @ref PVRCodec::GetCodecType "GetCodecType"
+  /// | **Codec identifier** | `unsigned int` | @ref PVRCodec::SetCodecId "SetCodecId" | @ref PVRCodec::GetCodecId "GetCodecId"
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Stream_PVRCodec
+  ///@{
+
+  /// @brief Codec type.
+  void SetCodecType(PVR_CODEC_TYPE codecType) { m_cStructure->codec_type = codecType; }
+
+  /// @brief To get with @ref SetCodecType() changed values.
+  PVR_CODEC_TYPE GetCodecType() const { return m_cStructure->codec_type; }
+
+  /// @brief Codec id.
+  ///
+  /// Related codec identifier, normally match the ffmpeg id's.
+  void SetCodecId(unsigned int codecId) { m_cStructure->codec_id = codecId; }
+
+  /// @brief To get with @ref SetCodecId() changed values.
+  unsigned int GetCodecId() const { return m_cStructure->codec_id; }
+  ///@}
+
+private:
+  PVRCodec(const PVR_CODEC& type) : CStructHdl(&type) {}
+  PVRCodec(const PVR_CODEC* type) : CStructHdl(type) {}
+  PVRCodec(PVR_CODEC* type) : CStructHdl(type) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties class PVRStreamProperties
+/// @ingroup cpp_kodi_addon_pvr_Defs_Stream
+/// @brief **PVR stream properties**\n
+/// All information about a respective stream is stored in this, so that Kodi
+/// can process the data given by the addon after demux.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties_Help
+///
+///@{
+class PVRStreamProperties
+  : public CStructHdl<PVRStreamProperties, PVR_STREAM_PROPERTIES::PVR_STREAM>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRStreamProperties() { memset(m_cStructure, 0, sizeof(PVR_STREAM_PROPERTIES::PVR_STREAM)); }
+  PVRStreamProperties(const PVRStreamProperties& type) : CStructHdl(type) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **PID** | `unsigned int` | @ref PVRStreamProperties::SetPID "SetPID" | @ref PVRStreamProperties::GetPID "GetPID"
+  /// | **Codec type** | @ref PVR_CODEC_TYPE | @ref PVRStreamProperties::SetCodecType "SetCodecType" | @ref PVRStreamProperties::GetCodecType "GetCodecType"
+  /// | **Codec identifier** | `unsigned int` | @ref PVRStreamProperties::SetCodecId "SetCodecId" | @ref PVRStreamProperties::GetCodecId "GetCodecId"
+  /// | **Language** | `std::string` | @ref PVRStreamProperties::SetLanguage "SetLanguage" | @ref PVRStreamProperties::GetLanguage "GetLanguage"
+  /// | **Subtitle info** | `int` | @ref PVRStreamProperties::SetSubtitleInfo "SetSubtitleInfo" | @ref PVRStreamProperties::GetSubtitleInfo "GetSubtitleInfo"
+  /// | **FPS scale** | `int` | @ref PVRStreamProperties::SetFPSScale "SetFPSScale" | @ref PVRStreamProperties::GetFPSScale "GetFPSScale"
+  /// | **FPS rate** | `int` | @ref PVRStreamProperties::SetFPSRate "SetFPSRate" | @ref PVRStreamProperties::GetFPSRate "GetFPSRate"
+  /// | **Height** | `int` | @ref PVRStreamProperties::SetHeight "SetHeight" | @ref PVRStreamProperties::GetHeight "GetHeight"
+  /// | **Width** | `int` | @ref PVRStreamProperties::SetWidth "SetWidth" | @ref PVRStreamProperties::GetWidth "GetWidth"
+  /// | **Aspect ratio** | `float` | @ref PVRStreamProperties::SetAspect "SetAspect" | @ref PVRStreamProperties::GetAspect "GetAspect"
+  /// | **Channels** | `int` | @ref PVRStreamProperties::SetChannels "SetChannels" | @ref PVRStreamProperties::GetChannels "GetChannels"
+  /// | **Samplerate** | `int` | @ref PVRStreamProperties::SetSampleRate "SetSampleRate" | @ref PVRStreamProperties::GetSampleRate "GetSampleRate"
+  /// | **Block align** | `int` | @ref PVRStreamProperties::SetBlockAlign "SetBlockAlign" | @ref PVRStreamProperties::GetBlockAlign "GetBlockAlign"
+  /// | **Bit rate** | `int` | @ref PVRStreamProperties::SetBitRate "SetBitRate" | @ref PVRStreamProperties::GetBitRate "GetBitRate"
+  /// | **Bits per sample** | `int` | @ref PVRStreamProperties::SetBitsPerSample "SetBitsPerSample" | @ref PVRStreamProperties::GetBitsPerSample "GetBitsPerSample"
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties
+  ///@{
+
+  /// @brief PID.
+  void SetPID(unsigned int pid) { m_cStructure->iPID = pid; }
+
+  /// @brief To get with @ref SetPID() changed values.
+  unsigned int GetPID() const { return m_cStructure->iPID; }
+
+  /// @brief Codec type this stream.
+  void SetCodecType(PVR_CODEC_TYPE codecType) { m_cStructure->iCodecType = codecType; }
+
+  /// @brief To get with @ref SetCodecType() changed values.
+  PVR_CODEC_TYPE GetCodecType() const { return m_cStructure->iCodecType; }
+
+  /// @brief Codec id of this stream.
+  void SetCodecId(unsigned int codecId) { m_cStructure->iCodecId = codecId; }
+
+  /// @brief To get with @ref SetCodecId() changed values.
+  unsigned int GetCodecId() const { return m_cStructure->iCodecId; }
+
+  /// @brief 3 letter language id.
+  void SetLanguage(const std::string& language)
+  {
+    if (language.size() > 3)
+    {
+      kodi::Log(ADDON_LOG_ERROR,
+                "PVRStreamProperties::%s: Language string size '%li' higher as needed 3", __func__,
+                language.size());
+      return;
+    }
+    m_cStructure->strLanguage[0] = language[0];
+    m_cStructure->strLanguage[1] = language[1];
+    m_cStructure->strLanguage[2] = language[2];
+    m_cStructure->strLanguage[2] = 0;
+  }
+
+  /// @brief To get with @ref SetLanguage() changed values.
+  std::string GetLanguage() const { return m_cStructure->strLanguage; }
+
+  /// @brief Subtitle Info
+  void SetSubtitleInfo(int subtitleInfo) { m_cStructure->iSubtitleInfo = subtitleInfo; }
+
+  /// @brief To get with @ref SetSubtitleInfo() changed values.
+  int GetSubtitleInfo() const { return m_cStructure->iSubtitleInfo; }
+
+  /// @brief To set scale of 1000 and a rate of 29970 will result in 29.97 fps.
+  void SetFPSScale(int fpsScale) { m_cStructure->iFPSScale = fpsScale; }
+
+  /// @brief To get with @ref SetFPSScale() changed values.
+  int GetFPSScale() const { return m_cStructure->iFPSScale; }
+
+  /// @brief FPS rate
+  void SetFPSRate(int fpsRate) { m_cStructure->iFPSRate = fpsRate; }
+
+  /// @brief To get with @ref SetFPSRate() changed values.
+  int GetFPSRate() const { return m_cStructure->iFPSRate; }
+
+  /// @brief Height of the stream reported by the demuxer
+  void SetHeight(int height) { m_cStructure->iHeight = height; }
+
+  /// @brief To get with @ref SetHeight() changed values.
+  int GetHeight() const { return m_cStructure->iHeight; }
+
+  /// @brief Width of the stream reported by the demuxer.
+  void SetWidth(int width) { m_cStructure->iWidth = width; }
+
+  /// @brief To get with @ref SetWidth() changed values.
+  int GetWidth() const { return m_cStructure->iWidth; }
+
+  /// @brief Display aspect ratio of the stream.
+  void SetAspect(float aspect) { m_cStructure->fAspect = aspect; }
+
+  /// @brief To get with @ref SetAspect() changed values.
+  float GetAspect() const { return m_cStructure->fAspect; }
+
+  /// @brief Amount of channels.
+  void SetChannels(int channels) { m_cStructure->iChannels = channels; }
+
+  /// @brief To get with @ref SetChannels() changed values.
+  int GetChannels() const { return m_cStructure->iChannels; }
+
+  /// @brief Sample rate.
+  void SetSampleRate(int sampleRate) { m_cStructure->iSampleRate = sampleRate; }
+
+  /// @brief To get with @ref SetSampleRate() changed values.
+  int GetSampleRate() const { return m_cStructure->iSampleRate; }
+
+  /// @brief Block alignment
+  void SetBlockAlign(int blockAlign) { m_cStructure->iBlockAlign = blockAlign; }
+
+  /// @brief To get with @ref SetBlockAlign() changed values.
+  int GetBlockAlign() const { return m_cStructure->iBlockAlign; }
+
+  /// @brief Bit rate.
+  void SetBitRate(int bitRate) { m_cStructure->iBitRate = bitRate; }
+
+  /// @brief To get with @ref SetBitRate() changed values.
+  int GetBitRate() const { return m_cStructure->iBitRate; }
+
+  /// @brief Bits per sample.
+  void SetBitsPerSample(int bitsPerSample) { m_cStructure->iBitsPerSample = bitsPerSample; }
+
+  /// @brief To get with @ref SetBitsPerSample() changed values.
+  int GetBitsPerSample() const { return m_cStructure->iBitsPerSample; }
+  ///@}
+
+private:
+  PVRStreamProperties(const PVR_STREAM_PROPERTIES::PVR_STREAM* type) : CStructHdl(type) {}
+  PVRStreamProperties(PVR_STREAM_PROPERTIES::PVR_STREAM* type) : CStructHdl(type) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Stream_PVRStreamTimes class PVRStreamTimes
+/// @ingroup cpp_kodi_addon_pvr_Defs_Stream
+/// @brief **Times of playing stream (Live TV and recordings)**\n
+/// This class is used to transfer the necessary data when
+/// @ref kodi::addon::PVRStreamProperties::GetStreamTimes is called.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Stream_PVRStreamTimes_Help
+///
+///@{
+class PVRStreamTimes : public CStructHdl<PVRStreamTimes, PVR_STREAM_TIMES>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRStreamTimes() { memset(m_cStructure, 0, sizeof(PVR_STREAM_TIMES)); }
+  PVRStreamTimes(const PVRStreamTimes& type) : CStructHdl(type) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Stream_PVRStreamTimes_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Stream_PVRStreamTimes
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamTimes :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Start time** | `time_t` | @ref PVRStreamTimes::SetStartTime "SetStartTime" | @ref PVRStreamTimes::GetStartTime "GetStartTime"
+  /// | **PTS start** | `int64_t` | @ref PVRStreamTimes::SetPTSStart "SetPTSStart" | @ref PVRStreamTimes::GetPTSStart "GetPTSStart"
+  /// | **PTS begin** | `int64_t` | @ref PVRStreamTimes::SetPTSBegin "SetPTSBegin" | @ref PVRStreamTimes::GetPTSBegin "GetPTSBegin"
+  /// | **PTS end** | `int64_t` | @ref PVRStreamTimes::SetPTSEnd "SetPTSEnd" | @ref PVRStreamTimes::GetPTSEnd "GetPTSEnd"
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Stream_PVRStreamTimes
+  ///@{
+
+  /// @brief For recordings, this must be zero. For Live TV, this is a reference
+  /// time in units of time_t (UTC) from which time elapsed starts. Ideally start
+  /// of tv show, but can be any other value.
+  void SetStartTime(time_t startTime) { m_cStructure->startTime = startTime; }
+
+  /// @brief To get with @ref SetStartTime() changed values.
+  time_t GetStartTime() const { return m_cStructure->startTime; }
+
+  /// @brief The pts of startTime.
+  void SetPTSStart(int64_t ptsStart) { m_cStructure->ptsStart = ptsStart; }
+
+  /// @brief To get with @ref SetPTSStart() changed values.
+  int64_t GetPTSStart() const { return m_cStructure->ptsStart; }
+
+  /// @brief Earliest pts player can seek back. Value is in micro seconds,
+  /// relative to PTS start. For recordings, this must be zero. For Live TV, this
+  /// must be zero if not timeshifting and must point to begin of the timeshift
+  /// buffer, otherwise.
+  void SetPTSBegin(int64_t ptsBegin) { m_cStructure->ptsBegin = ptsBegin; }
+
+  /// @brief To get with @ref SetPTSBegin() changed values.
+  int64_t GetPTSBegin() const { return m_cStructure->ptsBegin; }
+
+  /// @brief Latest pts player can seek forward. Value is in micro seconds,
+  /// relative to PTS start. For recordings, this must be the total length. For
+  /// Live TV, this must be zero if not timeshifting and must point to end of
+  /// the timeshift buffer, otherwise.
+  void SetPTSEnd(int64_t ptsEnd) { m_cStructure->ptsEnd = ptsEnd; }
+
+  /// @brief To get with @ref SetPTSEnd() changed values.
+  int64_t GetPTSEnd() const { return m_cStructure->ptsEnd; }
+  ///@}
+
+private:
+  PVRStreamTimes(const PVR_STREAM_TIMES* type) : CStructHdl(type) {}
+  PVRStreamTimes(PVR_STREAM_TIMES* type) : CStructHdl(type) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h
new file mode 100644
index 0000000..6e05e55
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr/Timers.h
@@ -0,0 +1,896 @@
+/*
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
+ *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
+ */
+
+#pragma once
+
+#include "General.h"
+#include "../../AddonBase.h"
+#include "../../c-api/addon-instance/pvr.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Definitions group 6 - PVR timers
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace addon
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimer class PVRTimer
+/// @ingroup cpp_kodi_addon_pvr_Defs_Timer
+/// @brief **PVR add-on timer type**\n
+/// Representation of a timer event.
+///
+/// The related values here are automatically initiated to defaults and need
+/// only be set if supported and used.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Timer_PVRTimer_Help
+///
+///@{
+class PVRTimer : public CStructHdl<PVRTimer, PVR_TIMER>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRTimer()
+  {
+    m_cStructure->iClientIndex = 0;
+    m_cStructure->state = PVR_TIMER_STATE_NEW;
+    m_cStructure->iTimerType = PVR_TIMER_TYPE_NONE;
+    m_cStructure->iParentClientIndex = 0;
+    m_cStructure->iClientChannelUid = PVR_TIMER_VALUE_NOT_AVAILABLE;
+    m_cStructure->startTime = 0;
+    m_cStructure->endTime = 0;
+    m_cStructure->bStartAnyTime = false;
+    m_cStructure->bEndAnyTime = false;
+    m_cStructure->bFullTextEpgSearch = false;
+    m_cStructure->iPriority = PVR_TIMER_VALUE_NOT_AVAILABLE;
+    m_cStructure->iLifetime = PVR_TIMER_VALUE_NOT_AVAILABLE;
+    m_cStructure->iMaxRecordings = PVR_TIMER_VALUE_NOT_AVAILABLE;
+    m_cStructure->iRecordingGroup = 0;
+    m_cStructure->firstDay = 0;
+    m_cStructure->iWeekdays = PVR_WEEKDAY_NONE;
+    m_cStructure->iPreventDuplicateEpisodes = 0;
+    m_cStructure->iEpgUid = 0;
+    m_cStructure->iMarginStart = 0;
+    m_cStructure->iMarginEnd = 0;
+    m_cStructure->iGenreType = PVR_TIMER_VALUE_NOT_AVAILABLE;
+    m_cStructure->iGenreSubType = PVR_TIMER_VALUE_NOT_AVAILABLE;
+  }
+  PVRTimer(const PVRTimer& data) : CStructHdl(data) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimer_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimer
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimer :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **Client index** | `unsigned int` | @ref PVRTimer::SetClientIndex "SetClientIndex" | @ref PVRTimer::GetClientIndex "GetClientIndex" | *required to set*
+  /// | **State** | @ref PVR_TIMER_STATE | @ref PVRTimer::SetState "SetState" | @ref PVRTimer::GetState "GetState" | *required to set*
+  /// | **Type** | `unsigned int` | @ref PVRTimer::SetTimerType "SetTimerType" | @ref PVRTimer::GetTimerType "GetTimerType" | *required to set*
+  /// | **Title** | `std::string` | @ref PVRTimer::SetTitle "SetTitle" | @ref PVRTimer::GetTitle "GetTitle" | *required to set*
+  /// | **Parent client index** | `unsigned int` | @ref PVRTimer::SetParentClientIndex "SetParentClientIndex" | @ref PVRTimer::GetParentClientIndex "GetParentClientIndex" | *optional*
+  /// | **Client channel unique identifier** | `int` | @ref PVRTimer::SetClientChannelUid "SetClientChannelUid" | @ref PVRTimer::GetClientChannelUid "GetClientChannelUid" | *optional*
+  /// | **Start time** | `time_t` | @ref PVRTimer::SetStartTime "SetStartTime" | @ref PVRTimer::GetStartTime "GetStartTime" | *optional*
+  /// | **End time** | `time_t` | @ref PVRTimer::SetEndTime "SetEndTime" | @ref PVRTimer::GetEndTime "GetEndTime" | *optional*
+  /// | **Start any time** | `bool` | @ref PVRTimer::SetStartAnyTime "SetStartAnyTime" | @ref PVRTimer::GetStartAnyTime "GetStartAnyTime" | *optional*
+  /// | **End any time** | `bool` | @ref PVRTimer::SetEndAnyTime "SetEndAnyTime" | @ref PVRTimer::GetEndAnyTime "GetEndAnyTime" | *optional*
+  /// | **EPG search string** | `std::string` | @ref PVRTimer::SetEPGSearchString "SetEPGSearchString" | @ref PVRTimer::GetEPGSearchString "GetEPGSearchString" | *optional*
+  /// | **Full text EPG search** | `bool` | @ref PVRTimer::SetFullTextEpgSearch "SetFullTextEpgSearch" | @ref PVRTimer::GetFullTextEpgSearch "GetFullTextEpgSearch" | *optional*
+  /// | **Recording store directory** | `std::string` | @ref PVRTimer::SetDirectory "SetDirectory" | @ref PVRTimer::GetDirectory "GetDirectory" | *optional*
+  /// | **Timer priority** | `int` | @ref PVRTimer::SetPriority "SetPriority" | @ref PVRTimer::GetPriority "GetPriority" | *optional*
+  /// | **Timer lifetime** | `int` | @ref PVRTimer::SetLifetime "SetLifetime" | @ref PVRTimer::GetLifetime "GetLifetime" | *optional*
+  /// | **Max recordings** | `int` | @ref PVRTimer::SetMaxRecordings "SetMaxRecordings" | @ref PVRTimer::GetMaxRecordings "GetMaxRecordings" | *optional*
+  /// | **Recording group** | `unsigned int` | @ref PVRTimer::SetRecordingGroup "SetRecordingGroup" | @ref PVRTimer::GetRecordingGroup "GetRecordingGroup" | *optional*
+  /// | **First start day** | `time_t` | @ref PVRTimer::SetFirstDay "SetFirstDay" | @ref PVRTimer::GetFirstDay "GetFirstDay" | *optional*
+  /// | **Used timer weekdays** | `unsigned int` | @ref PVRTimer::SetWeekdays "SetWeekdays" | @ref PVRTimer::GetWeekdays "GetWeekdays" | *optional*
+  /// | **Prevent duplicate episodes** | `unsigned int` | @ref PVRTimer::SetPreventDuplicateEpisodes "SetPreventDuplicateEpisodes" | @ref PVRTimer::GetPreventDuplicateEpisodes "GetPreventDuplicateEpisodes" | *optional*
+  /// | **EPG unique identifier** | `unsigned int` | @ref PVRTimer::SetEPGUid "SetEPGUid" | @ref PVRTimer::GetEPGUid "GetEPGUid" | *optional*
+  /// | **Margin start** | `unsigned int` | @ref PVRTimer::SetMarginStart "SetMarginStart" | @ref PVRTimer::GetMarginStart "GetMarginStart" | *optional*
+  /// | **Margin end** | `unsigned int` | @ref PVRTimer::SetMarginEnd "SetMarginEnd" | @ref PVRTimer::GetMarginEnd "GetMarginEnd" | *optional*
+  /// | **Genre type** | `int` | @ref PVRTimer::SetGenreType "SetGenreType" | @ref PVRTimer::GetGenreType "GetGenreType" | *optional*
+  /// | **Genre sub type** | `int` | @ref PVRTimer::SetGenreSubType "SetGenreSubType" | @ref PVRTimer::GetGenreSubType "GetGenreSubType" | *optional*
+  /// | **Series link** | `std::string` | @ref PVRTimer::SetSeriesLink "SetSeriesLink" | @ref PVRTimer::GetSeriesLink "GetSeriesLink" | *optional*
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimer
+  ///@{
+
+  /// @brief **required**\n
+  /// The index of this timer given by the client.
+  ///
+  /// @ref PVR_TIMER_NO_CLIENT_INDEX indicates that the index was not yet set
+  /// by the client, for example for new timers created by Kodi and passed the
+  /// first time to the client. A valid index must be greater than
+  /// @ref PVR_TIMER_NO_CLIENT_INDEX.
+  ///
+  void SetClientIndex(unsigned int clientIndex) { m_cStructure->iClientIndex = clientIndex; }
+
+  /// @brief To get with @ref SetClientIndex changed values.
+  unsigned int GetClientIndex() const { return m_cStructure->iClientIndex; }
+
+  /// @brief **required**\n
+  /// The state of this timer.
+  ///
+  /// @note @ref PVR_TIMER_STATE_NEW is default.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRTimer tag;
+  /// tag.SetState(PVR_TIMER_STATE_RECORDING);
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetState(PVR_TIMER_STATE state) { m_cStructure->state = state; }
+
+  /// @brief To get with @ref SetState changed values.
+  PVR_TIMER_STATE GetState() const { return m_cStructure->state; }
+
+  /// @brief **required**\n
+  /// The type of this timer.
+  ///
+  /// It is private to the addon and can be freely defined by the addon.
+  /// The value must be greater than @ref PVR_TIMER_TYPE_NONE.
+  ///
+  /// Kodi does not interpret this value (except for checking for @ref PVR_TIMER_TYPE_NONE),
+  /// but will pass the right id to the addon with every @ref PVRTimer instance,
+  /// thus the addon easily can determine the timer type.
+  ///
+  /// @note @ref PVR_TIMER_TYPE_NONE is default.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRTimer tag;
+  /// tag.SetTimerType(123);
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetTimerType(unsigned int timerType) { m_cStructure->iTimerType = timerType; }
+
+  /// @brief To get with @ref SetTimerType changed values.
+  unsigned int GetTimerType() const { return m_cStructure->iTimerType; }
+
+  /// @brief **required**\n
+  /// A title for this timer.
+  void SetTitle(const std::string& title)
+  {
+    strncpy(m_cStructure->strTitle, title.c_str(), sizeof(m_cStructure->strTitle) - 1);
+  }
+
+  /// @brief To get with @ref SetTitle changed values.
+  std::string GetTitle() const { return m_cStructure->strTitle; }
+
+  /// @brief **optional**\n
+  /// For timers scheduled by a repeating timer.
+  ///
+  /// The index of the repeating timer that scheduled this timer (it's
+  /// @ref clientIndex value). Use @ref PVR_TIMER_NO_PARENT to indicate that
+  /// this timer was no scheduled by a repeating timer.
+  void SetParentClientIndex(unsigned int parentClientIndex)
+  {
+    m_cStructure->iParentClientIndex = parentClientIndex;
+  }
+
+  /// @brief To get with @ref SetParentClientIndex changed values.
+  unsigned int GetParentClientIndex() const { return m_cStructure->iParentClientIndex; }
+
+  /// @brief **optional**\n
+  /// Unique identifier of the channel to record on.
+  ///
+  /// @ref PVR_TIMER_ANY_CHANNEL will denote "any channel", not a specific one.
+  /// @ref PVR_CHANNEL_INVALID_UID denotes that channel uid is not available.
+  void SetClientChannelUid(int clientChannelUid)
+  {
+    m_cStructure->iClientChannelUid = clientChannelUid;
+  }
+
+  /// @brief To get with @ref SetClientChannelUid changed values
+  int GetClientChannelUid() const { return m_cStructure->iClientChannelUid; }
+
+  /// @brief **optional**\n
+  /// Start time of the recording in UTC.
+  ///
+  /// Instant timers that are sent to the add-on by Kodi will have this value
+  /// set to 0.
+  void SetStartTime(time_t startTime) { m_cStructure->startTime = startTime; }
+
+  /// @brief To get with @ref SetStartTime changed values.
+  time_t GetStartTime() const { return m_cStructure->startTime; }
+
+  /// @brief **optional**\n
+  /// End time of the recording in UTC.
+  void SetEndTime(time_t endTime) { m_cStructure->endTime = endTime; }
+
+  /// @brief To get with @ref SetEndTime changed values.
+  time_t GetEndTime() const { return m_cStructure->endTime; }
+
+  /// @brief **optional**\n
+  /// For EPG based (not Manual) timers indicates startTime does not apply.
+  ///
+  /// Default = false.
+  void SetStartAnyTime(bool startAnyTime) { m_cStructure->bStartAnyTime = startAnyTime; }
+
+  /// @brief To get with @ref SetStartAnyTime changed values.
+  bool GetStartAnyTime() const { return m_cStructure->bStartAnyTime; }
+
+  /// @brief **optional**\n
+  /// For EPG based (not Manual) timers indicates endTime does not apply.
+  ///
+  /// Default = false
+  void SetEndAnyTime(bool endAnyTime) { m_cStructure->bEndAnyTime = endAnyTime; }
+
+  /// @brief To get with @ref SetEndAnyTime changed values.
+  bool GetEndAnyTime() const { return m_cStructure->bEndAnyTime; }
+
+  /// @brief **optional**\n
+  /// A string used to search epg data for repeating epg-based timers.
+  ///
+  /// Format is backend-dependent, for example regexp.
+  void SetEPGSearchString(const std::string& epgSearchString)
+  {
+    strncpy(m_cStructure->strEpgSearchString, epgSearchString.c_str(),
+            sizeof(m_cStructure->strEpgSearchString) - 1);
+  }
+
+  /// @brief To get with @ref SetEPGSearchString changed values
+  std::string GetEPGSearchString() const { return m_cStructure->strEpgSearchString; }
+
+  /// @brief **optional**\n
+  /// Indicates, whether @ref SetEPGSearchString() is to match against the epg
+  /// episode title only or also against "other" epg data (backend-dependent).
+  void SetFullTextEpgSearch(bool fullTextEpgSearch)
+  {
+    m_cStructure->bFullTextEpgSearch = fullTextEpgSearch;
+  }
+
+  /// @brief To get with @ref SetFullTextEpgSearch changed values.
+  bool GetFullTextEpgSearch() const { return m_cStructure->bFullTextEpgSearch; }
+
+  /// @brief **optional**\n
+  /// The (relative) directory where the recording will be stored in.
+  void SetDirectory(const std::string& directory)
+  {
+    strncpy(m_cStructure->strDirectory, directory.c_str(), sizeof(m_cStructure->strDirectory) - 1);
+  }
+
+  /// @brief To get with @ref SetDirectory changed values.
+  std::string GetDirectory() const { return m_cStructure->strDirectory; }
+
+  /// @brief **optional**\n
+  /// The summary for this timer.
+  void SetSummary(const std::string& summary)
+  {
+    strncpy(m_cStructure->strSummary, summary.c_str(), sizeof(m_cStructure->strSummary) - 1);
+  }
+
+  /// @brief To get with @ref SetDirectory changed values.
+  std::string GetSummary() const { return m_cStructure->strSummary; }
+
+  /// @brief **optional**\n
+  /// The priority of this timer.
+  void SetPriority(int priority) { m_cStructure->iPriority = priority; }
+
+  /// @brief To get with @ref SetPriority changed values.
+  int GetPriority() const { return m_cStructure->iPriority; }
+
+  /// @brief **optional**\n
+  /// Lifetime of recordings created by this timer.
+  ///
+  /// Value > 0 days after which recordings will be deleted by the backend, < 0
+  /// addon defined integer list reference, == 0 disabled.
+  void SetLifetime(int priority) { m_cStructure->iLifetime = priority; }
+
+  /// @brief To get with @ref SetLifetime changed values.
+  int GetLifetime() const { return m_cStructure->iLifetime; }
+
+  /// @brief **optional**\n
+  /// Maximum number of recordings this timer shall create.
+  ///
+  /// Value > 0 number of recordings, < 0 addon defined integer list reference, == 0 disabled.
+  void SetMaxRecordings(int maxRecordings) { m_cStructure->iMaxRecordings = maxRecordings; }
+
+  /// @brief To get with @ref SetMaxRecordings changed values.
+  int GetMaxRecordings() const { return m_cStructure->iMaxRecordings; }
+
+  /// @brief **optional**\n
+  /// Integer ref to addon/backend defined list of recording groups.
+  void SetRecordingGroup(unsigned int recordingGroup)
+  {
+    m_cStructure->iRecordingGroup = recordingGroup;
+  }
+
+  /// @brief To get with @ref SetRecordingGroup changed values.
+  unsigned int GetRecordingGroup() const { return m_cStructure->iRecordingGroup; }
+
+  /// @brief **optional**\n
+  /// The first day this timer is active, for repeating timers.
+  void SetFirstDay(time_t firstDay) { m_cStructure->firstDay = firstDay; }
+
+  /// @brief To get with @ref SetFirstDay changed values.
+  time_t GetFirstDay() const { return m_cStructure->firstDay; }
+
+  /// @brief **optional**\n
+  /// Week days, for repeating timers (see
+  /// @ref cpp_kodi_addon_pvr_Defs_Timer_PVR_WEEKDAY "PVR_WEEKDAY_*" constant values)
+  ///
+  /// @note @ref PVR_WEEKDAY_NONE is default.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// kodi::addon::PVRTimer tag;
+  /// tag.SetWeekdays(PVR_WEEKDAY_MONDAY | PVR_WEEKDAY_SATURDAY);
+  /// ...
+  /// ~~~~~~~~~~~~~
+  void SetWeekdays(unsigned int weekdays) { m_cStructure->iWeekdays = weekdays; }
+
+  /// @brief To get with @ref SetFirstDay changed values.
+  unsigned int GetWeekdays() const { return m_cStructure->iWeekdays; }
+
+  /// @brief **optional**\n
+  /// Prevent duplicate episodes.
+  ///
+  /// Should 1 if backend should only record new episodes in case of a repeating
+  /// epg-based timer, 0 if all episodes shall be recorded (no duplicate detection).
+  ///
+  /// Actual algorithm for duplicate detection is defined by the backend.
+  /// Addons may define own values for different duplicate detection
+  /// algorithms, thus this is not just a bool.
+  void SetPreventDuplicateEpisodes(unsigned int preventDuplicateEpisodes)
+  {
+    m_cStructure->iPreventDuplicateEpisodes = preventDuplicateEpisodes;
+  }
+
+  /// @brief To get with @ref SetPreventDuplicateEpisodes changed values.
+  unsigned int GetPreventDuplicateEpisodes() const
+  {
+    return m_cStructure->iPreventDuplicateEpisodes;
+  }
+
+  /// @brief **optional**\n
+  /// EPG event id associated with this timer. Event ids must be unique for a
+  /// channel.
+  ///
+  /// Valid ids must be greater than @ref EPG_TAG_INVALID_UID.
+  void SetEPGUid(unsigned int epgUid) { m_cStructure->iEpgUid = epgUid; }
+
+  /// @brief To get with @ref SetEPGUid changed values.
+  unsigned int GetEPGUid() const { return m_cStructure->iEpgUid; }
+
+  /// @brief **optional**\n
+  /// If set, the backend starts the recording selected minutes before
+  /// @ref SetStartTime.
+  void SetMarginStart(unsigned int marginStart) { m_cStructure->iMarginStart = marginStart; }
+
+  /// @brief To get with @ref SetMarginStart changed values.
+  unsigned int GetMarginStart() const { return m_cStructure->iMarginStart; }
+
+  /// @brief **optional**\n
+  /// If set, the backend ends the recording selected minutes after
+  /// @ref SetEndTime.
+  void SetMarginEnd(unsigned int marginEnd) { m_cStructure->iMarginEnd = marginEnd; }
+
+  /// @brief To get with @ref SetMarginEnd changed values.
+  unsigned int GetMarginEnd() const { return m_cStructure->iMarginEnd; }
+
+  /// @brief **optional**\n
+  /// Genre type.
+  ///
+  /// @copydetails EPG_EVENT_CONTENTMASK
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// kodi::addon::PVRTimer tag;
+  /// tag.SetGenreType(EPG_EVENT_CONTENTMASK_MOVIEDRAMA);
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  /// @note If confirmed that backend brings the types in [ETSI EN 300 468](https://www.etsi.org/deliver/etsi_en/300400_300499/300468/01.14.01_60/en_300468v011401p.pdf)
+  /// conform values, can be @ref EPG_EVENT_CONTENTMASK ignored and to set here
+  /// with backend value.
+  ///
+  void SetGenreType(int genreType) { m_cStructure->iGenreType = genreType; }
+
+  /// @brief To get with @ref SetGenreType changed values.
+  int GetGenreType() const { return m_cStructure->iGenreType; }
+
+  /// @brief **optional**\n
+  /// Genre sub type.
+  ///
+  /// @copydetails EPG_EVENT_CONTENTMASK
+  ///
+  /// Subtypes groups related to set by @ref SetGenreType:
+  /// | Main genre type | List with available sub genre types
+  /// |-----------------|-----------------------------------------
+  /// | @ref EPG_EVENT_CONTENTMASK_UNDEFINED | Nothing, should be 0
+  /// | @ref EPG_EVENT_CONTENTMASK_MOVIEDRAMA | @ref EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA
+  /// | @ref EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS | @ref EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS
+  /// | @ref EPG_EVENT_CONTENTMASK_SHOW | @ref EPG_EVENT_CONTENTSUBMASK_SHOW
+  /// | @ref EPG_EVENT_CONTENTMASK_SPORTS | @ref EPG_EVENT_CONTENTSUBMASK_SPORTS
+  /// | @ref EPG_EVENT_CONTENTMASK_CHILDRENYOUTH | @ref EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH
+  /// | @ref EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE | @ref EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE
+  /// | @ref EPG_EVENT_CONTENTMASK_ARTSCULTURE | @ref EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE
+  /// | @ref EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS | @ref EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS
+  /// | @ref EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE | @ref EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE
+  /// | @ref EPG_EVENT_CONTENTMASK_LEISUREHOBBIES | @ref EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES
+  /// | @ref EPG_EVENT_CONTENTMASK_SPECIAL | @ref EPG_EVENT_CONTENTSUBMASK_SPECIAL
+  /// | @ref EPG_EVENT_CONTENTMASK_USERDEFINED | Can be defined by you
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// kodi::addon::PVRTimer tag;
+  /// tag.SetGenreType(EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE);
+  /// tag.SetGenreSubType(EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_JAZZ);
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetGenreSubType(int genreSubType) { m_cStructure->iGenreSubType = genreSubType; }
+
+  /// @brief To get with @ref SetGenreType changed values.
+  int GetGenreSubType() const { return m_cStructure->iGenreSubType; }
+
+  /// @brief **optional**\n
+  /// Series link for this timer.
+  ///
+  /// If set for an epg-based timer rule, matching events will be found by
+  /// checking with here, instead of @ref SetTitle() (and @ref SetFullTextEpgSearch()).
+  void SetSeriesLink(const std::string& seriesLink)
+  {
+    strncpy(m_cStructure->strSeriesLink, seriesLink.c_str(),
+            sizeof(m_cStructure->strSeriesLink) - 1);
+  }
+
+  /// @brief To get with @ref SetSeriesLink changed values.
+  std::string GetSeriesLink() const { return m_cStructure->strSeriesLink; }
+  ///@}
+
+private:
+  PVRTimer(const PVR_TIMER* data) : CStructHdl(data) {}
+  PVRTimer(PVR_TIMER* data) : CStructHdl(data) {}
+};
+
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimersResultSet class PVRTimersResultSet
+/// @ingroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimer
+/// @brief **PVR add-on timer transfer class**\n
+/// To transfer the content of @ref kodi::addon::CInstancePVRClient::GetTimers().
+///
+/// @note This becomes only be used on addon call above, not usable outside on
+/// addon itself.
+///@{
+class PVRTimersResultSet
+{
+public:
+  /*! \cond PRIVATE */
+  PVRTimersResultSet() = delete;
+  PVRTimersResultSet(const AddonInstance_PVR* instance, ADDON_HANDLE handle)
+    : m_instance(instance), m_handle(handle)
+  {
+  }
+  /*! \endcond */
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimersResultSet
+  ///@{
+
+  /// @brief To add and give content from addon to Kodi on related call.
+  ///
+  /// @param[in] tag The to transferred data.
+  void Add(const kodi::addon::PVRTimer& tag)
+  {
+    m_instance->toKodi->TransferTimerEntry(m_instance->toKodi->kodiInstance, m_handle, tag);
+  }
+
+  ///@}
+
+private:
+  const AddonInstance_PVR* m_instance = nullptr;
+  const ADDON_HANDLE m_handle;
+};
+///@}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType class PVRTimerType
+/// @ingroup cpp_kodi_addon_pvr_Defs_Timer
+/// @brief **PVR add-on timer type**\n
+/// To define the content of @ref kodi::addon::CInstancePVRClient::GetTimerTypes()
+/// given groups.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType_Help
+///
+///@{
+class PVRTimerType : public CStructHdl<PVRTimerType, PVR_TIMER_TYPE>
+{
+  friend class CInstancePVRClient;
+
+public:
+  /*! \cond PRIVATE */
+  PVRTimerType()
+  {
+    memset(m_cStructure, 0, sizeof(PVR_TIMER_TYPE));
+    m_cStructure->iPrioritiesDefault = -1;
+    m_cStructure->iLifetimesDefault = -1;
+    m_cStructure->iPreventDuplicateEpisodesDefault = -1;
+    m_cStructure->iRecordingGroupDefault = -1;
+    m_cStructure->iMaxRecordingsDefault = -1;
+  }
+  PVRTimerType(const PVRTimerType& type) : CStructHdl(type) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType_Help Value Help
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType :</b>
+  /// | Name | Type | Set call | Get call | Usage
+  /// |------|------|----------|----------|-----------
+  /// | **Identifier** | `unsigned int` | @ref PVRTimerType::SetId "SetId" | @ref PVRTimerType::GetId "GetId" | *required to set*
+  /// | **Attributes** | `unsigned int` | @ref PVRTimerType::SetAttributes "SetAttributes" | @ref PVRTimerType::GetAttributes "GetAttributes" | *required to set*
+  /// | **Description** | `std::string` | @ref PVRTimerType::SetDescription "SetDescription" | @ref PVRTimerType::GetDescription "GetDescription" | *optional*
+  /// | | | | | |
+  /// | **Priority selection** |  @ref cpp_kodi_addon_pvr_Defs_PVRTypeIntValue "PVRTypeIntValue" | @ref PVRTimerType::SetPriorities "SetPriorities" | @ref PVRTimerType::GetPriorities "GetPriorities" | *optional*
+  /// | **Priority default selection** | `int`| @ref PVRTimerType::SetPrioritiesDefault "SetPrioritiesDefault" | @ref PVRTimerType::GetPrioritiesDefault "GetPrioritiesDefault" | *optional*
+  /// | | | | | |
+  /// | **Lifetime selection** |  @ref cpp_kodi_addon_pvr_Defs_PVRTypeIntValue "PVRTypeIntValue" | @ref PVRTimerType::SetLifetimes "SetLifetimes" | @ref PVRTimerType::GetLifetimes "GetLifetimes" | *optional*
+  /// | **Lifetime default selection** | `int`| @ref PVRTimerType::SetLifetimesDefault "SetLifetimesDefault" | @ref PVRTimerType::GetLifetimesDefault "GetLifetimesDefault" | *optional*
+  /// | | | | | |
+  /// | **Prevent duplicate episodes selection** |  @ref cpp_kodi_addon_pvr_Defs_PVRTypeIntValue "PVRTypeIntValue" | @ref PVRTimerType::SetPreventDuplicateEpisodes "SetPreventDuplicateEpisodes" | @ref PVRTimerType::GetPreventDuplicateEpisodes "GetPreventDuplicateEpisodes" | *optional*
+  /// | **Prevent duplicate episodes default** | `int`| @ref PVRTimerType::SetPreventDuplicateEpisodesDefault "SetPreventDuplicateEpisodesDefault" | @ref PVRTimerType::GetPreventDuplicateEpisodesDefault "GetPreventDuplicateEpisodesDefault" | *optional*
+  /// | | | | | |
+  /// | **Recording group selection**|  @ref cpp_kodi_addon_pvr_Defs_PVRTypeIntValue "PVRTypeIntValue" | @ref PVRTimerType::SetRecordingGroups "SetRecordingGroups" | @ref PVRTimerType::GetRecordingGroups "GetRecordingGroups" | *optional*
+  /// | **Recording group default** | `int`| @ref PVRTimerType::SetRecordingGroupDefault "SetRecordingGroupDefault" | @ref PVRTimerType::GetRecordingGroupDefault "GetRecordingGroupDefault" | *optional*
+  /// | | | | | |
+  /// | **Max recordings selection** | @ref cpp_kodi_addon_pvr_Defs_PVRTypeIntValue "PVRTypeIntValue" | @ref PVRTimerType::SetMaxRecordings "SetMaxRecordings" | @ref PVRTimerType::GetMaxRecordings "GetMaxRecordings" | *optional*
+  /// | **Max recordings default** | `int`| @ref PVRTimerType::SetMaxRecordingsDefault "SetMaxRecordingsDefault" | @ref PVRTimerType::GetMaxRecordingsDefault "GetMaxRecordingsDefault" | *optional*
+  ///
+
+  /// @addtogroup cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType
+  ///@{
+
+  /// @brief **required**\n
+  /// This type's identifier. Ids must be > @ref PVR_TIMER_TYPE_NONE.
+  void SetId(unsigned int id) { m_cStructure->iId = id; }
+
+  /// @brief To get with @ref SetAttributes changed values.
+  unsigned int GetId() const { return m_cStructure->iId; }
+
+  /// @brief **required**\n
+  /// Defines the attributes for this type (@ref cpp_kodi_addon_pvr_Defs_Timer_PVR_TIMER_TYPE "PVR_TIMER_TYPE_*" constants).
+  ///
+  /// To defines the attributes for a type. These values are bit fields that can be
+  /// used together.
+  ///
+  ///--------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRTimerType tag;
+  /// tag.SetAttributes(PVR_TIMER_TYPE_IS_MANUAL | PVR_TIMER_TYPE_IS_REPEATING);
+  /// ~~~~~~~~~~~~~
+  ///
+  void SetAttributes(uint64_t attributes) { m_cStructure->iAttributes = attributes; }
+
+  /// @brief To get with @ref SetAttributes changed values.
+  uint64_t GetAttributes() const { return m_cStructure->iAttributes; }
+
+  /// @brief **optional**\n
+  /// A short localized string describing the purpose of the type. (e.g.
+  /// "Any time at this channel if title matches").
+  ///
+  /// If left blank, Kodi will generate a description based on the attributes
+  /// REPEATING and MANUAL. (e.g. "Repeating EPG-based.")
+  void SetDescription(const std::string& description)
+  {
+    strncpy(m_cStructure->strDescription, description.c_str(),
+            sizeof(m_cStructure->strDescription) - 1);
+  }
+
+  /// @brief To get with @ref SetDescription changed values.
+  std::string GetDescription() const { return m_cStructure->strDescription; }
+
+  //----------------------------------------------------------------------------
+
+  /// @brief **optional**\n
+  /// Priority value definitions.
+  ///
+  /// Array containing the possible values for @ref PVRTimer::SetPriority().
+  ///
+  /// @param[in] priorities List of priority values
+  /// @param[in] prioritiesDefault [opt] The default value in list, can also be
+  ///                              set by @ref SetPrioritiesDefault()
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_PVRTypeIntValue_Help
+  void SetPriorities(const std::vector<PVRTypeIntValue>& priorities, int prioritiesDefault = -1)
+  {
+    m_cStructure->iPrioritiesSize = static_cast<unsigned int>(priorities.size());
+    for (unsigned int i = 0;
+         i < m_cStructure->iPrioritiesSize && i < sizeof(m_cStructure->priorities); ++i)
+    {
+      m_cStructure->priorities[i].iValue = priorities[i].GetCStructure()->iValue;
+      strncpy(m_cStructure->priorities[i].strDescription,
+              priorities[i].GetCStructure()->strDescription,
+              sizeof(m_cStructure->priorities[i].strDescription) - 1);
+    }
+    if (prioritiesDefault != -1)
+      m_cStructure->iPrioritiesDefault = prioritiesDefault;
+  }
+
+  /// @brief To get with @ref SetPriorities changed values.
+  std::vector<PVRTypeIntValue> GetPriorities() const
+  {
+    std::vector<PVRTypeIntValue> ret;
+    for (unsigned int i = 0; i < m_cStructure->iPrioritiesSize; ++i)
+      ret.emplace_back(m_cStructure->priorities[i].iValue,
+                       m_cStructure->priorities[i].strDescription);
+    return ret;
+  }
+
+  /// @brief **optional**\n
+  /// The default value for @ref PVRTimer::SetPriority().
+  ///
+  /// @note Must be filled if @ref SetPriorities contain values and not
+  /// defined there on second function value.
+  void SetPrioritiesDefault(int prioritiesDefault)
+  {
+    m_cStructure->iPrioritiesDefault = prioritiesDefault;
+  }
+
+  /// @brief To get with @ref SetPrioritiesDefault changed values.
+  int GetPrioritiesDefault() const { return m_cStructure->iPrioritiesDefault; }
+
+  //----------------------------------------------------------------------------
+
+  /// @brief **optional**\n
+  /// Lifetime value definitions.
+  ///
+  /// Array containing the possible values for @ref PVRTimer::SetLifetime().
+  ///
+  /// @param[in] lifetimes List of lifetimes values
+  /// @param[in] lifetimesDefault [opt] The default value in list, can also be
+  ///                             set by @ref SetLifetimesDefault()
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_PVRTypeIntValue_Help
+  void SetLifetimes(const std::vector<PVRTypeIntValue>& lifetimes, int lifetimesDefault = -1)
+  {
+    m_cStructure->iLifetimesSize = static_cast<unsigned int>(lifetimes.size());
+    for (unsigned int i = 0;
+         i < m_cStructure->iLifetimesSize && i < sizeof(m_cStructure->lifetimes); ++i)
+    {
+      m_cStructure->lifetimes[i].iValue = lifetimes[i].GetCStructure()->iValue;
+      strncpy(m_cStructure->lifetimes[i].strDescription,
+              lifetimes[i].GetCStructure()->strDescription,
+              sizeof(m_cStructure->lifetimes[i].strDescription) - 1);
+    }
+    if (lifetimesDefault != -1)
+      m_cStructure->iLifetimesDefault = lifetimesDefault;
+  }
+
+  /// @brief To get with @ref SetLifetimes changed values.
+  std::vector<PVRTypeIntValue> GetLifetimes() const
+  {
+    std::vector<PVRTypeIntValue> ret;
+    for (unsigned int i = 0; i < m_cStructure->iLifetimesSize; ++i)
+      ret.emplace_back(m_cStructure->lifetimes[i].iValue,
+                       m_cStructure->lifetimes[i].strDescription);
+    return ret;
+  }
+
+  /// @brief **optional**\n
+  /// The default value for @ref SetLifetimes().
+  ///
+  /// @note Must be filled if @ref SetLifetimes contain values and not
+  /// defined there on second function value.
+  void SetLifetimesDefault(int lifetimesDefault)
+  {
+    m_cStructure->iLifetimesDefault = lifetimesDefault;
+  }
+
+  /// @brief To get with @ref SetLifetimesDefault changed values.
+  int GetLifetimesDefault() const { return m_cStructure->iLifetimesDefault; }
+
+  //----------------------------------------------------------------------------
+
+  /// @brief **optional**\n
+  /// Prevent duplicate episodes value definitions.
+  ///
+  /// Array containing the possible values for @ref PVRTimer::SetPreventDuplicateEpisodes().
+  ///
+  /// @note Must be filled if @ref PVRTimer::SetPreventDuplicateEpisodes() is not empty.
+  ///
+  /// @param[in] preventDuplicateEpisodes List of duplicate episodes values
+  /// @param[in] preventDuplicateEpisodesDefault [opt] The default value in list, can also be
+  ///                                            set by @ref SetPreventDuplicateEpisodesDefault()
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_PVRTypeIntValue_Help
+  void SetPreventDuplicateEpisodes(
+      const std::vector<PVRTypeIntValue>& preventDuplicateEpisodes,
+      int preventDuplicateEpisodesDefault = -1)
+  {
+    m_cStructure->iPreventDuplicateEpisodesSize =
+        static_cast<unsigned int>(preventDuplicateEpisodes.size());
+    for (unsigned int i = 0; i < m_cStructure->iPreventDuplicateEpisodesSize &&
+                             i < sizeof(m_cStructure->preventDuplicateEpisodes);
+         ++i)
+    {
+      m_cStructure->preventDuplicateEpisodes[i].iValue =
+          preventDuplicateEpisodes[i].GetCStructure()->iValue;
+      strncpy(m_cStructure->preventDuplicateEpisodes[i].strDescription,
+              preventDuplicateEpisodes[i].GetCStructure()->strDescription,
+              sizeof(m_cStructure->preventDuplicateEpisodes[i].strDescription) - 1);
+    }
+    if (preventDuplicateEpisodesDefault != -1)
+      m_cStructure->iPreventDuplicateEpisodesDefault = preventDuplicateEpisodesDefault;
+  }
+
+  /// @brief To get with @ref SetPreventDuplicateEpisodes changed values.
+  std::vector<PVRTypeIntValue> GetPreventDuplicateEpisodes() const
+  {
+    std::vector<PVRTypeIntValue> ret;
+    for (unsigned int i = 0; i < m_cStructure->iPreventDuplicateEpisodesSize; ++i)
+      ret.emplace_back(m_cStructure->preventDuplicateEpisodes[i].iValue,
+                       m_cStructure->preventDuplicateEpisodes[i].strDescription);
+    return ret;
+  }
+
+  /// @brief **optional**\n
+  /// The default value for @ref PVRTimer::SetPreventDuplicateEpisodes().
+  ///
+  /// @note Must be filled if @ref SetPreventDuplicateEpisodes contain values and not
+  /// defined there on second function value.
+  void SetPreventDuplicateEpisodesDefault(int preventDuplicateEpisodesDefault)
+  {
+    m_cStructure->iPreventDuplicateEpisodesDefault = preventDuplicateEpisodesDefault;
+  }
+
+  /// @brief To get with @ref SetPreventDuplicateEpisodesDefault changed values.
+  int GetPreventDuplicateEpisodesDefault() const
+  {
+    return m_cStructure->iPreventDuplicateEpisodesDefault;
+  }
+
+  //----------------------------------------------------------------------------
+
+  /// @brief **optional**\n
+  /// Array containing the possible values of @ref PVRTimer::SetRecordingGroup()
+  ///
+  /// @param[in] recordingGroup List of recording group values
+  /// @param[in] recordingGroupDefault [opt] The default value in list, can also be
+  ///                                  set by @ref SetRecordingGroupDefault()
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_PVRTypeIntValue_Help
+  void SetRecordingGroups(const std::vector<PVRTypeIntValue>& recordingGroup,
+                          int recordingGroupDefault = -1)
+  {
+    m_cStructure->iRecordingGroupSize = static_cast<unsigned int>(recordingGroup.size());
+    for (unsigned int i = 0;
+         i < m_cStructure->iRecordingGroupSize && i < sizeof(m_cStructure->recordingGroup); ++i)
+    {
+      m_cStructure->recordingGroup[i].iValue = recordingGroup[i].GetCStructure()->iValue;
+      strncpy(m_cStructure->recordingGroup[i].strDescription,
+              recordingGroup[i].GetCStructure()->strDescription,
+              sizeof(m_cStructure->recordingGroup[i].strDescription) - 1);
+    }
+    if (recordingGroupDefault != -1)
+      m_cStructure->iRecordingGroupDefault = recordingGroupDefault;
+  }
+
+  /// @brief To get with @ref SetRecordingGroups changed values
+  std::vector<PVRTypeIntValue> GetRecordingGroups() const
+  {
+    std::vector<PVRTypeIntValue> ret;
+    for (unsigned int i = 0; i < m_cStructure->iRecordingGroupSize; ++i)
+      ret.emplace_back(m_cStructure->recordingGroup[i].iValue,
+                       m_cStructure->recordingGroup[i].strDescription);
+    return ret;
+  }
+
+  /// @brief **optional**\n
+  /// The default value for @ref PVRTimer::SetRecordingGroup().
+  ///
+  /// @note Must be filled if @ref SetRecordingGroups contain values and not
+  /// defined there on second function value.
+  void SetRecordingGroupDefault(int recordingGroupDefault)
+  {
+    m_cStructure->iRecordingGroupDefault = recordingGroupDefault;
+  }
+
+  /// @brief To get with @ref SetRecordingGroupDefault changed values
+  int GetRecordingGroupDefault() const { return m_cStructure->iRecordingGroupDefault; }
+
+  //----------------------------------------------------------------------------
+
+  /// @brief **optional**\n
+  /// Array containing the possible values of @ref PVRTimer::SetMaxRecordings().
+  ///
+  /// @param[in] maxRecordings List of lifetimes values
+  /// @param[in] maxRecordingsDefault [opt] The default value in list, can also be
+  ///                                 set by @ref SetMaxRecordingsDefault()
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_pvr_Defs_PVRTypeIntValue_Help
+  void SetMaxRecordings(const std::vector<PVRTypeIntValue>& maxRecordings,
+                        int maxRecordingsDefault = -1)
+  {
+    m_cStructure->iMaxRecordingsSize = static_cast<unsigned int>(maxRecordings.size());
+    for (unsigned int i = 0;
+         i < m_cStructure->iMaxRecordingsSize && i < sizeof(m_cStructure->maxRecordings); ++i)
+    {
+      m_cStructure->maxRecordings[i].iValue = maxRecordings[i].GetCStructure()->iValue;
+      strncpy(m_cStructure->maxRecordings[i].strDescription,
+              maxRecordings[i].GetCStructure()->strDescription,
+              sizeof(m_cStructure->maxRecordings[i].strDescription) - 1);
+    }
+    if (maxRecordingsDefault != -1)
+      m_cStructure->iMaxRecordingsDefault = maxRecordingsDefault;
+  }
+
+  /// @brief To get with @ref SetMaxRecordings changed values
+  std::vector<PVRTypeIntValue> GetMaxRecordings() const
+  {
+    std::vector<PVRTypeIntValue> ret;
+    for (unsigned int i = 0; i < m_cStructure->iMaxRecordingsSize; ++i)
+      ret.emplace_back(m_cStructure->maxRecordings[i].iValue,
+                       m_cStructure->maxRecordings[i].strDescription);
+    return ret;
+  }
+
+  /// @brief **optional**\n
+  /// The default value for @ref SetMaxRecordings().
+  ///
+  /// Can be set with here if on @ref SetMaxRecordings not given as second value.
+  void SetMaxRecordingsDefault(int maxRecordingsDefault)
+  {
+    m_cStructure->iMaxRecordingsDefault = maxRecordingsDefault;
+  }
+
+  /// @brief To get with @ref SetMaxRecordingsDefault changed values
+  int GetMaxRecordingsDefault() const { return m_cStructure->iMaxRecordingsDefault; }
+  ///@}
+
+private:
+  PVRTimerType(const PVR_TIMER_TYPE* type) : CStructHdl(type) {}
+  PVRTimerType(PVR_TIMER_TYPE* type) : CStructHdl(type) {}
+};
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace addon */
+} /* namespace kodi */
+
+#endif /* __cplusplus */