221 files changed, 25516 insertions, 11996 deletions

diff --git a/cmake/KodiConfig.cmake.in b/cmake/KodiConfig.cmake.in
index 9ec1215..a06d889 100644
--- a/cmake/KodiConfig.cmake.in
+++ b/cmake/KodiConfig.cmake.in
@@ -4,6 +4,7 @@ set(APP_NAME_UC @APP_NAME_UC@)
 set(APP_PACKAGE @APP_PACKAGE@)
 set(APP_VERSION_MAJOR @APP_VERSION_MAJOR@)
 set(APP_VERSION_MINOR @APP_VERSION_MINOR@)
+set(APP_VERSION_CODE @APP_VERSION_CODE@)
 if(NOT @APP_NAME_UC@_PREFIX)
   set(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
 endif()
@@ -17,9 +18,6 @@ if(NOT @APP_NAME_UC@_DATA_DIR)
   set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)
 endif()
 set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM@)
-if(NOT WIN32)
-  set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
-endif()
 list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake)
 
 string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@")
diff --git a/cmake/README.md b/cmake/README.md
index 2febe48..9fd5d1b 100644
--- a/cmake/README.md
+++ b/cmake/README.md
@@ -5,7 +5,7 @@ Welcome to Kodi's CMake Based Build System. CMake is a cross-platform tool for g
 
 * Linux (several distros)
 * Windows
-* macOS and iOS
+* macOS, iOS and tvOS
 * Android
 * FreeBSD
 
diff --git a/cmake/addons/CMakeLists.txt b/cmake/addons/CMakeLists.txt
index 5fc798b..3dccc01 100644
--- a/cmake/addons/CMakeLists.txt
+++ b/cmake/addons/CMakeLists.txt
@@ -80,6 +80,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
                      -DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION})
 endif()
 
+include(${CORE_SOURCE_DIR}/cmake/scripts/common/CompilerSettings.cmake)
+
 set(BUILD_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
                -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                -DPACKAGE_CONFIG_PATH=${ADDON_DEPENDS_PATH}/lib/pkgconfig
@@ -121,6 +123,17 @@ if(CMAKE_TOOLCHAIN_FILE)
   message(STATUS ${BUILD_ARGS})
 endif()
 
+# used for addons where need special folders to store there content (if
+# not set the addon define it byself).
+# e.g. Google Chromium addon where his git bring:
+# - "unable to create file" ... "Filename too long"
+# see also WARNING by Windows on: https://bitbucket.org/chromiumembedded/cef/wiki/MasterBuildQuickStart
+if(THIRD_PARTY_PATH)
+  message(STATUS "Third party lib path specified")
+  message(STATUS ${THIRD_PARTY_PATH})
+  list(APPEND BUILD_ARGS -DTHIRD_PARTY_PATH=${THIRD_PARTY_PATH})
+endif()
+
 if(NOT ADDONS_TO_BUILD)
   set(ADDONS_TO_BUILD "all")
 else()
@@ -243,9 +256,14 @@ foreach(addon ${addons})
     if(idx GREATER -1 OR "${ADDONS_TO_BUILD}" STREQUAL "all")
       set(ADDON_FOUND TRUE)
     # Maybe we have a regex
-    elseif(id MATCHES "${ADDONS_TO_BUILD}")
-      message(STATUS "Pattern ${ADDONS_TO_BUILD} matches ${id}, building addon")
-      set(ADDON_FOUND TRUE)
+    else()
+      foreach(ADDONLISTITEM ${ADDONS_TO_BUILD})
+        if(id MATCHES "${ADDONLISTITEM}")
+          message(STATUS "Pattern ${ADDONLISTITEM} matches ${id}, building addon")
+          set(ADDON_FOUND TRUE)
+          break()
+        endif()
+      endforeach()
     endif()
 
     if(ADDON_FOUND)
@@ -376,9 +394,6 @@ foreach(addon ${addons})
                                    DEPENDERS build
                                    ALWAYS 1)
 
-          # add "kodi-platform" as a dependency to every addon
-          add_dependencies(${id} kodi-platform)
-
           set(${id}_DEPENDS_DIR ${SOURCE_DIR}/depends)
 
           if(EXISTS ${${id}_DEPENDS_DIR})
diff --git a/cmake/addons/README.md b/cmake/addons/README.md
index dd222f5..17e6460 100644
--- a/cmake/addons/README.md
+++ b/cmake/addons/README.md
@@ -1,4 +1,4 @@
-![Kodi logo](https://raw.githubusercontent.com/xbmc/xbmc-forum/master/xbmc/images/logo-sbs-black.png)
+![Kodi logo](https://github.com/xbmc/xbmc/raw/master/docs/resources/banner_slim.png)
 # Kodi add-ons CMake based buildsystem
 This directory contains the cmake-based buildsystem for Kodi add-ons. It looks into the directory pointed to by the *ADDONS_DEFINITION_DIR* option (which defaults to the *addons* sub-directory) and parses all *.txt files recursively. Each add-on must have its own `<addon-id>.txt` file in a separate sub-directory that must follow one of the defined formats:
 
diff --git a/cmake/addons/bootstrap/README.md b/cmake/addons/bootstrap/README.md
index b886b5b..52ded74 100644
--- a/cmake/addons/bootstrap/README.md
+++ b/cmake/addons/bootstrap/README.md
@@ -1,3 +1,4 @@
+![Kodi logo](https://github.com/xbmc/xbmc/raw/master/docs/resources/banner_slim.png)
 # KODI ADDON DEFINITIONS BOOTSTRAPPING
 This directory contains the cmake-based buildsystem for addon definitions
 bootstrapping which downloads the addon definitions from one or more addon
diff --git a/cmake/addons/depends/common/kodi-platform/deps.txt b/cmake/addons/depends/common/kodi-platform/deps.txt
deleted file mode 100644
index b953815..0000000
--- a/cmake/addons/depends/common/kodi-platform/deps.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-tinyxml
-p8-platform
diff --git a/cmake/addons/depends/common/kodi-platform/kodi-platform.txt b/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
deleted file mode 100644
index c553769..0000000
--- a/cmake/addons/depends/common/kodi-platform/kodi-platform.txt
+++ /dev/null
@@ -1 +0,0 @@
-kodi-platform https://github.com/xbmc/kodi-platform e8574b883ffa2131f2eeb96ff3724d60b21130f7
diff --git a/cmake/addons/depends/common/p8-platform/p8-platform.txt b/cmake/addons/depends/common/p8-platform/p8-platform.txt
deleted file mode 100644
index ae7a370..0000000
--- a/cmake/addons/depends/common/p8-platform/p8-platform.txt
+++ /dev/null
@@ -1 +0,0 @@
-p8-platform https://github.com/xbmc/platform.git 32190045c7eb6883c0662db2f91b4ceeab904fc2
diff --git a/cmake/addons/depends/common/tinyxml/CMakeLists.txt b/cmake/addons/depends/common/tinyxml/CMakeLists.txt
deleted file mode 100644
index ec396ee..0000000
--- a/cmake/addons/depends/common/tinyxml/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-project(tinyxml)
-
-set(SOURCES src/tinystr.cpp
-            src/tinyxml.cpp
-            src/tinyxmlerror.cpp
-            src/tinyxmlparser.cpp)
-
-if(WIN32)
-  add_definitions(-DWIN32 -D_LIB)
-endif()
-add_definitions(-DTIXML_USE_STL)
-
-add_library(tinyxml ${SOURCES})
-
-include_directories(${PROJECT_SOURCE_DIR}/include)
-
-set(HEADERS ${PROJECT_SOURCE_DIR}/include/tinystr.h
-            ${PROJECT_SOURCE_DIR}/include/tinyxml.h)
-
-install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-install(TARGETS tinyxml DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/cmake/addons/depends/common/tinyxml/tinyxml.sha256 b/cmake/addons/depends/common/tinyxml/tinyxml.sha256
deleted file mode 100644
index 78c07c8..0000000
--- a/cmake/addons/depends/common/tinyxml/tinyxml.sha256
+++ /dev/null
@@ -1 +0,0 @@
-8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c
diff --git a/cmake/addons/depends/common/tinyxml/tinyxml.txt b/cmake/addons/depends/common/tinyxml/tinyxml.txt
deleted file mode 100644
index f8e05e8..0000000
--- a/cmake/addons/depends/common/tinyxml/tinyxml.txt
+++ /dev/null
@@ -1 +0,0 @@
-tinyxml http://mirrors.kodi.tv/build-deps/sources/tinyxml-2.6.2_2.tar.gz
diff --git a/cmake/addons/depends/windowsstore/CMakeLists.txt b/cmake/addons/depends/windowsstore/CMakeLists.txt
deleted file mode 100644
index c8739c0..0000000
--- a/cmake/addons/depends/windowsstore/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-cmake_minimum_required(VERSION 3.1)
-project(kodi-addons-depends-windows)
-
-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release)
-endif()
-
-include(ExternalProject)
-
-if(NOT ADDON_DEPENDS_PATH)
-  message(FATAL_ERROR "ADDON_DEPENDS_PATH (${ADDON_DEPENDS_PATH}) is not a valid target directory.")
-else()
-  file(TO_CMAKE_PATH "${ADDON_DEPENDS_PATH}" ADDON_DEPENDS_PATH)
-endif()
-get_filename_component(ADDON_DEPENDS_PATH "${ADDON_DEPENDS_PATH}" ABSOLUTE)
-list(APPEND CMAKE_PREFIX_PATH ${ADDON_DEPENDS_PATH})
-
-if(NOT DEPENDS_TO_BUILD)
-  set(DEPENDS_TO_BUILD "all")
-endif()
-
-function(add_internal id url inputfile)
-  externalproject_add(${id}
-                      URL ${url}
-                      PREFIX build/${id}
-                      CONFIGURE_COMMAND ""
-                      BUILD_COMMAND ""
-                      INSTALL_COMMAND ${CMAKE_COMMAND}
-                                      -DINPUTDIR=${PROJECT_BINARY_DIR}/build/${id}/src/${id}
-                                      -DINPUTFILE=${inputfile}
-                                      -DDESTDIR=${ADDON_DEPENDS_PATH}
-                                      -P ${PROJECT_SOURCE_DIR}/Install.cmake
-                     )
-endfunction()
-
-file(GLOB_RECURSE download_input_files prebuilt/*.txt)
-foreach(file ${download_input_files})
-  if(NOT file MATCHES install.txt)
-    file(STRINGS ${file} def)
-    get_filename_component(dir ${file} DIRECTORY)
-    string(REPLACE " " ";" def ${def})
-    list(GET def 0 id)
-
-    list(FIND DEPENDS_TO_BUILD ${id} idx)
-    if(idx GREATER -1 OR DEPENDS_TO_BUILD STREQUAL "all")
-      list(GET def 1 url)
-      add_internal(${id} ${url} ${dir}/install.txt)
-    endif()
-  endif()
-endforeach()
diff --git a/cmake/addons/depends/windowsstore/Install.cmake b/cmake/addons/depends/windowsstore/Install.cmake
deleted file mode 100644
index 9a3adbb..0000000
--- a/cmake/addons/depends/windowsstore/Install.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-if(EXISTS "${INPUTFILE}")
-  # if there's an input file we use it to determine which files to copy where
-  file(STRINGS ${INPUTFILE} FILES)
-  string(REPLACE "\n" ";" FILES "${FILES}")
-  foreach(file ${FILES})
-    string(REPLACE " " ";" file "${file}")
-    list(GET file 0 dir)
-    list(GET file 1 dest)
-    list(LENGTH file deflength)
-    if(deflength GREATER 2)
-      list(GET file 2 copy)
-    endif()
-    file(GLOB files ${INPUTDIR}/${dir})
-    foreach(instfile ${files})
-      file(COPY ${instfile} DESTINATION ${DESTDIR}/${dest})
-      if(copy)
-        file(COPY ${instfile} DESTINATION ${DESTDIR}/${copy})
-      endif()
-    endforeach()
-  endforeach()
-else()
-  # otherwise we assume that the content of the extracted archive is already well-formed and can just be copied
-  file(COPY ${INPUTDIR}/${dir} DESTINATION ${DESTDIR})
-endif()
\ No newline at end of file
diff --git a/cmake/addons/depends/windowsstore/README b/cmake/addons/depends/windowsstore/README
deleted file mode 100644
index 67dc594..0000000
--- a/cmake/addons/depends/windowsstore/README
+++ /dev/null
@@ -1,19 +0,0 @@
-KODI WIN32 ADDON DEPENDENCIES
-=============================
-This directory contains the cmake-based buildsystem for dependencies (currently
-only prebuilt) used by one or multiple addons. The buildsystem looks into the
-"prebuilt" sub-directory, downloads all the specified dependencies, extracts
-them and places them into the "depends" sub-directory.
-
-To trigger the cmake-based buildsystem the following command must be executed
-with <path> being the path to this directory (absolute or relative, allowing for
-in-source and out-of-source builds).
-
-  cmake <path> [-G <generator>]
-
-cmake supports multiple generators, see
-http://www.cmake.org/cmake/help/v2.8.8/cmake.html#section_Generators for a list.
-For win32 builds one of the "Visual Studio XX" or the "NMake Makefiles"
-generators is preferred. For the "NMake Makefiles" generator to work the above
-command must be called from an environment prepared for VC++ builds (see
-http://msdn.microsoft.com/en-us/library/f2ccy3wt.aspx).
diff --git a/cmake/addons/depends/windowsstore/p8-platform/p8-platform.txt b/cmake/addons/depends/windowsstore/p8-platform/p8-platform.txt
deleted file mode 100644
index db6f782..0000000
--- a/cmake/addons/depends/windowsstore/p8-platform/p8-platform.txt
+++ /dev/null
@@ -1 +0,0 @@
-p8-platform https://github.com/afedchin/platform.git win10
diff --git a/cmake/addons/depends/windowsstore/prebuilt/README b/cmake/addons/depends/windowsstore/prebuilt/README
deleted file mode 100644
index a0c70d6..0000000
--- a/cmake/addons/depends/windowsstore/prebuilt/README
+++ /dev/null
@@ -1,21 +0,0 @@
-KODI WIN32 PREBUILT ADDON DEPENDENCIES
-======================================
-This directory contains a file or sub-directory for every prebuilt dependency
-used by one of the addons being built. There are two different modes supported.
-Both include a file named <library-id>.txt which must follow the defined format
-  <library-id> <download-url>
-
-If the archive, which the <download-url> points at, contains
- * only the necessary files and in the proper directory structure (i.e. an
-   "include" and a "lib" directory) then the file must be put into this
-   directory and nothing else is needed.
- * unnecessary files and/or does not follow the defined directory structure
-   (i.e. an "include" and a "lib" directory) then the file must be put into a
-   sub-directory named <library-id>. Furthermore an additional file called
-   "install.txt" must be placed in that sub-directory. install.txt contains a
-   line for every path/directory/file with a destination where it must be copied
-   to. It must follow the defined format
-     <source> <destination> [<copy-destination>]
-   where <source> must be an existing file, directory or a path containing
-   wildcards, <destination> and the optional <copy-destination> must be existing
-   directories.
diff --git a/cmake/cpack/deb/copyright b/cmake/cpack/deb/copyright
index 3033afd..3a3916c 100644
--- a/cmake/cpack/deb/copyright
+++ b/cmake/cpack/deb/copyright
@@ -2362,6 +2362,33 @@ LZO Library - LZO real-time data compression library
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+dav1d - AV1 cross-platform decoder
+<https://code.videolan.org/videolan/dav1d>
+
+    Copyright © 2018-2019, VideoLAN and dav1d authors
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Licenses:
 
 License: GPL
@@ -2908,3 +2935,113 @@ We are required to state that
     CompuServe Incorporated."
 
 -- End of IJG License --
+
+License: Alliance for Open Media Patent License 1.0
+
+1. License Terms.
+
+1.1. Patent License. Subject to the terms and conditions of this License, each
+     Licensor, on behalf of itself and successors in interest and assigns,
+     grants Licensee a non-sublicensable, perpetual, worldwide, non-exclusive,
+     no-charge, royalty-free, irrevocable (except as expressly stated in this
+     License) patent license to its Necessary Claims to make, use, sell, offer
+     for sale, import or distribute any Implementation.
+
+1.2. Conditions.
+
+1.2.1. Availability. As a condition to the grant of rights to Licensee to make,
+       sell, offer for sale, import or distribute an Implementation under
+       Section 1.1, Licensee must make its Necessary Claims available under
+       this License, and must reproduce this License with any Implementation
+       as follows:
+
+       a. For distribution in source code, by including this License in the
+          root directory of the source code with its Implementation.
+
+       b. For distribution in any other form (including binary, object form,
+          and/or hardware description code (e.g., HDL, RTL, Gate Level Netlist,
+          GDSII, etc.)), by including this License in the documentation, legal
+          notices, and/or other written materials provided with the
+          Implementation.
+
+1.2.2. Additional Conditions. This license is directly from Licensor to
+       Licensee.  Licensee acknowledges as a condition of benefiting from it
+       that no rights from Licensor are received from suppliers, distributors,
+       or otherwise in connection with this License.
+
+1.3. Defensive Termination. If any Licensee, its Affiliates, or its agents
+     initiates patent litigation or files, maintains, or voluntarily
+     participates in a lawsuit against another entity or any person asserting
+     that any Implementation infringes Necessary Claims, any patent licenses
+     granted under this License directly to the Licensee are immediately
+     terminated as of the date of the initiation of action unless 1) that suit
+     was in response to a corresponding suit regarding an Implementation first
+     brought against an initiating entity, or 2) that suit was brought to
+     enforce the terms of this License (including intervention in a third-party
+     action by a Licensee).
+
+1.4. Disclaimers. The Reference Implementation and Specification are provided
+     "AS IS" and without warranty. The entire risk as to implementing or
+     otherwise using the Reference Implementation or Specification is assumed
+     by the implementer and user. Licensor expressly disclaims any warranties
+     (express, implied, or otherwise), including implied warranties of
+     merchantability, non-infringement, fitness for a particular purpose, or
+     title, related to the material. IN NO EVENT WILL LICENSOR BE LIABLE TO
+     ANY OTHER PARTY FOR LOST PROFITS OR ANY FORM OF INDIRECT, SPECIAL,
+     INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER FROM ANY CAUSES OF
+     ACTION OF ANY KIND WITH RESPECT TO THIS LICENSE, WHETHER BASED ON BREACH
+     OF CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, AND WHETHER OR
+     NOT THE OTHER PARTRY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+2. Definitions.
+
+2.1. Affiliate.  “Affiliate” means an entity that directly or indirectly
+     Controls, is Controlled by, or is under common Control of that party.
+
+2.2. Control. “Control” means direct or indirect control of more than 50% of
+     the voting power to elect directors of that corporation, or for any other
+     entity, the power to direct management of such entity.
+
+2.3. Decoder.  "Decoder" means any decoder that conforms fully with all
+     non-optional portions of the Specification.
+
+2.4. Encoder.  "Encoder" means any encoder that produces a bitstream that can
+     be decoded by a Decoder only to the extent it produces such a bitstream.
+
+2.5. Final Deliverable.  “Final Deliverable” means the final version of a
+     deliverable approved by the Alliance for Open Media as a Final
+     Deliverable.
+
+2.6. Implementation.  "Implementation" means any implementation, including the
+     Reference Implementation, that is an Encoder and/or a Decoder. An
+     Implementation also includes components of an Implementation only to the
+     extent they are used as part of an Implementation.
+
+2.7. License. “License” means this license.
+
+2.8. Licensee. “Licensee” means any person or entity who exercises patent
+     rights granted under this License.
+
+2.9. Licensor.  "Licensor" means (i) any Licensee that makes, sells, offers
+     for sale, imports or distributes any Implementation, or (ii) a person
+     or entity that has a licensing obligation to the Implementation as a
+     result of its membership and/or participation in the Alliance for Open
+     Media working group that developed the Specification.
+
+2.10. Necessary Claims.  "Necessary Claims" means all claims of patents or
+      patent applications, (a) that currently or at any time in the future,
+      are owned or controlled by the Licensor, and (b) (i) would be an
+      Essential Claim as defined by the W3C Policy as of February 5, 2004
+      (https://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential)
+      as if the Specification was a W3C Recommendation; or (ii) are infringed
+      by the Reference Implementation.
+
+2.11. Reference Implementation. “Reference Implementation” means an Encoder
+      and/or Decoder released by the Alliance for Open Media as a Final
+      Deliverable.
+
+2.12. Specification. “Specification” means the specification designated by
+      the Alliance for Open Media as a Final Deliverable for which this
+      License was issued.
+
+-- End of Alliance for Open Media Patent License 1.0 License --
\ No newline at end of file
diff --git a/cmake/cpack/deb/packages/kodi.txt.in b/cmake/cpack/deb/packages/kodi.txt.in
index 4776622..78df46a 100644
--- a/cmake/cpack/deb/packages/kodi.txt.in
+++ b/cmake/cpack/deb/packages/kodi.txt.in
@@ -15,7 +15,7 @@ PACKAGE_ARCHITECTURE all
 PACKAGE_SECTION video
 PACKAGE_PRIORITY optional
 PACKAGE_SHLIBDEPS
-PACKAGE_DEPENDS @APP_NAME_LC@-bin (>= @CPACK_DEBIAN_PACKAGE_VERSION@), @APP_NAME_LC@-bin (<< @CPACK_DEBIAN_PACKAGE_VERSION@.1~), curl, libcurl4 | libcurl3, mesa-utils, x11-utils, fonts-liberation | ttf-liberation, fonts-dejavu-core | ttf-dejavu-core, python-bluez | python-lightblue, python-imaging | python-pil, python-simplejson, libass9 | libass5 | libass4, libgif5 | libgif7, libnfs8 | libnfs4 | libnfs1, libbluray1 | libbluray2, libshairplay0, libvorbisfile3, libaacs0, libcec4, libgnutls30 | libgnutls-deb0-28 | libgnutls28 | libgnutls26, libxslt1.1
+PACKAGE_DEPENDS @APP_NAME_LC@-bin (>= @CPACK_DEBIAN_PACKAGE_VERSION@), @APP_NAME_LC@-bin (<< @CPACK_DEBIAN_PACKAGE_VERSION@.1~), curl, libcurl4 | libcurl3, mesa-utils, x11-utils, fonts-liberation | ttf-liberation, fonts-dejavu-core | ttf-dejavu-core, python3-pil, python3-simplejson, libass9 | libass5 | libass4, libgif5 | libgif7, libnfs8 | libnfs4 | libnfs1, libbluray1 | libbluray2, libshairplay0, libvorbisfile3, libaacs0, libcec4, libgnutls30 | libgnutls-deb0-28 | libgnutls28 | libgnutls26, libxslt1.1
 PACKAGE_RECOMMENDS libvdpau1, libva-intel-vaapi-driver, libva1
 PACKAGE_SUGGESTS @APP_NAME_LC@-pvr-mythtv, @APP_NAME_LC@-pvr-vuplus, @APP_NAME_LC@-pvr-vdr-vnsi, @APP_NAME_LC@-pvr-njoy, @APP_NAME_LC@-pvr-nextpvr, @APP_NAME_LC@-pvr-mediaportal-tvserver, @APP_NAME_LC@-pvr-tvheadend-hts, @APP_NAME_LC@-pvr-dvbviewer, @APP_NAME_LC@-pvr-argustv, @APP_NAME_LC@-pvr-iptvsimple, @APP_NAME_LC@-audioencoder-vorbis, @APP_NAME_LC@-audioencoder-flac, @APP_NAME_LC@-audioencoder-lame
 PACKAGE_BREAKS xbmc (<< 2:14.0~git20141019), xbmc-data, xbmc-standalone
diff --git a/cmake/installdata/common/certificates.txt b/cmake/installdata/common/certificates.txt
index 14e74a7..e802c04 100644
--- a/cmake/installdata/common/certificates.txt
+++ b/cmake/installdata/common/certificates.txt
@@ -1 +1 @@
-tools/depends/target/openssl/cacert.pem system/certs
\ No newline at end of file
+system/certs/*
diff --git a/cmake/installdata/ios/fontconfig.txt b/cmake/installdata/darwin_embedded/fontconfig.txt
index 1f1bd9d..1f1bd9d 100644
--- a/cmake/installdata/ios/fontconfig.txt
+++ b/cmake/installdata/darwin_embedded/fontconfig.txt
diff --git a/cmake/installdata/ios/packaging.txt b/cmake/installdata/darwin_embedded/packaging.txt
index 3d5ae4a..3d5ae4a 100644
--- a/cmake/installdata/ios/packaging.txt
+++ b/cmake/installdata/darwin_embedded/packaging.txt
diff --git a/cmake/installdata/ios/runtime.txt b/cmake/installdata/darwin_embedded/runtime.txt
index 3bb5467..3bb5467 100644
--- a/cmake/installdata/ios/runtime.txt
+++ b/cmake/installdata/darwin_embedded/runtime.txt
diff --git a/cmake/installdata/test-reference-data.txt b/cmake/installdata/test-reference-data.txt
index b6c94a7..91738ba 100644
--- a/cmake/installdata/test-reference-data.txt
+++ b/cmake/installdata/test-reference-data.txt
@@ -1,10 +1,18 @@
 xbmc/utils/test/CXBMCTinyXML-test.xml
 xbmc/utils/test/data/language/Spanish/strings.po
+xbmc/filesystem/test/extendedlocalheader.zip
 xbmc/filesystem/test/reffile.txt
 xbmc/filesystem/test/reffile.txt.rar
 xbmc/filesystem/test/reffile.txt.zip
 xbmc/filesystem/test/refRARnormal.rar
 xbmc/filesystem/test/refRARstored.rar
+xbmc/filesystem/test/data/httpdirectory/apache-default.html
+xbmc/filesystem/test/data/httpdirectory/apache-fancy.html
+xbmc/filesystem/test/data/httpdirectory/apache-html.html
+xbmc/filesystem/test/data/httpdirectory/basic.html
+xbmc/filesystem/test/data/httpdirectory/basic-multiline.html
+xbmc/filesystem/test/data/httpdirectory/lighttp-default.html
+xbmc/filesystem/test/data/httpdirectory/nginx-default.html
 xbmc/network/test/data/test.html
 xbmc/network/test/data/test.png
 xbmc/network/test/data/test-ranges.txt
diff --git a/cmake/modules/FindAML.cmake b/cmake/modules/FindAML.cmake
deleted file mode 100644
index 89d1fd9..0000000
--- a/cmake/modules/FindAML.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-#.rst:
-# FindAML
-# -------
-# Finds the AML codec
-#
-# This will define the following variables::
-#
-# AML_FOUND - system has AML
-# AML_INCLUDE_DIRS - the AML include directory
-# AML_DEFINITIONS - the AML definitions
-#
-# and the following imported targets::
-#
-#   AML::AML   - The AML codec
-
-find_path(AML_INCLUDE_DIR codec_error.h
-                          PATH_SUFFIXES amcodec)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(AML
-                                  REQUIRED_VARS AML_INCLUDE_DIR)
-
-include(CheckCSourceCompiles)
-set(CMAKE_REQUIRED_INCLUDES ${AML_INCLUDE_DIR})
-check_c_source_compiles("#include <amcodec/codec.h>
-
-                         int main()
-                         {
-                           int i = VIDEO_DEC_FORMAT_VP9;
-                           return 0;
-                         }
-                         " AML_HAS_VP9)
-
-if(AML_FOUND)
-  set(AML_INCLUDE_DIRS ${AML_INCLUDE_DIR})
-  set(AML_DEFINITIONS -DHAS_LIBAMCODEC=1)
-  if(AML_HAS_VP9)
-    list(APPEND AML_DEFINITIONS -DHAS_LIBAMCODEC_VP9=1)
-  endif()
-
-  if(NOT TARGET AML::AML)
-    add_library(AML::AML UNKNOWN IMPORTED)
-    set_target_properties(AML::AML PROPERTIES
-                                   INTERFACE_INCLUDE_DIRECTORIES "${AML_INCLUDE_DIR}"
-                                   INTERFACE_COMPILE_DEFINITIONS HAS_LIBAMCODEC=1)
-  endif()
-endif()
-
-mark_as_advanced(AMLCODEC_INCLUDE_DIR)
diff --git a/cmake/modules/FindBluray.cmake b/cmake/modules/FindBluray.cmake
index 58a9a91..34bc50e 100644
--- a/cmake/modules/FindBluray.cmake
+++ b/cmake/modules/FindBluray.cmake
@@ -48,6 +48,10 @@ if(BLURAY_FOUND)
     list(APPEND BLURAY_DEFINITIONS -DHAVE_LIBBLURAY_BDJ=1)
   endif()
 
+  if(${BLURAY_LIBRARY} MATCHES ".+\.a$" AND PC_BLURAY_STATIC_LIBRARIES)
+    list(APPEND BLURAY_LIBRARIES ${PC_BLURAY_STATIC_LIBRARIES})
+  endif()
+
   if(NOT TARGET Bluray::Bluray)
     add_library(Bluray::Bluray UNKNOWN IMPORTED)
     if(BLURAY_LIBRARY)
diff --git a/cmake/modules/FindCdio.cmake b/cmake/modules/FindCdio.cmake
index 91ba7bc..465ecc6 100644
--- a/cmake/modules/FindCdio.cmake
+++ b/cmake/modules/FindCdio.cmake
@@ -8,47 +8,27 @@
 # CDIO_FOUND - system has cdio
 # CDIO_INCLUDE_DIRS - the cdio include directory
 # CDIO_LIBRARIES - the cdio libraries
-#
-# and the following imported targets::
-#
-#   CDIO::CDIO - The cdio library
 
 if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_CDIO libcdio>=0.78 libiso9660 QUIET)
+  pkg_check_modules(PC_CDIO libcdio>=0.80 QUIET)
 endif()
 
 find_path(CDIO_INCLUDE_DIR NAMES cdio/cdio.h
-                           PATHS ${PC_CDIO_libcdio_INCLUDEDIR}
-                                 ${PC_CDIO_libiso9660_INCLUDEDIR})
-find_library(CDIO_LIBRARY NAMES cdio libcdio
-                          PATHS ${CDIO_libcdio_LIBDIR} ${CDIO_libiso9660_LIBDIR})
+                           PATHS ${PC_CDIO_INCLUDEDIR})
 
-if(NOT WIN32)
-  find_path(ISO9660_INCLUDE_DIR NAMES cdio/iso9660.h
-                                PATHS ${PC_CDIO_libcdio_INCLUDEDIR}
-                                      ${PC_CDIO_libiso9660_INCLUDEDIR})
-  find_library(ISO9660_LIBRARY NAMES iso9660
-                               PATHS ${CDIO_libcdio_LIBDIR} ${CDIO_libiso9660_LIBDIR})
-  list(APPEND ISO9660_VARS ISO9660_INCLUDE_DIR ISO9660_LIBRARY)
-endif()
+find_library(CDIO_LIBRARY NAMES cdio libcdio
+                          PATHS ${PC_CDIO_LIBDIR})
 
-set(CDIO_VERSION ${PC_CDIO_libcdio_VERSION})
+set(CDIO_VERSION ${PC_CDIO_VERSION})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Cdio
-                                  REQUIRED_VARS CDIO_LIBRARY CDIO_INCLUDE_DIR ${ISO9660_VARS}
+                                  REQUIRED_VARS CDIO_LIBRARY CDIO_INCLUDE_DIR
                                   VERSION_VAR CDIO_VERSION)
 
 if(CDIO_FOUND)
-  set(CDIO_LIBRARIES ${CDIO_LIBRARY} ${ISO9660_LIBRARY})
-  set(CDIO_INCLUDE_DIRS ${CDIO_INCLUDE_DIR} ${ISO9660_INCLUDE_DIR})
-
-  if(NOT TARGET CDIO::CDIO)
-    add_library(CDIO::CDIO UNKNOWN IMPORTED)
-    set_target_properties(CDIO::CDIO PROPERTIES
-                                     IMPORTED_LOCATION "${CDIO_LIBRARY}"
-                                     INTERFACE_INCLUDE_DIRECTORIES "${CDIO_INCLUDE_DIR}")
-  endif()
+  set(CDIO_LIBRARIES ${CDIO_LIBRARY})
+  set(CDIO_INCLUDE_DIRS ${CDIO_INCLUDE_DIR})
 endif()
 
-mark_as_advanced(CDIO_INCLUDE_DIR CDIO_LIBRARY ISO9660_INCLUDE_DIR ISO9660_LIBRARY)
+mark_as_advanced(CDIO_INCLUDE_DIR CDIO_LIBRARY)
diff --git a/cmake/modules/FindClangFormat.cmake b/cmake/modules/FindClangFormat.cmake
new file mode 100644
index 0000000..7220d31
--- /dev/null
+++ b/cmake/modules/FindClangFormat.cmake
@@ -0,0 +1,11 @@
+#.rst:
+# FindClangFormat
+# ----------
+# Finds clang-format
+
+find_program(CLANG_FORMAT_EXECUTABLE clang-format)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ClangFormat REQUIRED_VARS CLANG_FORMAT_EXECUTABLE)
+
+mark_as_advanced(CLANG_FORMAT_EXECUTABLE)
diff --git a/cmake/modules/FindCpluff.cmake b/cmake/modules/FindCpluff.cmake
deleted file mode 100644
index 9e29e17..0000000
--- a/cmake/modules/FindCpluff.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-# - Builds Cpluff as external project
-# Once done this will define
-#
-# CPLUFF_FOUND - system has cpluff
-# CPLUFF_INCLUDE_DIRS - the cpluff include directories
-#
-# and link Kodi against the cpluff libraries.
-
-find_package(EXPAT REQUIRED)
-if(CORE_SYSTEM_NAME MATCHES windows)
-  add_subdirectory(${CMAKE_SOURCE_DIR}/lib/cpluff)
-  set(CPLUFF_LIBRARIES $<TARGET_FILE:libcpluff> ${EXPAT_LIBRARIES})
-else()
-  string(REPLACE ";" " " defines "${CMAKE_C_FLAGS} ${SYSTEM_DEFINES} -I${EXPAT_INCLUDE_DIR}")
-  get_filename_component(expat_dir ${EXPAT_LIBRARY} DIRECTORY)
-  set(ldflags "-L${expat_dir}")
-
-  # iOS: Without specifying -arch, configure tries to use /bin/cpp as C-preprocessor
-  # http://stackoverflow.com/questions/38836754/cant-cross-compile-c-library-for-arm-ios
-  if(CORE_SYSTEM_NAME STREQUAL ios)
-    set(cppflags "-arch ${CPU}")
-  endif()
-
-  ExternalProject_Add(libcpluff SOURCE_DIR ${CMAKE_SOURCE_DIR}/lib/cpluff
-                      BUILD_IN_SOURCE 1
-                      PREFIX ${CORE_BUILD_DIR}/cpluff
-                      CONFIGURE_COMMAND AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} CC=${CMAKE_C_COMPILER} ${CMAKE_SOURCE_DIR}/lib/cpluff/configure
-                                        --disable-nls
-                                        --enable-static
-                                        --disable-shared
-                                        --with-pic
-                                        --prefix=<INSTALL_DIR>
-                                        --libdir=<INSTALL_DIR>/lib
-                                        --host=${ARCH}
-                                        CFLAGS=${defines}
-                                        CPPFLAGS=${cppflags}
-                                        LDFLAGS=${ldflags}
-                      BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libcpluff.a)
-  ExternalProject_Add_Step(libcpluff autoreconf
-                                     DEPENDEES download update patch
-                                     DEPENDERS configure
-                                     COMMAND rm -f config.status
-                                     COMMAND PATH=${NATIVEPREFIX}/bin:$ENV{PATH} autoreconf -vif
-                                     WORKING_DIRECTORY <SOURCE_DIR>)
-
-  set(CPLUFF_LIBRARIES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/lib/libcpluff.a ${EXPAT_LIBRARIES})
-endif()
-set(CPLUFF_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cpluff/include)
-set(CPLUFF_FOUND 1)
-mark_as_advanced(CPLUFF_INCLUDE_DIRS CPLUFF_LIBRARIES)
-set_target_properties(libcpluff PROPERTIES FOLDER "External Projects")
diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
index 7384747..613c2a4 100644
--- a/cmake/modules/FindCrossGUID.cmake
+++ b/cmake/modules/FindCrossGUID.cmake
@@ -34,9 +34,6 @@ if(ENABLE_INTERNAL_CROSSGUID)
                                     <SOURCE_DIR> &&
                                     ${CMAKE_COMMAND} -E copy
                                     ${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/FindUUID.cmake
-                                    <SOURCE_DIR> &&
-                                    ${CMAKE_COMMAND} -E copy
-                                    ${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/FindCXX11.cmake
                                     <SOURCE_DIR>
                       BUILD_BYPRODUCTS ${CROSSGUID_LIBRARY})
   set_target_properties(crossguid PROPERTIES FOLDER "External Projects")
@@ -49,7 +46,7 @@ if(ENABLE_INTERNAL_CROSSGUID)
   set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
   set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
 else()
-  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
+  find_path(CROSSGUID_INCLUDE_DIR NAMES guid.hpp guid.h)
 
   find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
   find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
@@ -65,6 +62,10 @@ else()
     set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
     set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
 
+    if(EXISTS "${CROSSGUID_INCLUDE_DIR}/guid.hpp")
+      set(CROSSGUID_DEFINITIONS -DHAVE_NEW_CROSSGUID)
+    endif()
+
     add_custom_target(crossguid)
     set_target_properties(crossguid PROPERTIES FOLDER "External Projects")
   endif()
diff --git a/cmake/modules/FindDav1d.cmake b/cmake/modules/FindDav1d.cmake
new file mode 100644
index 0000000..7625afa
--- /dev/null
+++ b/cmake/modules/FindDav1d.cmake
@@ -0,0 +1,82 @@
+#.rst:
+# FindDav1d
+# --------
+# Finds the dav1d library
+#
+# This will define the following variables::
+#
+# DAV1D_FOUND - system has dav1d
+# DAV1D_INCLUDE_DIRS - the dav1d include directories
+# DAV1D_LIBRARIES - the dav1d libraries
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_DAV1D dav1d QUIET)
+endif()
+
+find_library(DAV1D_LIBRARY NAMES dav1d libdav1d
+                           PATHS ${PC_DAV1D_LIBDIR})
+
+find_path(DAV1D_INCLUDE_DIR NAMES dav1d/dav1d.h
+                            PATHS ${PC_DAV1D_INCLUDEDIR})
+
+set(DAV1D_VERSION ${PC_DAV1D_VERSION})
+
+if(ENABLE_INTERNAL_DAV1D)
+  include(ExternalProject)
+
+  # Extract version
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/target/dav1d/DAV1D-VERSION VER)
+
+  string(REGEX MATCH "VERSION=[^ ]*$.*" DAV1D_VER "${VER}")
+  list(GET DAV1D_VER 0 DAV1D_VER)
+  string(SUBSTRING "${DAV1D_VER}" 8 -1 DAV1D_VER)
+
+  # allow user to override the download URL with a local tarball
+  # needed for offline build envs
+  if(DAV1D_URL)
+    get_filename_component(DAV1D_URL "${DAV1D_URL}" ABSOLUTE)
+  else()
+    set(DAV1D_URL http://mirrors.kodi.tv/build-deps/sources/dav1d-${DAV1D_VER}.tar.gz)
+  endif()
+
+  if(VERBOSE)
+    message(STATUS "DAV1D_URL: ${DAV1D_URL}")
+  endif()
+
+  set(DAV1D_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libdav1d.a)
+  set(DAV1D_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
+  set(DAV1D_VERSION ${DAV1D_VER})
+
+  externalproject_add(dav1d
+                      URL ${DAV1D_URL}
+                      DOWNLOAD_NAME dav1d-${DAV1D_VER}.tar.gz
+                      DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
+                      PREFIX ${CORE_BUILD_DIR}/dav1d
+                      CONFIGURE_COMMAND meson
+                                        --buildtype=release
+                                        --default-library=static
+                                        --prefix=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                                        --libdir=lib
+                                        -Denable_asm=true
+                                        -Denable_tools=false
+                                        -Denable_examples=false
+                                        -Denable_tests=false
+                                        ../dav1d
+                      BUILD_COMMAND ninja
+                      INSTALL_COMMAND ninja install
+                      BUILD_BYPRODUCTS ${DAV1D_LIBRARY})
+
+  set_target_properties(dav1d PROPERTIES FOLDER "External Projects")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Dav1d
+                                  REQUIRED_VARS DAV1D_LIBRARY DAV1D_INCLUDE_DIR
+                                  VERSION_VAR DAV1D_VERSION)
+
+if(DAV1D_FOUND)
+  set(DAV1D_INCLUDE_DIRS ${DAV1D_INCLUDE_DIR})
+  set(DAV1D_LIBRARIES ${DAV1D_LIBRARY})
+endif()
+
+mark_as_advanced(DAV1D_INCLUDE_DIR DAV1D_LIBRARY)
diff --git a/cmake/modules/FindEpollShim.cmake b/cmake/modules/FindEpollShim.cmake
new file mode 100644
index 0000000..61366d8
--- /dev/null
+++ b/cmake/modules/FindEpollShim.cmake
@@ -0,0 +1,27 @@
+# FindEpollShim
+# -------------
+# Finds the epoll-shim library
+#
+# This will define the following variables::
+#
+# EPOLLSHIM_FOUND       - the system has epoll-shim
+# EPOLLSHIM_INCLUDE_DIR - the epoll-shim include directory
+# EPOLLSHIM_LIBRARY     - the epoll-shim library
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_EPOLLSHIM epoll-shim QUIET)
+endif()
+
+find_path(EPOLLSHIM_INCLUDE_DIR NAMES sys/epoll.h PATHS ${PC_EPOLLSHIM_INCLUDE_DIRS})
+find_library(EPOLLSHIM_LIBRARY NAMES epoll-shim PATHS ${PC_EPOLLSHIM_LIBDIR})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(EpollShim
+                                  REQUIRED_VARS EPOLLSHIM_LIBRARY EPOLLSHIM_INCLUDE_DIR)
+
+if(EPOLLSHIM_FOUND)
+  set(EPOLLSHIM_INCLUDE_DIRS ${EPOLLSHIM_INCLUDE_DIR})
+  set(EPOLLSHIM_LIBRARIES ${EPOLLSHIM_LIBRARY})
+endif()
+
+mark_as_advanced(EPOLLSHIM_INCLUDE_DIR EPOLLSHIM_LIBRARY)
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
index ef74671..81d2697 100644
--- a/cmake/modules/FindFFMPEG.cmake
+++ b/cmake/modules/FindFFMPEG.cmake
@@ -33,14 +33,14 @@
 #
 
 # required ffmpeg library versions
-set(REQUIRED_FFMPEG_VERSION 4.0)
-set(_avcodec_ver ">=58.18.100")
-set(_avfilter_ver ">=7.16.100")
-set(_avformat_ver ">=58.12.100")
-set(_avutil_ver ">=56.14.100")
-set(_swscale_ver ">=5.1.100")
-set(_swresample_ver ">=3.1.100")
-set(_postproc_ver ">=55.1.100")
+set(REQUIRED_FFMPEG_VERSION 4.3)
+set(_avcodec_ver ">=58.91.100")
+set(_avfilter_ver ">=7.85.100")
+set(_avformat_ver ">=58.45.100")
+set(_avutil_ver ">=56.51.100")
+set(_swscale_ver ">=5.7.100")
+set(_swresample_ver ">=3.7.100")
+set(_postproc_ver ">=55.7.100")
 
 
 # Allows building with external ffmpeg not found in system paths,
@@ -229,10 +229,16 @@ if(NOT FFMPEG_FOUND)
     message(STATUS "FFMPEG_URL: ${FFMPEG_URL}")
   endif()
 
+  if (NOT DAV1D_FOUND)
+    message(STATUS "dav1d not found, internal ffmpeg build will be missing AV1 support!")
+  endif()
+
   set(FFMPEG_OPTIONS -DENABLE_CCACHE=${ENABLE_CCACHE}
                      -DCCACHE_PROGRAM=${CCACHE_PROGRAM}
                      -DENABLE_VAAPI=${ENABLE_VAAPI}
-                     -DENABLE_VDPAU=${ENABLE_VDPAU})
+                     -DENABLE_VDPAU=${ENABLE_VDPAU}
+                     -DENABLE_DAV1D=${DAV1D_FOUND}
+                     -DEXTRA_FLAGS=${FFMPEG_EXTRA_FLAGS})
 
   if(KODI_DEPENDSBUILD)
     set(CROSS_ARGS -DDEPENDS_PATH=${DEPENDS_PATH}
@@ -265,6 +271,7 @@ if(NOT FFMPEG_FOUND)
                                  -DCMAKE_EXE_LINKER_FLAGS=${LINKER_FLAGS}
                                  ${CROSS_ARGS}
                                  ${FFMPEG_OPTIONS}
+                                 -DPKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig
                       PATCH_COMMAND ${CMAKE_COMMAND} -E copy
                                     ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt
                                     <SOURCE_DIR> &&
@@ -272,6 +279,10 @@ if(NOT FFMPEG_FOUND)
                                     ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake
                                     <SOURCE_DIR>)
 
+  if (ENABLE_INTERNAL_DAV1D)
+    add_dependencies(ffmpeg dav1d)
+  endif()
+
   find_program(BASH_COMMAND bash)
   if(NOT BASH_COMMAND)
     message(FATAL_ERROR "Internal FFmpeg requires bash.")
diff --git a/cmake/modules/FindFlatBuffers.cmake b/cmake/modules/FindFlatBuffers.cmake
index 6f7e6a2..5ca67c5 100644
--- a/cmake/modules/FindFlatBuffers.cmake
+++ b/cmake/modules/FindFlatBuffers.cmake
@@ -11,7 +11,7 @@
 
 if(ENABLE_INTERNAL_FLATBUFFERS)
   include(ExternalProject)
-  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/native/flatbuffers-native/Makefile VER REGEX "^[ ]*VERSION[ ]*=.+$")
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/native/flatbuffers/Makefile VER REGEX "^[ ]*VERSION[ ]*=.+$")
   string(REGEX REPLACE "^[ ]*VERSION[ ]*=[ ]*" "" FLATBUFFERS_VER "${VER}")
 
   # Allow user to override the download URL with a local tarball
@@ -43,7 +43,6 @@ if(ENABLE_INTERNAL_FLATBUFFERS)
                                  -DFLATBUFFERS_BUILD_GRPCTEST=OFF
                                  -DFLATBUFFERS_BUILD_SHAREDLIB=OFF
                                  "${EXTRA_ARGS}"
-                      PATCH_COMMAND patch -p1 < ${CORE_SOURCE_DIR}/tools/depends/native/flatbuffers-native/0001-Fix-compiler-warning.patch
                       BUILD_BYPRODUCTS ${FLATBUFFERS_FLATC_EXECUTABLE})
   set_target_properties(flatbuffers PROPERTIES FOLDER "External Projects"
                                     INTERFACE_INCLUDE_DIRECTORIES ${FLATBUFFERS_INCLUDE_DIR})
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
index 47cf8be..b426d8c 100644
--- a/cmake/modules/FindFmt.cmake
+++ b/cmake/modules/FindFmt.cmake
@@ -39,6 +39,8 @@ if(ENABLE_INTERNAL_FMT)
                       DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
                       PREFIX ${CORE_BUILD_DIR}/fmt
                       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                                 -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
+                                 -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
                                  -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                                  -DCMAKE_INSTALL_LIBDIR=lib
                                  -DFMT_DOC=OFF
@@ -57,12 +59,7 @@ if(ENABLE_INTERNAL_FMT)
 
 else()
 
-if(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore)
-  # TODO: fix windows fmt package to include fmt-config.cmake and fmt-config-version.cmake
-  set(FMT_VERSION 3.0.1)
-else()
-  find_package(FMT 3.0.1 CONFIG REQUIRED QUIET)
-endif()
+find_package(FMT 6.1.2 CONFIG REQUIRED QUIET)
 
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_FMT libfmt QUIET)
diff --git a/cmake/modules/FindFriBidi.cmake b/cmake/modules/FindFriBidi.cmake
index 91f3994..7a135e7 100644
--- a/cmake/modules/FindFriBidi.cmake
+++ b/cmake/modules/FindFriBidi.cmake
@@ -17,7 +17,8 @@ if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_FRIBIDI fribidi QUIET)
 endif()
 
-find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h
+find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi.h
+                              PATH_SUFFIXES fribidi
                               PATHS ${PC_FRIBIDI_INCLUDEDIR})
 find_library(FRIBIDI_LIBRARY NAMES fribidi libfribidi
                              PATHS ${PC_FRIBIDI_LIBDIR})
diff --git a/cmake/modules/FindGIF.cmake b/cmake/modules/FindGIF.cmake
index 1c616e0..7564a58 100644
--- a/cmake/modules/FindGIF.cmake
+++ b/cmake/modules/FindGIF.cmake
@@ -16,15 +16,9 @@
 find_path(GIF_INCLUDE_DIR gif_lib.h)
 
 include(FindPackageHandleStandardArgs)
-if(NOT WIN32)
-  find_library(GIF_LIBRARY NAMES gif)
-  find_package_handle_standard_args(GIF
-                                    REQUIRED_VARS GIF_LIBRARY GIF_INCLUDE_DIR)
-else()
-  # Dynamically loaded DLL
-  find_package_handle_standard_args(GIF
-                                    REQUIRED_VARS GIF_INCLUDE_DIR)
-endif()
+find_library(GIF_LIBRARY NAMES gif)
+find_package_handle_standard_args(GIF
+                                  REQUIRED_VARS GIF_LIBRARY GIF_INCLUDE_DIR)
 
 if(GIF_FOUND)
   set(GIF_LIBRARIES ${GIF_LIBRARY})
diff --git a/cmake/modules/FindGtest.cmake b/cmake/modules/FindGtest.cmake
new file mode 100644
index 0000000..b59554b
--- /dev/null
+++ b/cmake/modules/FindGtest.cmake
@@ -0,0 +1,84 @@
+#.rst:
+# FindGtest
+# --------
+# Finds the gtest library
+#
+# This will define the following variables::
+#
+# GTEST_FOUND - system has gtest
+# GTEST_INCLUDE_DIRS - the gtest include directories
+# GTEST_LIBRARIES - the gtest libraries
+#
+# and the following imported targets:
+#
+#   Gtest::Gtest   - The gtest library
+
+if(ENABLE_INTERNAL_GTEST)
+  include(ExternalProject)
+
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/target/googletest/Makefile VER)
+  string(REGEX MATCH "VERSION=[^ ]*" GTEST_VERSION "${VER}")
+  list(GET GTEST_VERSION 0 GTEST_VERSION)
+  string(SUBSTRING "${GTEST_VERSION}" 8 -1 GTEST_VERSION)
+
+  # allow user to override the download URL with a local tarball
+  # needed for offline build envs
+  if(GTEST_URL)
+    get_filename_component(GTEST_URL "${GTEST_URL}" ABSOLUTE)
+  else()
+    set(GTEST_URL http://mirrors.kodi.tv/build-deps/sources/googletest-${GTEST_VERSION}.tar.gz)
+  endif()
+
+  if(VERBOSE)
+    message(STATUS "GTEST_URL: ${GTEST_URL}")
+  endif()
+
+  set(GTEST_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libgtest.a)
+  set(GTEST_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
+
+  externalproject_add(gtest
+                      URL ${GTEST_URL}
+                      DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
+                      PREFIX ${CORE_BUILD_DIR}/gtest
+                      INSTALL_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                      CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DBUILD_GMOCK=OFF -DINSTALL_GTEST=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_INSTALL_LIBDIR=lib
+                      BUILD_BYPRODUCTS ${GTEST_LIBRARY})
+  set_target_properties(gtest PROPERTIES FOLDER "External Projects")
+else()
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_GTEST gtest>=1.10.0 QUIET)
+    set(GTEST_VERSION ${PC_GTEST_VERSION})
+  elseif(WIN32)
+    set(GTEST_VERSION 1.10.0)
+  endif()
+
+  find_path(GTEST_INCLUDE_DIR NAMES gtest/gtest.h
+                              PATHS ${PC_GTEST_INCLUDEDIR})
+
+  find_library(GTEST_LIBRARY_RELEASE NAMES gtest
+                                     PATHS ${PC_GTEST_LIBDIR})
+  find_library(GTEST_LIBRARY_DEBUG NAMES gtestd
+                                   PATHS ${PC_GTEST_LIBDIR})
+
+  include(SelectLibraryConfigurations)
+  select_library_configurations(GTEST)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Gtest
+                                  REQUIRED_VARS GTEST_LIBRARY GTEST_INCLUDE_DIR
+                                  VERSION_VAR GTEST_VERSION)
+
+if(GTEST_FOUND)
+  set(GTEST_LIBRARIES ${GTEST_LIBRARY})
+  set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
+endif()
+
+if(NOT TARGET Gtest::Gtest)
+  add_library(Gtest::Gtest UNKNOWN IMPORTED)
+  set_target_properties(Gtest::Gtest PROPERTIES
+                                     IMPORTED_LOCATION "${GTEST_LIBRARY}"
+                                     INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIR}")
+endif()
+
+mark_as_advanced(GTEST_INCLUDE_DIR GTEST_LIBRARY)
diff --git a/cmake/modules/FindIso9660pp.cmake b/cmake/modules/FindIso9660pp.cmake
new file mode 100644
index 0000000..5f84b55
--- /dev/null
+++ b/cmake/modules/FindIso9660pp.cmake
@@ -0,0 +1,43 @@
+#.rst:
+# FindIso9660pp
+# --------
+# Finds the iso9660++ library
+#
+# This will define the following variables::
+#
+# ISO9660PP_FOUND - system has iso9660++
+# ISO9660PP_INCLUDE_DIRS - the iso9660++ include directory
+# ISO9660PP_LIBRARIES - the iso9660++ libraries
+# ISO9660PP_DEFINITIONS  - the iso9660++ definitions
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_ISO9660PP libiso9660++>=2.1.0 QUIET)
+  pkg_check_modules(PC_ISO9660 libiso9660>=2.1.0 QUIET)
+endif()
+
+find_path(ISO9660PP_INCLUDE_DIR NAMES cdio++/iso9660.hpp
+                                PATHS ${PC_ISO9660PP_INCLUDEDIR})
+
+find_library(ISO9660PP_LIBRARY NAMES libiso9660++ iso9660++
+                               PATHS ${PC_ISO9660PP_LIBDIR})
+
+find_path(ISO9660_INCLUDE_DIR NAMES cdio/iso9660.h
+                              PATHS ${PC_ISO9660_INCLUDEDIR})
+
+find_library(ISO9660_LIBRARY NAMES libiso9660 iso9660
+                             PATHS ${PC_ISO9660_LIBDIR})
+
+set(ISO9660PP_VERSION ${PC_ISO9660PP_VERSION})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Iso9660pp
+                                  REQUIRED_VARS ISO9660PP_LIBRARY ISO9660PP_INCLUDE_DIR ISO9660_LIBRARY ISO9660_INCLUDE_DIR
+                                  VERSION_VAR ISO9660PP_VERSION)
+
+if(ISO9660PP_FOUND)
+  set(ISO9660PP_LIBRARIES ${ISO9660PP_LIBRARY} ${ISO9660_LIBRARY})
+  set(ISO9660PP_INCLUDE_DIRS ${ISO9660PP_INCLUDE_DIR} ${ISO9660_INCLUDE_DIR})
+  set(ISO9660PP_DEFINITIONS -DHAS_ISO9660PP=1)
+endif()
+
+mark_as_advanced(ISO9660PP_INCLUDE_DIR ISO9660PP_LIBRARY ISO9660_INCLUDE_DIR ISO9660_LIBRARY)
diff --git a/cmake/modules/FindLibDRM.cmake b/cmake/modules/FindLibDRM.cmake
index 4b39de3..0d680f2 100644
--- a/cmake/modules/FindLibDRM.cmake
+++ b/cmake/modules/FindLibDRM.cmake
@@ -8,6 +8,7 @@
 # LIBDRM_FOUND - system has LibDRM
 # LIBDRM_INCLUDE_DIRS - the LibDRM include directory
 # LIBDRM_LIBRARIES - the LibDRM libraries
+# LIBDRM_DEFINITIONS  - the LibDRM definitions
 #
 # and the following imported targets::
 #
@@ -30,9 +31,23 @@ find_package_handle_standard_args(LibDRM
                                   REQUIRED_VARS LIBDRM_LIBRARY LIBDRM_INCLUDE_DIR
                                   VERSION_VAR LIBDRM_VERSION)
 
+include(CheckCSourceCompiles)
+set(CMAKE_REQUIRED_INCLUDES ${LIBDRM_INCLUDE_DIR})
+check_c_source_compiles("#include <drm_mode.h>
+
+                         int main()
+                         {
+                           struct hdr_output_metadata test;
+                           return test.metadata_type;
+                         }
+                         " LIBDRM_HAS_HDR_OUTPUT_METADATA)
+
 if(LIBDRM_FOUND)
   set(LIBDRM_LIBRARIES ${LIBDRM_LIBRARY})
   set(LIBDRM_INCLUDE_DIRS ${LIBDRM_INCLUDE_DIR})
+  if(LIBDRM_HAS_HDR_OUTPUT_METADATA)
+    set(LIBDRM_DEFINITIONS -DHAVE_HDR_OUTPUT_METADATA=1)
+  endif()
 
   if(NOT TARGET LIBDRM::LIBDRM)
     add_library(LIBDRM::LIBDRM UNKNOWN IMPORTED)
diff --git a/cmake/modules/FindLibDvd.cmake b/cmake/modules/FindLibDvd.cmake
index bd08b94..44e7e92 100644
--- a/cmake/modules/FindLibDvd.cmake
+++ b/cmake/modules/FindLibDvd.cmake
@@ -89,6 +89,8 @@ else()
       set(HOST_ARCH aarch64-linux-android)
     elseif(ARCH STREQUAL i486-linux)
       set(HOST_ARCH i686-linux-android)
+    elseif(ARCH STREQUAL x86_64)
+      set(HOST_ARCH x86_64-linux-android)
     endif()
   elseif(CORE_SYSTEM_NAME STREQUAL windowsstore)
     set(LIBDVD_ADDITIONAL_ARGS "-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}" "-DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION}")
@@ -233,6 +235,7 @@ else()
       set(LIBDVD_TARGET_DIR dlls)
     endif()
     copy_file_to_buildtree(${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/libdvd/bin/libdvdnav.dll DIRECTORY ${LIBDVD_TARGET_DIR})
+    add_dependencies(export-files dvdnav)
   endif()
 
   set(LIBDVD_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/libdvd/include)
diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/FindLibUSB.cmake
index 17cf6ec..7bf3a92 100644
--- a/cmake/modules/FindLibUSB.cmake
+++ b/cmake/modules/FindLibUSB.cmake
@@ -24,7 +24,7 @@ find_library(LIBUSB_LIBRARY NAMES usb
 set(LIBUSB_VERSION ${PC_LIBUSB_VERSION})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LIBUSB
+find_package_handle_standard_args(LibUSB
                                   REQUIRED_VARS LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR
                                   VERSION_VAR LIBUSB_VERSION)
 
diff --git a/cmake/modules/FindMariaDBClient.cmake b/cmake/modules/FindMariaDBClient.cmake
index 7530ab5..374aeeb 100644
--- a/cmake/modules/FindMariaDBClient.cmake
+++ b/cmake/modules/FindMariaDBClient.cmake
@@ -28,11 +28,11 @@ endif()
 
 find_path(MARIADBCLIENT_INCLUDE_DIR NAMES mariadb/mysql.h mariadb/server/mysql.h
                                            PATHS ${PC_MARIADBCLIENT_INCLUDEDIR})
-find_library(MARIADBCLIENT_LIBRARY_RELEASE NAMES mariadbclient mariadb
+find_library(MARIADBCLIENT_LIBRARY_RELEASE NAMES mariadbclient mariadb libmariadb
                                            PATHS ${PC_MARIADBCLIENT_LIBDIR}
                                            PATH_SUFFIXES mariadb
                                            ${EXTRA_FIND_ARGS})
-find_library(MARIADBCLIENT_LIBRARY_DEBUG NAMES mariadbclient mariadb
+find_library(MARIADBCLIENT_LIBRARY_DEBUG NAMES mariadbclient mariadb libmariadbd
                                          PATHS ${PC_MARIADBCLIENT_LIBDIR}
                                          PATH_SUFFIXES mariadb
                                          ${EXTRA_FIND_ARGS})
diff --git a/cmake/modules/FindNFS.cmake b/cmake/modules/FindNFS.cmake
index c2414a1..d62d4e6 100644
--- a/cmake/modules/FindNFS.cmake
+++ b/cmake/modules/FindNFS.cmake
@@ -36,6 +36,44 @@ if(NFS_FOUND)
   set(NFS_INCLUDE_DIRS ${NFS_INCLUDE_DIR})
   set(NFS_DEFINITIONS -DHAS_FILESYSTEM_NFS=1)
 
+  set(CMAKE_REQUIRED_INCLUDES "${NFS_INCLUDE_DIR}")
+  set(CMAKE_REQUIRED_LIBRARIES ${NFS_LIBRARY})
+  if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+    set(NFS_CXX_INCLUDE "#include <Winsock2.h>")
+    set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} "ws2_32.lib")
+  endif()
+
+# Check for nfs_set_timeout
+  check_cxx_source_compiles("
+     ${NFS_CXX_INCLUDE}
+     #include <nfsc/libnfs.h>
+     int main()
+     {
+       nfs_set_timeout(NULL, 0);
+     }
+  " NFS_SET_TIMEOUT)
+
+  if(NFS_SET_TIMEOUT)
+    list(APPEND NFS_DEFINITIONS -DHAS_NFS_SET_TIMEOUT)
+  endif()
+
+# Check for mount_getexports_timeout
+  check_cxx_source_compiles("
+     ${NFS_CXX_INCLUDE}
+     #include <nfsc/libnfs.h>
+     int main()
+     {
+       mount_getexports_timeout(NULL, 0);
+     }
+  " NFS_MOUNT_GETEXPORTS_TIMEOUT)
+
+  if(NFS_MOUNT_GETEXPORTS_TIMEOUT)
+    list(APPEND NFS_DEFINITIONS -DHAS_NFS_MOUNT_GETEXPORTS_TIMEOUT)
+  endif()
+
+  unset(CMAKE_REQUIRED_INCLUDES)
+  unset(CMAKE_REQUIRED_LIBRARIES)
+
   if(NOT TARGET NFS::NFS)
     add_library(NFS::NFS UNKNOWN IMPORTED)
     if(NFS_LIBRARY)
diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake
index 0191d9e..43a1367 100644
--- a/cmake/modules/FindOpenGLES.cmake
+++ b/cmake/modules/FindOpenGLES.cmake
@@ -18,7 +18,7 @@ if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET)
 endif()
 
-if(NOT CORE_SYSTEM_NAME STREQUAL ios)
+if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h
                                  PATHS ${PC_OPENGLES_INCLUDEDIR})
   find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2
diff --git a/cmake/modules/FindPlist.cmake b/cmake/modules/FindPlist.cmake
index cd143e9..2c86b74 100644
--- a/cmake/modules/FindPlist.cmake
+++ b/cmake/modules/FindPlist.cmake
@@ -23,20 +23,13 @@ find_path(PLIST_INCLUDE_DIR plist/plist.h
 
 set(PLIST_VERSION ${PC_PLIST_VERSION})
 
+find_library(PLIST_LIBRARY NAMES plist libplist
+                                 PATHS ${PC_PLIST_LIBDIR})
+
 include(FindPackageHandleStandardArgs)
-if(NOT WIN32)
-  find_library(PLIST_LIBRARY NAMES plist
-                                   PATHS ${PC_PLIST_LIBDIR})
-
-  find_package_handle_standard_args(Plist
-                                    REQUIRED_VARS PLIST_LIBRARY PLIST_INCLUDE_DIR
-                                    VERSION_VAR PLIST_VERSION)
-else()
-  # Dynamically loaded DLL
-  find_package_handle_standard_args(Plist
-                                    REQUIRED_VARS PLIST_INCLUDE_DIR
-                                    VERSION_VAR PLIST_VERSION)
-endif()
+find_package_handle_standard_args(Plist
+                                  REQUIRED_VARS PLIST_LIBRARY PLIST_INCLUDE_DIR
+                                  VERSION_VAR PLIST_VERSION)
 
 if(PLIST_FOUND)
   set(PLIST_LIBRARIES ${PLIST_LIBRARY})
diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
index 213b17c..e39d4e5 100644
--- a/cmake/modules/FindPython.cmake
+++ b/cmake/modules/FindPython.cmake
@@ -6,12 +6,12 @@
 # PYTHON_LIBRARIES - The python libraries
 
 if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_PYTHON python>=2.7 QUIET)
+  pkg_check_modules(PC_PYTHON python3>=3.5 QUIET)
 endif()
 
-find_program(PYTHON_EXECUTABLE python ONLY_CMAKE_FIND_ROOT_PATH)
-find_library(PYTHON_LIBRARY NAMES python2.7 PATHS ${PC_PYTHON_LIBDIR})
-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} ${DEPENDS_PATH}/include/python2.7)
+find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH)
+find_library(PYTHON_LIBRARY NAMES python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR})
+find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.8 python3.7 python3.6 python3.5)
 
 if(KODI_DEPENDSBUILD)
   find_library(FFI_LIBRARY ffi REQUIRED)
@@ -25,7 +25,7 @@ if(KODI_DEPENDSBUILD)
 
   set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES})
 else()
-  find_package(PythonLibs 2.7 REQUIRED)
+  find_package(PythonLibs 3.5 REQUIRED)
   list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES})
 endif()
 
diff --git a/cmake/modules/FindSSE.cmake b/cmake/modules/FindSSE.cmake
index 08e3630..d9d5c7a 100644
--- a/cmake/modules/FindSSE.cmake
+++ b/cmake/modules/FindSSE.cmake
@@ -141,6 +141,7 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(SSE
                                   REQUIRED_VARS _SSE_TRUE _SSE_OK
                                   FAIL_MESSAGE "Could not find hardware support for SSE")
+set(FPHSA_NAME_MISMATCHED ON)
 find_package_handle_standard_args(SSE2
                                   REQUIRED_VARS _SSE2_TRUE _SSE2_OK
                                   FAIL_MESSAGE "Could not find hardware support for SSE2")
@@ -162,6 +163,7 @@ find_package_handle_standard_args(AVX
 find_package_handle_standard_args(AVX2
                                   REQUIRED_VARS _AVX2_TRUE _AVX2_OK
                                   FAIL_MESSAGE "Could not find hardware support for AVX2")
+unset(FPHSA_NAME_MISMATCHED)
 
 mark_as_advanced(SSE2_FOUND SSE3_FOUND SSSE3_FOUND SSE4_1_FOUND SSE4_2_FOUND AVX_FOUND AVX2_FOUND)
 
diff --git a/cmake/modules/FindSWIG.cmake b/cmake/modules/FindSWIG.cmake
index f9b27c2..fba544b 100644
--- a/cmake/modules/FindSWIG.cmake
+++ b/cmake/modules/FindSWIG.cmake
@@ -8,7 +8,7 @@
 # SWIG_FOUND - system has SWIG
 # SWIG_EXECUTABLE - the SWIG executable
 
-find_program(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig
+find_program(SWIG_EXECUTABLE NAMES swig4.0 swig3.0 swig2.0 swig
                              PATH_SUFFIXES swig)
 if(SWIG_EXECUTABLE)
   execute_process(COMMAND ${SWIG_EXECUTABLE} -swiglib
diff --git a/cmake/modules/FindShairplay.cmake b/cmake/modules/FindShairplay.cmake
index bbb3372..506cffd 100644
--- a/cmake/modules/FindShairplay.cmake
+++ b/cmake/modules/FindShairplay.cmake
@@ -17,32 +17,26 @@
 find_path(SHAIRPLAY_INCLUDE_DIR shairplay/raop.h)
 
 include(FindPackageHandleStandardArgs)
-if(NOT WIN32)
-  find_library(SHAIRPLAY_LIBRARY NAMES shairplay)
-
-  if(SHAIRPLAY_INCLUDE_DIR AND SHAIRPLAY_LIBRARY)
-    include(CheckCSourceCompiles)
-    set(CMAKE_REQUIRED_INCLUDES ${SHAIRPLAY_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_LIBRARIES ${SHAIRPLAY_LIBRARIES})
-    check_c_source_compiles("#include <shairplay/raop.h>
-
-                             int main()
-                             {
-                               struct raop_callbacks_s foo;
-                               foo.cls;
-                               return 0;
-                             }
-                            " HAVE_SHAIRPLAY_CALLBACK_CLS)
-  endif()
-
-  find_package_handle_standard_args(Shairplay
-                                    REQUIRED_VARS SHAIRPLAY_LIBRARY SHAIRPLAY_INCLUDE_DIR HAVE_SHAIRPLAY_CALLBACK_CLS)
-else()
-  # Dynamically loaded DLL
-  find_package_handle_standard_args(Shairplay
-                                    REQUIRED_VARS SHAIRPLAY_INCLUDE_DIR)
+find_library(SHAIRPLAY_LIBRARY NAMES shairplay libshairplay)
+
+if(SHAIRPLAY_INCLUDE_DIR AND SHAIRPLAY_LIBRARY)
+  include(CheckCSourceCompiles)
+  set(CMAKE_REQUIRED_INCLUDES ${SHAIRPLAY_INCLUDE_DIR})
+  set(CMAKE_REQUIRED_LIBRARIES ${SHAIRPLAY_LIBRARIES})
+  check_c_source_compiles("#include <shairplay/raop.h>
+
+                           int main()
+                           {
+                             struct raop_callbacks_s foo;
+                             foo.cls;
+                             return 0;
+                           }
+                          " HAVE_SHAIRPLAY_CALLBACK_CLS)
 endif()
 
+find_package_handle_standard_args(Shairplay
+                                  REQUIRED_VARS SHAIRPLAY_LIBRARY SHAIRPLAY_INCLUDE_DIR HAVE_SHAIRPLAY_CALLBACK_CLS)
+
 if(SHAIRPLAY_FOUND)
   set(SHAIRPLAY_LIBRARIES ${SHAIRPLAY_LIBRARY})
   set(SHAIRPLAY_INCLUDE_DIRS ${SHAIRPLAY_INCLUDE_DIR})
diff --git a/cmake/modules/FindSmbClient.cmake b/cmake/modules/FindSmbClient.cmake
index 70492ff..fde48ab 100644
--- a/cmake/modules/FindSmbClient.cmake
+++ b/cmake/modules/FindSmbClient.cmake
@@ -32,6 +32,9 @@ find_package_handle_standard_args(SmbClient
 
 if(SMBCLIENT_FOUND)
   set(SMBCLIENT_LIBRARIES ${SMBCLIENT_LIBRARY})
+  if(${SMBCLIENT_LIBRARY} MATCHES ".+\.a$" AND PC_SMBCLIENT_STATIC_LIBRARIES)
+    list(APPEND SMBCLIENT_LIBRARIES ${PC_SMBCLIENT_STATIC_LIBRARIES})
+  endif()
   set(SMBCLIENT_INCLUDE_DIRS ${SMBCLIENT_INCLUDE_DIR})
   set(SMBCLIENT_DEFINITIONS -DHAS_FILESYSTEM_SMB=1)
 
diff --git a/cmake/modules/FindSpdlog.cmake b/cmake/modules/FindSpdlog.cmake
new file mode 100644
index 0000000..270e486
--- /dev/null
+++ b/cmake/modules/FindSpdlog.cmake
@@ -0,0 +1,107 @@
+# FindSpdlog
+# -------
+# Finds the Spdlog library
+#
+# This will define the following variables:
+#
+# SPDLOG_FOUND - system has Spdlog
+# SPDLOG_INCLUDE_DIRS - the Spdlog include directory
+# SPDLOG_LIBRARIES - the Spdlog libraries
+# SPDLOG_DEFINITIONS - the Spdlog compile definitions
+#
+# and the following imported targets:
+#
+#   Spdlog::Spdlog   - The Spdlog library
+
+if(ENABLE_INTERNAL_SPDLOG)
+  include(ExternalProject)
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/target/libspdlog/Makefile VER REGEX "^[ ]*VERSION[ ]*=.+$")
+  string(REGEX REPLACE "^[ ]*VERSION[ ]*=[ ]*" "" SPDLOG_VERSION "${VER}")
+
+  # allow user to override the download URL with a local tarball
+  # needed for offline build envs
+  if(SPDLOG_URL)
+      get_filename_component(SPDLOG_URL "${SPDLOG_URL}" ABSOLUTE)
+  else()
+      set(SPDLOG_URL http://mirrors.kodi.tv/build-deps/sources/spdlog-${SPDLOG_VERSION}.tar.gz)
+  endif()
+  if(VERBOSE)
+      message(STATUS "SPDLOG_URL: ${SPDLOG_URL}")
+  endif()
+
+  if(APPLE)
+    set(EXTRA_ARGS "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}")
+  endif()
+
+  set(SPDLOG_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libspdlog.a)
+  set(SPDLOG_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
+
+  externalproject_add(spdlog
+                      URL ${SPDLOG_URL}
+                      DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
+                      PATCH_COMMAND patch -p1 -i ${CMAKE_SOURCE_DIR}/tools/depends/target/libspdlog/0001-fix_fmt_version.patch
+                      PREFIX ${CORE_BUILD_DIR}/spdlog
+                      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                                 -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
+                                 -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
+                                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+                                 -DCMAKE_INSTALL_LIBDIR=lib
+                                 -DSPDLOG_BUILD_EXAMPLE=OFF
+                                 -DSPDLOG_BUILD_TESTS=OFF
+                                 -DSPDLOG_BUILD_BENCH=OFF
+                                 -DSPDLOG_FMT_EXTERNAL=ON
+                                 -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                                 "${EXTRA_ARGS}"
+                      BUILD_BYPRODUCTS ${SPDLOG_LIBRARY})
+  set_target_properties(spdlog PROPERTIES FOLDER "External Projects")
+
+  if(ENABLE_INTERNAL_FMT)
+    add_dependencies(spdlog fmt)
+  endif()
+else()
+  find_package(spdlog 1.5.0 CONFIG REQUIRED QUIET)
+
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_SPDLOG spdlog QUIET)
+    set(SPDLOG_VERSION ${PC_SPDLOG_VERSION})
+  endif()
+
+  find_path(SPDLOG_INCLUDE_DIR NAMES spdlog/spdlog.h
+                               PATHS ${PC_SPDLOG_INCLUDEDIR})
+
+  find_library(SPDLOG_LIBRARY_RELEASE NAMES spdlog
+                                      PATHS ${PC_SPDLOG_LIBDIR})
+  find_library(SPDLOG_LIBRARY_DEBUG NAMES spdlogd
+                                    PATHS ${PC_SPDLOG_LIBDIR})
+
+  include(SelectLibraryConfigurations)
+  select_library_configurations(SPDLOG)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Spdlog
+                                  REQUIRED_VARS SPDLOG_LIBRARY SPDLOG_INCLUDE_DIR
+                                  VERSION_VAR SPDLOG_VERSION)
+
+if(SPDLOG_FOUND)
+  set(SPDLOG_LIBRARIES ${SPDLOG_LIBRARY})
+  set(SPDLOG_INCLUDE_DIRS ${SPDLOG_INCLUDE_DIR})
+  set(SPDLOG_DEFINITIONS -DSPDLOG_FMT_EXTERNAL
+                         -DSPDLOG_DEBUG_ON
+                         -DSPDLOG_NO_ATOMIC_LEVELS
+                         -DSPDLOG_ENABLE_PATTERN_PADDING)
+  if(WIN32)
+    list(APPEND SPDLOG_DEFINITIONS -DSPDLOG_WCHAR_FILENAMES
+                                   -DSPDLOG_WCHAR_TO_UTF8_SUPPORT)
+  endif()
+
+  if(NOT TARGET Spdlog::Spdlog)
+    add_library(Spdlog::Spdlog UNKNOWN IMPORTED)
+    set_target_properties(Spdlog::Spdlog PROPERTIES
+                                         IMPORTED_LOCATION "${SPDLOG_LIBRARY}"
+                                         INTERFACE_INCLUDE_DIRECTORIES "${SPDLOG_INCLUDE_DIR}"
+                                         INTERFACE_COMPILE_DEFINITIONS "${SPDLOG_DEFINITIONS}")
+  endif()
+endif()
+
+mark_as_advanced(SPDLOG_INCLUDE_DIR SPDLOG_LIBRARY)
diff --git a/cmake/modules/FindUdfread.cmake b/cmake/modules/FindUdfread.cmake
new file mode 100644
index 0000000..20fb322
--- /dev/null
+++ b/cmake/modules/FindUdfread.cmake
@@ -0,0 +1,78 @@
+#.rst:
+# FindUdfread
+# --------
+# Finds the udfread library
+#
+# This will define the following variables::
+#
+# UDFREAD_FOUND - system has udfread
+# UDFREAD_INCLUDE_DIRS - the udfread include directory
+# UDFREAD_LIBRARIES - the udfread libraries
+# UDFREAD_DEFINITIONS - the udfread definitions
+
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_UDFREAD udfread>=1.0.0 QUIET)
+endif()
+
+find_path(UDFREAD_INCLUDE_DIR NAMES udfread/udfread.h
+                          PATHS ${PC_UDFREAD_INCLUDEDIR})
+
+find_library(UDFREAD_LIBRARY NAMES udfread libudfread
+                         PATHS ${PC_UDFREAD_LIBDIR})
+
+set(UDFREAD_VERSION ${PC_UDFREAD_VERSION})
+
+if(ENABLE_INTERNAL_UDFREAD)
+  include(ExternalProject)
+
+  # Extract version
+  file(STRINGS ${CMAKE_SOURCE_DIR}/tools/depends/target/libudfread/UDFREAD-VERSION VER)
+
+  string(REGEX MATCH "VERSION=[^ ]*$.*" UDFREAD_VER "${VER}")
+  list(GET UDFREAD_VER 0 UDFREAD_VER)
+  string(SUBSTRING "${UDFREAD_VER}" 8 -1 UDFREAD_VER)
+
+  # allow user to override the download URL with a local tarball
+  # needed for offline build envs
+  if(UDFREAD_URL)
+    get_filename_component(UDFREAD_URL "${UDFREAD_URL}" ABSOLUTE)
+  else()
+    set(UDFREAD_URL http://mirrors.kodi.tv/build-deps/sources/libudfread-${UDFREAD_VER}.tar.gz)
+  endif()
+
+  if(VERBOSE)
+    message(STATUS "UDFREAD_URL: ${UDFREAD_URL}")
+  endif()
+
+  set(UDFREAD_LIBRARY ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/libudfread.a)
+  set(UDFREAD_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
+  set(UDFREAD_VERSION ${UDFREAD_VER})
+
+  externalproject_add(udfread
+                      URL ${UDFREAD_URL}
+                      DOWNLOAD_NAME libudfread-${UDFREAD_VER}.tar.gz
+                      DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download
+                      PREFIX ${CORE_BUILD_DIR}/libudfread
+                      CONFIGURE_COMMAND autoreconf -vif &&
+                                        ./configure
+                                        --enable-static
+                                        --disable-shared
+                                        --prefix=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
+                      BUILD_BYPRODUCTS ${UDFREAD_LIBRARY}
+                      BUILD_IN_SOURCE 1)
+
+  set_target_properties(udfread PROPERTIES FOLDER "External Projects")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Udfread
+                                  REQUIRED_VARS UDFREAD_LIBRARY UDFREAD_INCLUDE_DIR
+                                  VERSION_VAR UDFREAD_VERSION)
+
+if(UDFREAD_FOUND)
+  set(UDFREAD_LIBRARIES ${UDFREAD_LIBRARY})
+  set(UDFREAD_INCLUDE_DIRS ${UDFREAD_INCLUDE_DIR})
+  set(UDFREAD_DEFINITIONS -DHAS_UDFREAD=1)
+endif()
+
+mark_as_advanced(UDFREAD_INCLUDE_DIR UDFREAD_LIBRARY)
diff --git a/cmake/platform/android/defines.txt b/cmake/platform/android/defines.txt
index fa103d0..4b70e59 100644
--- a/cmake/platform/android/defines.txt
+++ b/cmake/platform/android/defines.txt
@@ -1 +1 @@
--DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID
+-DTARGET_POSIX -DTARGET_LINUX -DTARGET_ANDROID
diff --git a/cmake/platform/darwin_embedded/defines.txt b/cmake/platform/darwin_embedded/defines.txt
new file mode 100644
index 0000000..603d749
--- /dev/null
+++ b/cmake/platform/darwin_embedded/defines.txt
@@ -0,0 +1 @@
+-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_EMBEDDED
diff --git a/cmake/platform/ios/ios.cmake b/cmake/platform/darwin_embedded/ios.cmake
index 75c9b7b..4c377b7 100644
--- a/cmake/platform/ios/ios.cmake
+++ b/cmake/platform/darwin_embedded/ios.cmake
@@ -1,2 +1,3 @@
 set(PLATFORM_REQUIRED_DEPS OpenGLES)
 set(APP_RENDER_SYSTEM gles)
+list(APPEND PLATFORM_DEFINES -DTARGET_DARWIN_IOS)
diff --git a/cmake/platform/darwin_embedded/tvos.cmake b/cmake/platform/darwin_embedded/tvos.cmake
new file mode 100644
index 0000000..b29ed32
--- /dev/null
+++ b/cmake/platform/darwin_embedded/tvos.cmake
@@ -0,0 +1,3 @@
+set(PLATFORM_REQUIRED_DEPS OpenGLES)
+set(APP_RENDER_SYSTEM gles)
+list(APPEND PLATFORM_DEFINES -DTARGET_DARWIN_TVOS)
diff --git a/cmake/platform/freebsd/defines.txt b/cmake/platform/freebsd/defines.txt
index 9483597..bd23e57 100644
--- a/cmake/platform/freebsd/defines.txt
+++ b/cmake/platform/freebsd/defines.txt
@@ -1 +1 @@
--DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX
+-DTARGET_POSIX -DTARGET_FREEBSD
diff --git a/cmake/platform/freebsd/gbm.cmake b/cmake/platform/freebsd/gbm.cmake
index b273a06..2d20731 100644
--- a/cmake/platform/freebsd/gbm.cmake
+++ b/cmake/platform/freebsd/gbm.cmake
@@ -1 +1,2 @@
 include(cmake/platform/linux/gbm.cmake)
+list(APPEND PLATFORM_REQUIRED_DEPS EpollShim)
diff --git a/cmake/platform/ios/defines.txt b/cmake/platform/ios/defines.txt
deleted file mode 100644
index d0989ea..0000000
--- a/cmake/platform/ios/defines.txt
+++ /dev/null
@@ -1 +0,0 @@
--DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_IOS -D_LINUX
diff --git a/cmake/platform/linux/aml.cmake b/cmake/platform/linux/aml.cmake
deleted file mode 100644
index a151226..0000000
--- a/cmake/platform/linux/aml.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(PLATFORM_REQUIRED_DEPS OpenGLES AML EGL LibInput Xkbcommon)
-set(APP_RENDER_SYSTEM gles)
-list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS)
diff --git a/cmake/platform/linux/defines.txt b/cmake/platform/linux/defines.txt
index 3fe9c5c..88d2e6e 100644
--- a/cmake/platform/linux/defines.txt
+++ b/cmake/platform/linux/defines.txt
@@ -1 +1 @@
--DTARGET_POSIX -DTARGET_LINUX -D_LINUX -fPIC
+-DTARGET_POSIX -DTARGET_LINUX -fPIC
diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake
index e5b44ad..75b23f3 100644
--- a/cmake/platform/linux/gbm.cmake
+++ b/cmake/platform/linux/gbm.cmake
@@ -14,4 +14,4 @@ else()
 endif()
 
 # __GBM__ is needed by eglplatform.h in case it is included before gbm.h
-list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -D__GBM__=1 -DPLATFORM_SETTINGS_FILE=gbm.xml)
+list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -DEGL_NO_X11 -D__GBM__=1 -DPLATFORM_SETTINGS_FILE=gbm.xml)
diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake
index 72d9640..5d7f3d4 100644
--- a/cmake/platform/linux/x11.cmake
+++ b/cmake/platform/linux/x11.cmake
@@ -1,4 +1,17 @@
-set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM)
-set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX)
-set(APP_RENDER_SYSTEM gl)
+set(PLATFORM_REQUIRED_DEPS EGL X XRandR LibDRM)
+set(PLATFORM_OPTIONAL_DEPS VAAPI)
+
+set(X11_RENDER_SYSTEM "" CACHE STRING "Render system to use with X11: \"gl\" or \"gles\"")
+
+if(X11_RENDER_SYSTEM STREQUAL "gl")
+  list(APPEND PLATFORM_REQUIRED_DEPS OpenGl)
+  list(APPEND PLATFORM_OPTIONAL_DEPS GLX VDPAU)
+  set(APP_RENDER_SYSTEM gl)
+elseif(X11_RENDER_SYSTEM STREQUAL "gles")
+  list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES)
+  set(APP_RENDER_SYSTEM gles)
+else()
+  message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the X11 windowing system. Please set X11_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".")
+endif()
+
 list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=x11.xml)
\ No newline at end of file
diff --git a/cmake/platform/osx/defines.txt b/cmake/platform/osx/defines.txt
index 33b009e..8ebb2ba 100644
--- a/cmake/platform/osx/defines.txt
+++ b/cmake/platform/osx/defines.txt
@@ -1 +1 @@
--DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX
+-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX
diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake
index 69bb88d..1e529de 100644
--- a/cmake/scripts/android/ArchSetup.cmake
+++ b/cmake/scripts/android/ArchSetup.cmake
@@ -2,7 +2,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
   message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for android. See ${CMAKE_SOURCE_DIR}/cmake/README.md")
 endif()
 
-set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID)
+set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -DTARGET_ANDROID)
 set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE
                    -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64=1)
 
@@ -10,6 +10,7 @@ set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE
 set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/android/activity/XBMCApp.cpp)
 
 set(PLATFORM_DIR platform/linux)
+set(PLATFORMDEFS_DIR platform/posix)
 if(WITH_ARCH)
   set(ARCH ${WITH_ARCH})
 else()
@@ -26,16 +27,18 @@ else()
   elseif(CPU STREQUAL i686)
     set(ARCH i486-linux)
     set(NEON False)
+  elseif(CPU STREQUAL x86_64)
+    set(ARCH x86_64)
+    set(NEON False)
   else()
     message(SEND_ERROR "Unknown CPU: ${CPU}")
   endif()
 endif()
 
 # Additional SYSTEM_DEFINES
-list(APPEND SYSTEM_DEFINES -DHAS_ZEROCONF -DHAS_LINUX_NETWORK)
+list(APPEND SYSTEM_DEFINES -DHAS_ZEROCONF)
 
 set(ENABLE_X11 OFF CACHE BOOL "" FORCE)
-set(ENABLE_AML OFF CACHE BOOL "" FORCE)
 set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
 set(ENABLE_MDNS OFF CACHE BOOL "" FORCE)
 
diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake
index a121295..5b7b411 100644
--- a/cmake/scripts/android/Install.cmake
+++ b/cmake/scripts/android/Install.cmake
@@ -107,7 +107,7 @@ add_custom_target(bundle
                                                ${CMAKE_BINARY_DIR}/tools/android/packaging/media
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/tools/android/packaging/xbmc/res
                                                ${CMAKE_BINARY_DIR}/tools/android/packaging/xbmc/res
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/lib/python2.7 ${libdir}/python2.7
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/lib/python${PYTHON_VERSION} ${libdir}/python${PYTHON_VERSION}
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/share/${APP_NAME_LC} ${datadir}/${APP_NAME_LC}
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_NAME_LC}>
                                      ${libdir}/${APP_NAME_LC}/$<TARGET_FILE_NAME:${APP_NAME_LC}>)
@@ -153,13 +153,12 @@ foreach(lib IN LISTS required_dyload dyload_optional ITEMS Shairplay)
   endif()
 endforeach()
 add_bundle_file(${ASS_LIBRARY} ${libdir} "")
-add_bundle_file(${BLURAY_LIBRARY} ${libdir} "")
+add_bundle_file(${SHAIRPLAY_LIBRARY} ${libdir} "")
 add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "")
 
 # Main targets from Makefile.in
 if(CPU MATCHES i686)
   set(CPU x86)
-  set(ARCH x86)
 endif()
 foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean apk-sign)
   add_custom_target(${target}
@@ -168,7 +167,6 @@ foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean
               CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}
               CC=${CMAKE_C_COMPILER}
               CPU=${CPU}
-              ARCH=${ARCH}
               HOST=${HOST}
               TOOLCHAIN=${TOOLCHAIN}
               PREFIX=${prefix}
diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake
index 2f3f302..c541ad7 100644
--- a/cmake/scripts/common/AddonHelpers.cmake
+++ b/cmake/scripts/common/AddonHelpers.cmake
@@ -92,6 +92,7 @@ macro (build_addon target prefix libs)
       endforeach()
     endif()
 
+    message(STATUS "Addon dependency check ...")
     # Set defines used in addon.xml.in and read from versions.h to set add-on
     # version parts automatically
     file(STRINGS ${KODI_INCLUDE_DIR}/versions.h BIN_ADDON_PARTS)
@@ -108,7 +109,8 @@ macro (build_addon target prefix libs)
         if("${include_name}" MATCHES "_DEPENDS")
           # Use start definition name as base for other value type
           list(GET loop_var 0 list_name)
-          string(REPLACE "_DEPENDS" "" depends_name ${list_name})
+          string(REPLACE "_DEPENDS" "_MIN" depends_minver ${list_name})
+          string(REPLACE "_DEPENDS" "" depends_ver ${list_name})
           string(REPLACE "_DEPENDS" "_XML_ID" xml_entry_name ${list_name})
           string(REPLACE "_DEPENDS" "_USED" used_type_name ${list_name})
 
@@ -120,16 +122,14 @@ macro (build_addon target prefix libs)
             foreach(src_file ${USED_SOURCES})
               file(STRINGS ${src_file} BIN_ADDON_SRC_PARTS)
               foreach(loop_var ${BIN_ADDON_SRC_PARTS})
-                string(FIND "${loop_var}" "#include" matchres)
-                if("${matchres}" EQUAL 0)
-                  string(REPLACE " " ";" loop_var "${loop_var}")
-                  list(GET loop_var 1 include_name)
-                  string(REGEX REPLACE "[<>\"]|kodi/" "" include_name "${include_name}")
-                  if(include_name MATCHES ${depend_header})
-                    set(ADDON_DEPENDS "${ADDON_DEPENDS}\n<import addon=\"${${xml_entry_name}}\" version=\"${${depends_name}}\"/>")
-                    # Inform with them the addon header about used type
+                string(REGEX MATCH "^[ \t]*#[ \t]*(include|import)[ \t]*[<\"](kodi\/)?(.+)[\">]" include_name "${loop_var}")
+                if(include_name AND CMAKE_MATCH_3 MATCHES ^${depend_header})
+                  get_directory_property(CURRENT_DEFS COMPILE_DEFINITIONS)
+                  if(NOT used_type_name IN_LIST CURRENT_DEFS)
+                    set(ADDON_DEPENDS "${ADDON_DEPENDS}\n<import addon=\"${${xml_entry_name}}\" minversion=\"${${depends_minver}}\" version=\"${${depends_ver}}\"/>")
+                    # Inform with them the addon header about used type, if not present before
                     add_definitions(-D${used_type_name})
-                    message(STATUS "Added usage definition: ${used_type_name}")
+                    message(STATUS " - Added API usage definition: ${used_type_name} (Version: \"${${depends_ver}}\", Min. Version: \"${${depends_minver}}\")")
                     set(FOUND_HEADER_USAGE 1)
                   endif()
                 endif()
@@ -276,6 +276,18 @@ macro (build_addon target prefix libs)
         install(FILES ${${prefix}_ADDITIONAL_BINARY} DESTINATION ${target}
                 COMPONENT ${target}-${${prefix}_VERSION}-${PLATFORM_TAG})
       endif()
+      if(${prefix}_ADDITIONAL_BINARY_EXE)
+        install(PROGRAMS ${${prefix}_ADDITIONAL_BINARY_EXE} DESTINATION ${target}
+                COMPONENT ${target}-${${prefix}_VERSION}-${PLATFORM_TAG})
+      endif()
+      if(${prefix}_ADDITIONAL_BINARY_PARTS)
+        install(FILES ${${prefix}_ADDITIONAL_BINARY_PARTS} DESTINATION ${target}
+                COMPONENT ${target}-${${prefix}_VERSION}-${PLATFORM_TAG})
+      endif()
+      if(${prefix}_ADDITIONAL_BINARY_DIRS)
+        install(DIRECTORY ${${prefix}_ADDITIONAL_BINARY_DIRS} DESTINATION ${target} USE_SOURCE_PERMISSIONS
+                COMPONENT ${target}-${${prefix}_VERSION}-${PLATFORM_TAG})
+      endif()
     else() # NOT WIN32
       if(NOT CPACK_PACKAGE_DIRECTORY)
         set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR})
@@ -296,6 +308,18 @@ macro (build_addon target prefix libs)
         install(FILES ${${prefix}_ADDITIONAL_BINARY} DESTINATION ${target}
                 COMPONENT ${target}-${${prefix}_VERSION}-${PLATFORM_TAG})
       endif()
+      if(${prefix}_ADDITIONAL_BINARY_EXE)
+        install(PROGRAMS ${${prefix}_ADDITIONAL_BINARY_EXE} DESTINATION ${target}
+                COMPONENT ${target}-${${prefix}_VERSION}-${PLATFORM_TAG})
+      endif()
+      if(${prefix}_ADDITIONAL_BINARY_PARTS)
+        install(FILES ${${prefix}_ADDITIONAL_BINARY_PARTS} DESTINATION ${target}
+                COMPONENT ${target}-${${prefix}_VERSION}-${PLATFORM_TAG})
+      endif()
+      if(${prefix}_ADDITIONAL_BINARY_DIRS)
+        install(DIRECTORY ${${prefix}_ADDITIONAL_BINARY_DIRS} DESTINATION ${target} USE_SOURCE_PERMISSIONS
+                COMPONENT ${target}-${${prefix}_VERSION}-${PLATFORM_TAG})
+      endif()
     endif()
     add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext})
   else()
@@ -339,6 +363,15 @@ macro (build_addon target prefix libs)
     if(${prefix}_ADDITIONAL_BINARY)
       install(FILES ${${prefix}_ADDITIONAL_BINARY} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target})
     endif()
+    if(${prefix}_ADDITIONAL_BINARY_EXE)
+      install(PROGRAMS ${${prefix}_ADDITIONAL_BINARY_EXE} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target})
+    endif()
+    if(${prefix}_ADDITIONAL_BINARY_PARTS)
+      install(FILES ${${prefix}_ADDITIONAL_BINARY_PARTS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target})
+    endif()
+    if(${prefix}_ADDITIONAL_BINARY_DIRS)
+      install(DIRECTORY ${${prefix}_ADDITIONAL_BINARY_DIRS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target} USE_SOURCE_PERMISSIONS)
+    endif()
   endif()
   if(${APP_NAME_UC}_BUILD_DIR)
     file(GLOB_RECURSE files ${CMAKE_CURRENT_SOURCE_DIR}/${target}/*)
diff --git a/cmake/scripts/common/AddonHelpers.dox b/cmake/scripts/common/AddonHelpers.dox
new file mode 100644
index 0000000..d3acec0
--- /dev/null
+++ b/cmake/scripts/common/AddonHelpers.dox
@@ -0,0 +1,59 @@
+/*!
+\addtogroup cpp_cmake
+
+Kodi which uses it as a library for its binary addons has a special build
+system for this.
+
+To implement this, a CMake macro brought by Kodi is used, this is
+"build_addon (...)". This processes various definitions passed by the addon to
+process the construction.
+
+
+--------------------------------------------------------------------------------
+
+<b>Here a minmal example of the for addon used CMakeLists.txt:</b>
+
+~~~~~~~~~~~~~{.cmake}
+cmake_minimum_required(VERSION 3.5)
+project(example.addon)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
+
+find_package(Kodi REQUIRED)
+
+include_directories(${KODI_INCLUDE_DIR}
+
+set(DEPLIBS ) # Here empty
+set(EXAMPLE_SOURCES src/main.cpp)
+set(EXAMPLE_HEADERS src/main.h)
+
+build_addon((example.addon EXAMPLE DEPLIBS)
+
+include(CPack)
+~~~~~~~~~~~~~
+
+
+--------------------------------------------------------------------------------
+
+This is a list of special variables that can be passed to the macro.
+The parts defined with "*" must be given the second name given to the macro.
+
+Here to define the necessary creation and installation files on addon CMakeLists.txt:
+| Name                        | Description
+|-----------------------------|-------------------------------------------------
+| *_SOURCES                   | List of source code files to be complicated.
+| *_HEADERS                   | List of used source code header files.
+| *_CUSTOM_BINARY             | For special cases where an already created library from an external source is inserted, the <b>"* _SOURCES"</b> and <b>"* _HEADERS"</b> are unused in this case.<br>This is currently used primarily on game addons.
+| *_CUSTOM_DATA               | To add additional required data from a folder, which are stored in the shared folder of the addon.<br>With a "/" at the end of the content given to the folder is used, without the folder itself.
+| *_ADDITIONAL_BINARY         | In case the additional library has to be installed for the addon, the path or CMake name can be given here.
+| *_ADDITIONAL_BINARY_EXE     | In case you need to addon an additional application you can give the path or CMake name, it will be in the same folder as the addon library.<br>The mode bits are set there as EXE.
+| *_ADDITIONAL_BINARY_DIRS    | To add complete folders additionally to folders containing the addon library.<br>With a "/" at the end of the content given to the folder is used, without the folder itself.
+
+External creation Options, given by `-D...`:
+| Name                        | Description
+|-----------------------------|-------------------------------------------------
+| PACKAGE_ZIP                 | To create a package as a ZIP file. This is also used to install locally addon together.<br>Default is OFF.
+| PACKAGE_TGZ                 | To create a package as a TGZ file.<br>Default is OFF.
+| BUILD_SHARED_LIBS           | To define if addon library is shared or static.<br>Default is ON to have shared.
+| USE_LTO                     | Use link time optimization.<br>Default is OFF.
+*/
diff --git a/cmake/scripts/common/ArchSetup.cmake b/cmake/scripts/common/ArchSetup.cmake
index 07ce6d4..2e1eb12 100644
--- a/cmake/scripts/common/ArchSetup.cmake
+++ b/cmake/scripts/common/ArchSetup.cmake
@@ -18,24 +18,7 @@ include(CheckCXXSourceCompiles)
 include(CheckSymbolExists)
 include(CheckFunctionExists)
 include(CheckIncludeFile)
-
-# Macro to check if a given type exists in a given header
-# Arguments:
-#   header the header to check
-#   type   the type to check for existence
-#   var    the compiler definition to set if type exists
-# On return:
-#   If type was found, the definition is added to SYSTEM_DEFINES
-macro(check_type header type var)
-  check_cxx_source_compiles("#include <${header}>
-                             int main()
-                             {
-                               ${type} s;
-                             }" ${var})
-  if(${var})
-    list(APPEND SYSTEM_DEFINES -D${var}=1)
-  endif()
-endmacro()
+include(CheckTypeSize)
 
 # Macro to check if a given builtin function exists
 # Arguments:
@@ -95,17 +78,12 @@ endif()
 include(${CMAKE_SOURCE_DIR}/cmake/scripts/${CORE_SYSTEM_NAME}/ArchSetup.cmake)
 
 message(STATUS "Core system type: ${CORE_SYSTEM_NAME}")
-message(STATUS "Platform: ${PLATFORM}")
+message(STATUS "Platform: ${CORE_PLATFORM_NAME}")
 message(STATUS "CPU: ${CPU}, ARCH: ${ARCH}")
 message(STATUS "Cross-Compiling: ${CMAKE_CROSSCOMPILING}")
 message(STATUS "Execute build artefacts on host: ${CORE_HOST_IS_TARGET}")
 message(STATUS "Depends based build: ${KODI_DEPENDSBUILD}")
 
-check_type(string std::u16string HAVE_STD__U16_STRING)
-check_type(string std::u32string HAVE_STD__U32_STRING)
-check_type(string char16_t HAVE_CHAR16_T)
-check_type(string char32_t HAVE_CHAR32_T)
-check_type(stdint.h uint_least16_t HAVE_STDINT_H)
 check_symbol_exists(posix_fadvise fcntl.h HAVE_POSIX_FADVISE)
 check_symbol_exists(PRIdMAX inttypes.h HAVE_INTTYPES_H)
 check_builtin("long* temp=0; long ret=__sync_add_and_fetch(temp, 1)" HAS_BUILTIN_SYNC_ADD_AND_FETCH)
diff --git a/cmake/scripts/common/CheckTargetPlatform.cmake b/cmake/scripts/common/CheckTargetPlatform.cmake
index 526e4bd..d776085 100644
--- a/cmake/scripts/common/CheckTargetPlatform.cmake
+++ b/cmake/scripts/common/CheckTargetPlatform.cmake
@@ -29,7 +29,10 @@ function(check_target_platform dir target_platform build)
           string(SUBSTRING ${platform} 1 ${platform_length} platform)
 
           # check if the current platform does not match the extracted platform
-          if(NOT ${platform} STREQUAL ${target_platform})
+          if(${platform} STREQUAL ${target_platform})
+            set(${build} FALSE)
+            break()
+          elseif(NOT ${platform} STREQUAL ${target_platform})
             set(${build} TRUE)
           endif()
         endif()
diff --git a/cmake/scripts/common/CompilerSettings.cmake b/cmake/scripts/common/CompilerSettings.cmake
new file mode 100644
index 0000000..b4e7e89
--- /dev/null
+++ b/cmake/scripts/common/CompilerSettings.cmake
@@ -0,0 +1,7 @@
+# Languages and global compiler settings
+if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 14)
+  set(CMAKE_CXX_STANDARD 14)
+endif()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp")
diff --git a/cmake/scripts/common/GenerateVersionedFiles.cmake b/cmake/scripts/common/GenerateVersionedFiles.cmake
index 1d324db..d54b524 100644
--- a/cmake/scripts/common/GenerateVersionedFiles.cmake
+++ b/cmake/scripts/common/GenerateVersionedFiles.cmake
@@ -24,9 +24,6 @@ foreach(loop_var ${ADDON_XML_IN_FILE})
   string(REPLACE ${CORE_SOURCE_DIR} ${CMAKE_BINARY_DIR} dest_dir ${source_dir})
   file(MAKE_DIRECTORY ${dest_dir})
 
-  # copy everything except addon.xml.in to build folder
-  file(COPY "${source_dir}" DESTINATION "${CMAKE_BINARY_DIR}/addons" REGEX ".xml.in" EXCLUDE)
-
   configure_file(${source_dir}/addon.xml.in ${dest_dir}/addon.xml @ONLY)
 
   unset(source_dir)
diff --git a/cmake/scripts/common/HandleDepends.cmake b/cmake/scripts/common/HandleDepends.cmake
index 40e382b..7cacd25 100644
--- a/cmake/scripts/common/HandleDepends.cmake
+++ b/cmake/scripts/common/HandleDepends.cmake
@@ -68,8 +68,8 @@ function(add_addon_depends addon searchpath)
                        -DCORE_SYSTEM_NAME=${CORE_SYSTEM_NAME}
                        -DENABLE_STATIC=1
                        -DBUILD_SHARED_LIBS=0)
-        # windows store args
-        if (CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+        # windows args
+        if (CMAKE_SYSTEM_NAME STREQUAL WindowsStore OR CMAKE_SYSTEM_NAME STREQUAL Windows)
           list(APPEND BUILD_ARGS -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
                                  -DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION})
         endif()
@@ -78,8 +78,10 @@ function(add_addon_depends addon searchpath)
           # make sure we create strings, not lists
           set(TMP_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_DEFINES}")
           set(TMP_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_DEFINES}")
+          set(TMP_EXE_LINKER_FLAGS "-L${OUTPUT_DIR}/lib ${CMAKE_EXE_LINKER_FLAGS}")
           list(APPEND BUILD_ARGS -DCMAKE_C_FLAGS=${TMP_C_FLAGS}
-                                 -DCMAKE_CXX_FLAGS=${TMP_CXX_FLAGS})
+                                 -DCMAKE_CXX_FLAGS=${TMP_CXX_FLAGS}
+                                 -DCMAKE_EXE_LINKER_FLAGS=${TMP_EXE_LINKER_FLAGS})
         endif()
 
         if(CMAKE_TOOLCHAIN_FILE)
@@ -88,6 +90,17 @@ function(add_addon_depends addon searchpath)
           message(${BUILD_ARGS})
         endif()
 
+        # used for addons where need special folders to store there content (if
+        # not set the addon define it byself).
+        # e.g. Google Chromium addon where his git bring:
+        # - "unable to create file" ... "Filename too long"
+        # see also WARNING by Windows on: https://bitbucket.org/chromiumembedded/cef/wiki/MasterBuildQuickStart
+        if(THIRD_PARTY_PATH)
+          message(STATUS "Third party lib path specified")
+          message(STATUS ${THIRD_PARTY_PATH})
+          list(APPEND BUILD_ARGS -DTHIRD_PARTY_PATH=${THIRD_PARTY_PATH})
+        endif()
+
         set(PATCH_COMMAND)
 
         # if there's a CMakeLists.txt use it to prepare the build
@@ -215,7 +228,6 @@ function(add_addon_depends addon searchpath)
                                     -DOUTPUT_DIR=${OUTPUT_DIR}
                                     -DCMAKE_PREFIX_PATH=${OUTPUT_DIR}
                                     -DCMAKE_INSTALL_PREFIX=${OUTPUT_DIR}
-                                    -DCMAKE_EXE_LINKER_FLAGS=-L${OUTPUT_DIR}/lib
                                     -DCMAKE_INCLUDE_PATH=${OUTPUT_DIR}/include)
             endif()
 
diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake
index eefd7c8..f7327e3 100644
--- a/cmake/scripts/common/Macros.cmake
+++ b/cmake/scripts/common/Macros.cmake
@@ -111,26 +111,6 @@ function(core_add_test_library name)
   endforeach()
 endfunction()
 
-# Add an addon callback library
-# Arguments:
-#   name name of the library to add
-# Implicit arguments:
-#   SOURCES the sources of the library
-#   HEADERS the headers of the library (only for IDE support)
-#   OTHERS  other library related files (only for IDE support)
-# On return:
-#   Library target is defined and added to LIBRARY_FILES
-function(core_add_addon_library name)
-  get_filename_component(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-  list(APPEND SOURCES lib${name}.cpp)
-  core_add_shared_library(${name} OUTPUT_DIRECTORY addons/${DIRECTORY})
-  set_target_properties(${name} PROPERTIES FOLDER addons)
-  target_include_directories(${name} PRIVATE
-                             ${CMAKE_CURRENT_SOURCE_DIR}
-                             ${CMAKE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi
-                             ${CMAKE_SOURCE_DIR}/xbmc)
-endfunction()
-
 # Add an dl-loaded shared library
 # Arguments:
 #   name name of the library to add
@@ -386,25 +366,6 @@ function(core_require_dep)
   endforeach()
 endfunction()
 
-# add required dyloaded dependencies of main application
-# Arguments:
-#   dep_list One or many dependency specifications (see split_dependency_specification)
-#            for syntax). The dependency name is used uppercased as variable prefix.
-# On return:
-#   dependency added to ${SYSTEM_INCLUDES}, ${dep}_SONAME is set up
-function(core_require_dyload_dep)
-  foreach(depspec ${ARGN})
-    split_dependency_specification(${depspec} dep version)
-    find_package_with_ver(${dep} ${version} REQUIRED)
-    string(TOUPPER ${dep} depup)
-    list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
-    list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
-    find_soname(${depup} REQUIRED)
-    export_dep()
-    set(${depup}_SONAME ${${depup}_SONAME} PARENT_SCOPE)
-  endforeach()
-endfunction()
-
 # helper macro for optional deps
 macro(setup_enable_switch)
   string(TOUPPER ${dep} depup)
@@ -450,39 +411,6 @@ function(core_optional_dep)
   set(final_message ${final_message} PARENT_SCOPE)
 endfunction()
 
-# add optional dyloaded dependencies of main application
-# Arguments:
-#   dep_list One or many dependency specifications (see split_dependency_specification)
-#            for syntax). The dependency name is used uppercased as variable prefix.
-# On return:
-#   dependency optionally added to ${SYSTEM_INCLUDES}, ${DEP_DEFINES}, ${dep}_SONAME is set up
-function(core_optional_dyload_dep)
-  foreach(depspec ${ARGN})
-    set(_required False)
-    split_dependency_specification(${depspec} dep version)
-    setup_enable_switch()
-    if(${enable_switch} STREQUAL AUTO)
-      find_package_with_ver(${dep} ${version})
-    elseif(${${enable_switch}})
-      find_package_with_ver(${dep} ${version} REQUIRED)
-      set(_required True)
-    endif()
-
-    if(${depup}_FOUND)
-      list(APPEND SYSTEM_INCLUDES ${${depup}_INCLUDE_DIRS})
-      find_soname(${depup} REQUIRED)
-      list(APPEND DEP_DEFINES ${${depup}_DEFINITIONS})
-      set(final_message ${final_message} "${depup} enabled: Yes" PARENT_SCOPE)
-      export_dep()
-      set(${depup}_SONAME ${${depup}_SONAME} PARENT_SCOPE)
-    elseif(_required)
-      message(FATAL_ERROR "${depup} enabled but not found")
-    else()
-      set(final_message ${final_message} "${depup} enabled: No" PARENT_SCOPE)
-    endif()
-  endforeach()
-endfunction()
-
 function(core_file_read_filtered result filepattern)
   # Reads STRINGS from text files
   #  with comments filtered out
diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake
index 753dca1..559788f 100644
--- a/cmake/scripts/common/PrepareEnv.cmake
+++ b/cmake/scripts/common/PrepareEnv.cmake
@@ -34,6 +34,14 @@ endif()
 
 set(PLATFORM_TAG ${CORE_SYSTEM_NAME})
 
+# The CPU variable is given either by ./tools/depends or by the
+# ./cmake/scripts/common/ArchSetup.cmake (which refers to the Kodi building
+# itself). However, this file is only used by addons, so CPU can not always
+# be defined, so in this case, if empty, the base CPU will be used.
+if(NOT CPU)
+  set(CPU ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
 if(CORE_SYSTEM_NAME STREQUAL android)
   if (CPU MATCHES "v7a")
     set(PLATFORM_TAG ${PLATFORM_TAG}-armv7)
@@ -41,13 +49,14 @@ if(CORE_SYSTEM_NAME STREQUAL android)
     set(PLATFORM_TAG ${PLATFORM_TAG}-aarch64)
   elseif (CPU MATCHES "i686")
     set(PLATFORM_TAG ${PLATFORM_TAG}-i686)
+  elseif (CPU MATCHES "x86_64")
+    set(PLATFORM_TAG ${PLATFORM_TAG}-x86_64)
   else()
     message(FATAL_ERROR "Unsupported architecture")
   endif()
-elseif(CORE_SYSTEM_NAME STREQUAL ios)
-  if (CPU MATCHES armv7)
-    set(PLATFORM_TAG ${PLATFORM_TAG}-armv7)
-  elseif (CPU MATCHES arm64)
+elseif(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
+  set(PLATFORM_TAG ${CORE_PLATFORM_NAME})
+  if (CPU MATCHES arm64)
     set(PLATFORM_TAG ${PLATFORM_TAG}-aarch64)
   else()
     message(FATAL_ERROR "Unsupported architecture")
diff --git a/cmake/scripts/darwin/Macros.cmake b/cmake/scripts/darwin/Macros.cmake
new file mode 100644
index 0000000..9a805c4
--- /dev/null
+++ b/cmake/scripts/darwin/Macros.cmake
@@ -0,0 +1,8 @@
+macro(enable_arc)
+  if(CMAKE_GENERATOR STREQUAL Xcode)
+    set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
+  else()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-arc")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fobjc-arc")
+  endif()
+endmacro()
diff --git a/cmake/scripts/ios/ArchSetup.cmake b/cmake/scripts/darwin_embedded/ArchSetup.cmake
index b6c626f..7160da9 100644
--- a/cmake/scripts/ios/ArchSetup.cmake
+++ b/cmake/scripts/darwin_embedded/ArchSetup.cmake
@@ -1,33 +1,33 @@
 if(NOT CMAKE_TOOLCHAIN_FILE)
-  message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for ios. See ${CMAKE_SOURCE_DIR}/cmake/README.md")
+  message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for ios/tvos. See ${CMAKE_SOURCE_DIR}/cmake/README.md")
 endif()
 
-set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/XBMCApplication.mm)
+set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/${CORE_PLATFORM_NAME_LC}/XBMCApplication.mm)
+set(PLATFORM_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/${CORE_PLATFORM_NAME_LC}/Info.plist.in)
 
-set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_IOS)
+set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_EMBEDDED)
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  list(APPEND ARCH_DEFINES -DTARGET_DARWIN_TVOS)
+else()
+  list(APPEND ARCH_DEFINES -DTARGET_DARWIN_IOS)
+endif()
 set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-                   -D__STDC_CONSTANT_MACROS)
-set(PLATFORM_DIR platform/linux)
+                   -D__STDC_CONSTANT_MACROS -DHAS_IOS_NETWORK -DHAS_ZEROCONF)
+set(PLATFORM_DIR platform/darwin)
+set(PLATFORMDEFS_DIR platform/posix)
 set(CMAKE_SYSTEM_NAME Darwin)
 if(WITH_ARCH)
   set(ARCH ${WITH_ARCH})
 else()
-  if(CPU STREQUAL armv7)
-    set(CMAKE_OSX_ARCHITECTURES ${CPU})
-    set(ARCH arm)
-    set(NEON True)
-  elseif(CPU STREQUAL arm64)
-    set(CMAKE_OSX_ARCHITECTURES ${CPU})
+  if(CPU STREQUAL arm64)
     set(ARCH aarch64)
-    set(NEON True)
   else()
     message(SEND_ERROR "Unknown CPU: ${CPU}")
   endif()
+  set(CMAKE_OSX_ARCHITECTURES ${CPU})
+  set(NEON True)
 endif()
 
-# Additional SYSTEM_DEFINES
-list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK -DHAS_ZEROCONF)
-
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX})
 
 list(APPEND DEPLIBS "-framework CoreFoundation" "-framework CoreVideo"
@@ -36,24 +36,28 @@ list(APPEND DEPLIBS "-framework CoreFoundation" "-framework CoreVideo"
                     "-framework CFNetwork" "-framework CoreGraphics"
                     "-framework Foundation" "-framework UIKit"
                     "-framework CoreMedia" "-framework AVFoundation"
-                    "-framework VideoToolbox")
+                    "-framework VideoToolbox" "-lresolv" "-ObjC"
+                    "-framework AVKit" "-framework GameController")
 
 set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
 
-set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "9.0")
-set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
-
+# AppleTV already has built-in AirPlay support
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  set(ENABLE_AIRTUNES OFF CACHE BOOL "" FORCE)
+endif()
 set(CMAKE_XCODE_ATTRIBUTE_INLINES_ARE_PRIVATE_EXTERN OFF)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN OFF)
 set(CMAKE_XCODE_ATTRIBUTE_COPY_PHASE_STRIP OFF)
 
+include(cmake/scripts/darwin/Macros.cmake)
+enable_arc()
+
 # Xcode strips dead code by default which breaks wrapping
 set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING OFF)
 
-# Unify output directories for iOS packaging scripts
-if(NOT CMAKE_GENERATOR MATCHES Xcode)
-  set(CORE_BUILD_CONFIG "${CORE_BUILD_CONFIG}-iphoneos")
-endif()
+option(ENABLE_XCODE_ADDONBUILD "Enable Xcode automatic addon building?" OFF)
+
+# Unify output directories for iOS/tvOS packaging scripts
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CORE_BUILD_DIR}/${CORE_BUILD_CONFIG})
 foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
   string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
diff --git a/cmake/scripts/darwin_embedded/ExtraTargets.cmake b/cmake/scripts/darwin_embedded/ExtraTargets.cmake
new file mode 100644
index 0000000..2b9980a
--- /dev/null
+++ b/cmake/scripts/darwin_embedded/ExtraTargets.cmake
@@ -0,0 +1,25 @@
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  # top shelf extension
+  set(TOPSHELF_EXTENSION_NAME "${APP_NAME_LC}-topshelf")
+  set(TOPSHELF_BUNDLE_EXTENSION appex)
+  set(TOPSHELF_DIR "${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/tvos/TopShelf")
+  # same path as the output Info.plist, taken from cmGlobalXCodeGenerator::ComputeInfoPListLocation()
+  set(ENTITLEMENTS_OUT_PATH "${CMAKE_BINARY_DIR}/CMakeFiles/${TOPSHELF_EXTENSION_NAME}.dir/TopShelf.entitlements")
+
+  set(SOURCES
+        ${TOPSHELF_DIR}/ServiceProvider.m
+        ${TOPSHELF_DIR}/../tvosShared.m)
+  set(HEADERS
+        ${TOPSHELF_DIR}/ServiceProvider.h
+        ${TOPSHELF_DIR}/../tvosShared.h)
+  add_executable(${TOPSHELF_EXTENSION_NAME} MACOSX_BUNDLE ${SOURCES} ${HEADERS})
+
+  configure_file(${TOPSHELF_DIR}/TopShelf.entitlements.in ${ENTITLEMENTS_OUT_PATH} @ONLY)
+  set_target_properties(${TOPSHELF_EXTENSION_NAME} PROPERTIES BUNDLE_EXTENSION ${TOPSHELF_BUNDLE_EXTENSION}
+                                                              MACOSX_BUNDLE_INFO_PLIST ${TOPSHELF_DIR}/Info.plist.in
+                                                              XCODE_PRODUCT_TYPE com.apple.product-type.tv-app-extension
+                                                              XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH})
+  target_link_libraries(${TOPSHELF_EXTENSION_NAME} "-framework TVServices" "-framework Foundation")
+
+  add_dependencies(${APP_NAME_LC} ${TOPSHELF_EXTENSION_NAME})
+endif()
diff --git a/cmake/scripts/darwin_embedded/Install.cmake b/cmake/scripts/darwin_embedded/Install.cmake
new file mode 100644
index 0000000..af18277
--- /dev/null
+++ b/cmake/scripts/darwin_embedded/Install.cmake
@@ -0,0 +1,135 @@
+# IOS/TVOS packaging
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  # asset catalog
+  set(ASSET_CATALOG "${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/tvos/Assets.xcassets")
+  set(ASSET_CATALOG_ASSETS Assets)
+  set(ASSET_CATALOG_LAUNCH_IMAGE LaunchImage)
+
+  message("generating missing asset catalog images...")
+  execute_process(COMMAND ${CMAKE_SOURCE_DIR}/tools/darwin/Support/GenerateMissingImages-tvos.py "${ASSET_CATALOG}" ${ASSET_CATALOG_ASSETS} ${ASSET_CATALOG_LAUNCH_IMAGE})
+
+  target_sources(${APP_NAME_LC} PRIVATE "${ASSET_CATALOG}")
+  set_source_files_properties("${ASSET_CATALOG}" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") # adds to Copy Bundle Resources build phase
+
+  # entitlements
+  set(ENTITLEMENTS_OUT_PATH "${CMAKE_BINARY_DIR}/CMakeFiles/${APP_NAME_LC}.dir/Kodi.entitlements")
+  configure_file(${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/tvos/Kodi.entitlements.in ${ENTITLEMENTS_OUT_PATH} @ONLY)
+
+  set_target_properties(${APP_NAME_LC} PROPERTIES XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME ${ASSET_CATALOG_ASSETS}
+                                                  XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME ${ASSET_CATALOG_LAUNCH_IMAGE}
+                                                  XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH})
+
+else()
+  set(BUNDLE_RESOURCES ${CMAKE_SOURCE_DIR}/media/splash.jpg
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png
+                       ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png)
+
+  target_sources(${APP_NAME_LC} PRIVATE ${BUNDLE_RESOURCES})
+  foreach(file IN LISTS BUNDLE_RESOURCES)
+    set_source_files_properties(${file} PROPERTIES MACOSX_PACKAGE_LOCATION .)
+  endforeach()
+
+  target_sources(${APP_NAME_LC} PRIVATE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchScreen.storyboard)
+  set_source_files_properties(${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchScreen.storyboard PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+
+endif()
+
+# setup code signing
+# dev team ID / identity (certificate)
+set(DEVELOPMENT_TEAM "" CACHE STRING "Development Team")
+set(CODE_SIGN_IDENTITY $<IF:$<BOOL:${DEVELOPMENT_TEAM}>,iPhone\ Developer,> CACHE STRING "Code Sign Identity")
+
+# app provisioning profile
+set(CODE_SIGN_STYLE_APP Automatic)
+set(PROVISIONING_PROFILE_APP "" CACHE STRING "Provisioning profile name for the Kodi app")
+if(PROVISIONING_PROFILE_APP)
+  set(CODE_SIGN_STYLE_APP Manual)
+endif()
+
+# top shelf provisioning profile
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  set(CODE_SIGN_STYLE_TOPSHELF Automatic)
+  set(PROVISIONING_PROFILE_TOPSHELF "" CACHE STRING "Provisioning profile name for the Top Shelf")
+  if(PROVISIONING_PROFILE_TOPSHELF)
+    set(CODE_SIGN_STYLE_TOPSHELF Manual)
+  endif()
+  set_target_properties(${TOPSHELF_EXTENSION_NAME} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${CODE_SIGN_IDENTITY}"
+                                                              XCODE_ATTRIBUTE_CODE_SIGN_STYLE ${CODE_SIGN_STYLE_TOPSHELF}
+                                                              XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${DEVELOPMENT_TEAM}"
+                                                              XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "${PROVISIONING_PROFILE_TOPSHELF}")
+  # copy extension inside PlugIns dir of the app bundle
+  add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} ARGS -E copy_directory $<TARGET_BUNDLE_DIR:${TOPSHELF_EXTENSION_NAME}>
+                                                      $<TARGET_BUNDLE_DIR:${APP_NAME_LC}>/PlugIns/${TOPSHELF_EXTENSION_NAME}.${TOPSHELF_BUNDLE_EXTENSION}
+                                                      MAIN_DEPENDENCY ${TOPSHELF_EXTENSION_NAME})
+endif()
+set_target_properties(${APP_NAME_LC} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${CODE_SIGN_IDENTITY}"
+                                                XCODE_ATTRIBUTE_CODE_SIGN_STYLE ${CODE_SIGN_STYLE_APP}
+                                                XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${DEVELOPMENT_TEAM}"
+                                                XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER "${PROVISIONING_PROFILE_APP}")
+
+# Create xcode target that allows to build binary-addons.
+if(ADDONS_TO_BUILD)
+  set(_addons "ADDONS=${ADDONS_TO_BUILD}")
+endif()
+add_custom_target(binary-addons
+  COMMAND $(MAKE) -C ${CMAKE_SOURCE_DIR}/tools/depends/target/binary-addons clean
+  COMMAND $(MAKE) -C ${CMAKE_SOURCE_DIR}/tools/depends/target/binary-addons VERBOSE=1 V=99
+        INSTALL_PREFIX="${CMAKE_BINARY_DIR}/addons" CROSS_COMPILING=yes ${_addons})
+if(ENABLE_XCODE_ADDONBUILD)
+  add_dependencies(${APP_NAME_LC} binary-addons)
+endif()
+unset(_addons)
+
+add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD
+    # TODO: Remove in sync with CopyRootFiles-darwin_embedded expecting the ".bin" file
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_NAME_LC}>
+                                     $<TARGET_FILE_DIR:${APP_NAME_LC}>/${APP_NAME}.bin
+
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/DllPaths_generated.h
+                                     ${CMAKE_BINARY_DIR}/xbmc/DllPaths_generated.h
+    COMMAND "ACTION=build"
+            "APP_NAME=${APP_NAME}"
+            "XBMC_DEPENDS=${DEPENDS_PATH}"
+            ${CMAKE_SOURCE_DIR}/tools/darwin/Support/CopyRootFiles-darwin_embedded.command
+    COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}"
+            "PYTHON_VERSION=${PYTHON_VERSION}"
+            ${CMAKE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-darwin_embedded.command
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-dylibs2frameworks.command
+    COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}"
+            "NATIVEPREFIX=${NATIVEPREFIX}"
+            ${CMAKE_SOURCE_DIR}/tools/darwin/Support/Codesign.command
+)
+
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPENDS_PATH}/share/${APP_NAME_LC} $<TARGET_FILE_DIR:${APP_NAME_LC}>/AppData/AppHome
+  )
+endif()
+
+set(DEPENDS_ROOT_FOR_XCODE ${NATIVEPREFIX}/..)
+configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh.in
+               ${CMAKE_BINARY_DIR}/tools/darwin/packaging/darwin_embedded/mkdeb-darwin_embedded.sh @ONLY)
+               
+if(CORE_PLATFORM_NAME_LC STREQUAL ios)
+  configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh.in
+                 ${CMAKE_BINARY_DIR}/tools/darwin/packaging/darwin_embedded/migrate_to_kodi.sh @ONLY)
+endif()
+
+add_custom_target(deb
+    COMMAND sh ./mkdeb-darwin_embedded.sh ${CORE_BUILD_CONFIG}
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/darwin/packaging/darwin_embedded)
+add_dependencies(deb ${APP_NAME_LC})
+
diff --git a/cmake/scripts/darwin_embedded/Macros.cmake b/cmake/scripts/darwin_embedded/Macros.cmake
new file mode 100644
index 0000000..91f2d86
--- /dev/null
+++ b/cmake/scripts/darwin_embedded/Macros.cmake
@@ -0,0 +1,118 @@
+function(core_link_library lib wraplib)
+  if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL Ninja)
+    set(wrapper_obj cores/dll-loader/exports/CMakeFiles/wrapper.dir/wrapper.c.o)
+  elseif(CMAKE_GENERATOR MATCHES "Xcode")
+    set(wrapper_obj cores/dll-loader/exports/kodi.build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/wrapper.build/Objects-$(CURRENT_VARIANT)/$(CURRENT_ARCH)/wrapper.o)
+  else()
+    message(FATAL_ERROR "Unsupported generator in core_link_library")
+  endif()
+
+  set(export -bundle -undefined dynamic_lookup
+             -Wl,-alias_list,${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/cores/dll-loader/exports/wrapper.def
+             ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/${wrapper_obj})
+  set(extension ${CMAKE_SHARED_MODULE_SUFFIX})
+  set(check_arg "")
+  if(TARGET ${lib})
+    set(target ${lib})
+    set(link_lib $<TARGET_FILE:${lib}>)
+    set(check_arg ${ARGV2})
+    set(data_arg  ${ARGV3})
+
+    # iOS: EFFECTIVE_PLATFORM_NAME is not resolved
+    # http://public.kitware.com/pipermail/cmake/2016-March/063049.html
+    if(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
+      get_target_property(dir ${lib} BINARY_DIR)
+      set(link_lib ${dir}/${CORE_BUILD_CONFIG}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
+    endif()
+  else()
+    set(target ${ARGV2})
+    set(link_lib ${lib})
+    set(check_arg ${ARGV3})
+    set(data_arg ${ARGV4})
+  endif()
+  if(check_arg STREQUAL export)
+    set(export ${export}
+        -Wl,--version-script=${ARGV3})
+  elseif(check_arg STREQUAL extras)
+    foreach(arg ${data_arg})
+      list(APPEND export ${arg})
+    endforeach()
+  elseif(check_arg STREQUAL archives)
+    set(extra_libs ${data_arg})
+  endif()
+  get_filename_component(dir ${wraplib} DIRECTORY)
+
+  # We can't simply pass the linker flags to the args section of the custom command
+  # because cmake will add quotes around it (and the linker will fail due to those).
+  # We need to do this handstand first ...
+  string(REPLACE " " ";" CUSTOM_COMMAND_ARGS_LDFLAGS ${CMAKE_SHARED_LINKER_FLAGS})
+
+  add_custom_command(OUTPUT ${wraplib}-${ARCH}${extension}
+                     COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
+                     COMMAND ${CMAKE_C_COMPILER}
+                     ARGS    ${CUSTOM_COMMAND_ARGS_LDFLAGS} ${export} -Wl,-force_load ${link_lib} ${extra_libs}
+                             -o ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${extension}
+                     DEPENDS ${target} wrapper.def wrapper
+                     VERBATIM)
+
+  get_filename_component(libname ${wraplib} NAME_WE)
+  add_custom_target(wrap_${libname} ALL DEPENDS ${wraplib}-${ARCH}${extension})
+  set_target_properties(wrap_${libname} PROPERTIES FOLDER lib/wrapped)
+  add_dependencies(${APP_NAME_LC}-libraries wrap_${libname})
+
+  set(LIBRARY_FILES ${LIBRARY_FILES} ${CMAKE_BINARY_DIR}/${wraplib}-${ARCH}${extension} CACHE STRING "" FORCE)
+endfunction()
+
+function(find_soname lib)
+  cmake_parse_arguments(arg "REQUIRED" "" "" ${ARGN})
+
+  string(TOLOWER ${lib} liblow)
+  if(${lib}_LDFLAGS)
+    set(link_lib "${${lib}_LDFLAGS}")
+  else()
+    set(link_lib "${${lib}_LIBRARIES}")
+  endif()
+
+  execute_process(COMMAND ${CMAKE_C_COMPILER} -print-search-dirs
+                  COMMAND fgrep libraries:
+                  COMMAND sed "s/[^=]*=\\(.*\\)/\\1/"
+                  COMMAND sed "s/:/ /g"
+                  ERROR_QUIET
+                  OUTPUT_VARIABLE cc_lib_path
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND echo ${link_lib}
+                  COMMAND sed "s/-L[ ]*//g"
+                  COMMAND sed "s/-l[^ ]*//g"
+                  ERROR_QUIET
+                  OUTPUT_VARIABLE env_lib_path
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  foreach(path ${cc_lib_path} ${env_lib_path})
+    if(IS_DIRECTORY ${path})
+      execute_process(COMMAND ls -- ${path}/lib${liblow}.dylib
+                      ERROR_QUIET
+                      OUTPUT_VARIABLE lib_file
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    else()
+      set(lib_file ${path})
+    endif()
+    if(lib_file)
+      # we want the path/name that is embedded in the dylib
+      execute_process(COMMAND otool -L ${lib_file}
+                      COMMAND grep -v lib${liblow}.dylib
+                      COMMAND grep ${liblow}
+                      COMMAND awk "{V=1; print $V}"
+                      ERROR_QUIET
+                      OUTPUT_VARIABLE filename
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      get_filename_component(${lib}_SONAME "${filename}" NAME)
+      if(VERBOSE)
+        message(STATUS "${lib} soname: ${${lib}_SONAME}")
+      endif()
+    endif()
+  endforeach()
+  if(arg_REQUIRED AND NOT ${lib}_SONAME)
+    message(FATAL_ERROR "Could not find dynamically loadable library ${lib}")
+  endif()
+  set(${lib}_SONAME ${${lib}_SONAME} PARENT_SCOPE)
+endfunction()
diff --git a/cmake/scripts/darwin_embedded/PathSetup.cmake b/cmake/scripts/darwin_embedded/PathSetup.cmake
new file mode 100644
index 0000000..efaca0b
--- /dev/null
+++ b/cmake/scripts/darwin_embedded/PathSetup.cmake
@@ -0,0 +1,7 @@
+set(BUNDLE_IDENTIFIER_DESC "Bundle ID")
+if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
+  string(CONCAT BUNDLE_IDENTIFIER_DESC "${BUNDLE_IDENTIFIER_DESC}" " (app, top shelf, group ID)")
+endif()
+set(PLATFORM_BUNDLE_IDENTIFIER "${APP_PACKAGE}-${CORE_PLATFORM_NAME_LC}" CACHE STRING "${BUNDLE_IDENTIFIER_DESC}")
+list(APPEND final_message "Bundle ID: ${PLATFORM_BUNDLE_IDENTIFIER}")
+include(cmake/scripts/osx/PathSetup.cmake)
diff --git a/cmake/scripts/freebsd/ArchSetup.cmake b/cmake/scripts/freebsd/ArchSetup.cmake
index 3d5599c..7da6c51 100644
--- a/cmake/scripts/freebsd/ArchSetup.cmake
+++ b/cmake/scripts/freebsd/ArchSetup.cmake
@@ -1,7 +1,8 @@
-set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_FREEBSD)
+set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_FREEBSD)
 set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE
-                   -D_FILE_OFFSET_BITS=64)
+                   -D_FILE_OFFSET_BITS=64 -DHAS_OSS)
 set(PLATFORM_DIR platform/linux)
+set(PLATFORMDEFS_DIR platform/posix)
 set(SYSTEM_LDFLAGS -L/usr/local/lib)
 if(WITH_ARCH)
   set(ARCH ${WITH_ARCH})
@@ -30,4 +31,4 @@ if(NOT ENABLE_ALSA)
 endif()
 
 # Additional SYSTEM_DEFINES
-list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK)
+list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_FREEBSD_NETWORK)
diff --git a/cmake/scripts/ios/Install.cmake b/cmake/scripts/ios/Install.cmake
deleted file mode 100644
index 7668e7c..0000000
--- a/cmake/scripts/ios/Install.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-# IOS packaging
-
-set(BUNDLE_RESOURCES ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1100-Landscape-2436h@3x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1100-Portrait-2436h@3x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1200-Landscape-1792h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1200-Portrait-2224h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1200-Landscape-2224h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1200-Portrait-2388h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1200-Landscape-2388h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1200-Landscape-2688h@3x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1200-Portrait-1792h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-1200-Portrait-2688h@3x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-568h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-700-568h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-700-Landscape@2x~ipad.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-700-Portrait@2x~ipad.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-700@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-800-667h@2x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-800-Landscape-736h@3x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-800-Portrait-736h@3x.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-Landscape@2x~ipad.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage-Portrait@2x~ipad.png
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/LaunchImage@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png
-                     ${CMAKE_SOURCE_DIR}/tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png)
-
-target_sources(${APP_NAME_LC} PRIVATE ${BUNDLE_RESOURCES})
-foreach(file IN LISTS BUNDLE_RESOURCES)
-  set_source_files_properties(${file} PROPERTIES MACOSX_PACKAGE_LOCATION .)
-endforeach()
-
-target_sources(${APP_NAME_LC} PRIVATE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/English.lproj/InfoPlist.strings)
-set_source_files_properties(${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/ios/English.lproj/InfoPlist.strings PROPERTIES MACOSX_PACKAGE_LOCATION "./English.lproj")
-
-# Options for code signing propagated as env vars to Codesign.command via Xcode
-set(IOS_CODE_SIGN_IDENTITY "" CACHE STRING "Code Sign Identity")
-if(IOS_CODE_SIGN_IDENTITY)
-  set_target_properties(${APP_NAME_LC} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED TRUE
-                                                  XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${IOS_CODE_SIGN_IDENTITY})
-endif()
-
-add_custom_command(TARGET ${APP_NAME_LC} POST_BUILD
-    # TODO: Remove in sync with CopyRootFiles-ios expecting the ".bin" file
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_NAME_LC}>
-                                     $<TARGET_FILE_DIR:${APP_NAME_LC}>/${APP_NAME}.bin
-
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/DllPaths_generated.h
-                                     ${CMAKE_BINARY_DIR}/xbmc/DllPaths_generated.h
-    COMMAND "ACTION=build"
-            "TARGET_BUILD_DIR=$<TARGET_FILE_DIR:${APP_NAME_LC}>/.."
-            "TARGET_NAME=${APP_NAME}.app"
-            "APP_NAME=${APP_NAME}"
-            "PRODUCT_NAME=${APP_NAME}"
-            "WRAPPER_EXTENSION=app"
-            "SRCROOT=${CMAKE_BINARY_DIR}"
-            ${CMAKE_SOURCE_DIR}/tools/darwin/Support/CopyRootFiles-ios.command
-    COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}"
-            "TARGET_BUILD_DIR=$<TARGET_FILE_DIR:${APP_NAME_LC}>/.."
-            "TARGET_NAME=${APP_NAME}.app"
-            "APP_NAME=${APP_NAME}"
-            "PRODUCT_NAME=${APP_NAME}"
-            "FULL_PRODUCT_NAME=${APP_NAME}.app"
-            "WRAPPER_EXTENSION=app"
-            "SRCROOT=${CMAKE_BINARY_DIR}"
-            ${CMAKE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-ios.command
-    COMMAND "XBMC_DEPENDS=${DEPENDS_PATH}"
-            "NATIVEPREFIX=${NATIVEPREFIX}"
-            "PLATFORM_NAME=${PLATFORM}"
-            "CODESIGNING_FOLDER_PATH=$<TARGET_FILE_DIR:${APP_NAME_LC}>"
-            "BUILT_PRODUCTS_DIR=$<TARGET_FILE_DIR:${APP_NAME_LC}>/.."
-            "WRAPPER_NAME=${APP_NAME}.app"
-            "APP_NAME=${APP_NAME}"
-            "CURRENT_ARCH=${ARCH}"
-            ${CMAKE_SOURCE_DIR}/tools/darwin/Support/Codesign.command
-)
-
-set(DEPENDS_ROOT_FOR_XCODE ${NATIVEPREFIX}/..)
-configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/ios/mkdeb-ios.sh.in
-               ${CMAKE_BINARY_DIR}/tools/darwin/packaging/ios/mkdeb-ios.sh @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/tools/darwin/packaging/migrate_to_kodi_ios.sh.in
-               ${CMAKE_BINARY_DIR}/tools/darwin/packaging/migrate_to_kodi_ios.sh @ONLY)
-
-add_custom_target(deb
-    COMMAND sh ./mkdeb-ios.sh ${CORE_BUILD_CONFIG}
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tools/darwin/packaging/ios)
-add_dependencies(deb ${APP_NAME_LC})
-
diff --git a/cmake/scripts/ios/Macros.cmake b/cmake/scripts/ios/Macros.cmake
deleted file mode 120000
index 54c1b28..0000000
--- a/cmake/scripts/ios/Macros.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../osx/Macros.cmake
\ No newline at end of file
diff --git a/cmake/scripts/ios/PathSetup.cmake b/cmake/scripts/ios/PathSetup.cmake
deleted file mode 120000
index d7f25b2..0000000
--- a/cmake/scripts/ios/PathSetup.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../osx/PathSetup.cmake
\ No newline at end of file
diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake
index 602ef3d..04fc6e3 100644
--- a/cmake/scripts/linux/ArchSetup.cmake
+++ b/cmake/scripts/linux/ArchSetup.cmake
@@ -1,8 +1,8 @@
 # we always want to use GNU features if available, so set _GNU_SOURCE
-set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_LINUX -D_GNU_SOURCE)
-set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_DEFINED
-                   -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64)
+set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_GNU_SOURCE)
+set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_OFFSET_BITS=64)
 set(PLATFORM_DIR platform/linux)
+set(PLATFORMDEFS_DIR platform/posix)
 set(CMAKE_SYSTEM_NAME Linux)
 if(WITH_ARCH)
   set(ARCH ${WITH_ARCH})
@@ -84,10 +84,27 @@ endif()
 include(LDGOLD)
 
 include(CheckIncludeFiles)
-check_include_files("linux/memfd.h" HAVE_LINUX_MEMFD)
-if(HAVE_LINUX_MEMFD)
-  list(APPEND ARCH_DEFINES "-DHAVE_LINUX_MEMFD=1")
+check_include_files("linux/udmabuf.h" HAVE_LINUX_UDMABUF)
+if(HAVE_LINUX_UDMABUF)
+  list(APPEND ARCH_DEFINES "-DHAVE_LINUX_UDMABUF=1")
+else()
+  message(STATUS "include/linux/udmabuf.h not found")
+endif()
+
+check_include_files("linux/dma-heap.h" HAVE_LINUX_DMA_HEAP)
+if(HAVE_LINUX_DMA_HEAP)
+  list(APPEND ARCH_DEFINES "-DHAVE_LINUX_DMA_HEAP=1")
+else()
+  message(STATUS "include/linux/dma-heap.h not found")
+endif()
+
+check_include_files("linux/dma-buf.h" HAVE_LINUX_DMA_BUF)
+if(HAVE_LINUX_DMA_BUF)
+  list(APPEND ARCH_DEFINES "-DHAVE_LINUX_DMA_BUF=1")
+else()
+  message(STATUS "include/linux/dma-buf.h not found")
 endif()
+
 include(CheckSymbolExists)
 set(CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
 check_symbol_exists("mkostemp" "stdlib.h" HAVE_MKOSTEMP)
@@ -96,8 +113,17 @@ if(HAVE_MKOSTEMP)
   list(APPEND ARCH_DEFINES "-DHAVE_MKOSTEMP=1")
 endif()
 
+set(CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE")
+check_symbol_exists("memfd_create" "sys/mman.h" HAVE_LINUX_MEMFD)
+set(CMAKE_REQUIRED_DEFINITIONS "")
+if(HAVE_LINUX_MEMFD)
+  list(APPEND ARCH_DEFINES "-DHAVE_LINUX_MEMFD=1")
+else()
+  message(STATUS "memfd_create() not found")
+endif()
+
 # Additional SYSTEM_DEFINES
-list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK)
+list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_LINUX_NETWORK)
 
 # Code Coverage
 if(CMAKE_BUILD_TYPE STREQUAL Coverage)
diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake
index 74f2ed4..7d8f58b 100644
--- a/cmake/scripts/osx/ArchSetup.cmake
+++ b/cmake/scripts/osx/ArchSetup.cmake
@@ -6,10 +6,11 @@ set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/posix/main.cpp
                      ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDLMain.mm
                      ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDLMain.h)
 
-set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX)
+set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX)
 set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
                    -D__STDC_CONSTANT_MACROS)
-set(PLATFORM_DIR platform/linux)
+set(PLATFORM_DIR platform/darwin)
+set(PLATFORMDEFS_DIR platform/posix)
 set(CMAKE_SYSTEM_NAME Darwin)
 if(WITH_ARCH)
   set(ARCH ${WITH_ARCH})
@@ -23,7 +24,7 @@ else()
 endif()
 
 # Additional SYSTEM_DEFINES
-list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK -DHAS_SDL -DHAS_ZEROCONF)
+list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_OSX_NETWORK -DHAS_SDL -DHAS_ZEROCONF)
 
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX})
 
@@ -32,7 +33,10 @@ list(APPEND DEPLIBS "-framework DiskArbitration" "-framework IOKit"
                     "-framework ApplicationServices" "-framework AppKit"
                     "-framework CoreAudio" "-framework AudioToolbox"
                     "-framework CoreGraphics" "-framework CoreMedia"
-                    "-framework VideoToolbox")
+                    "-framework VideoToolbox" "-framework Security")
 
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_LINK_OBJC_RUNTIME OFF)
+
+include(cmake/scripts/darwin/Macros.cmake)
+enable_arc()
diff --git a/cmake/scripts/osx/Install.cmake b/cmake/scripts/osx/Install.cmake
index 77c771c..aca31b4 100644
--- a/cmake/scripts/osx/Install.cmake
+++ b/cmake/scripts/osx/Install.cmake
@@ -22,6 +22,7 @@ add_custom_target(bundle
             "APP_NAME=${APP_NAME}"
             "FULL_PRODUCT_NAME=${APP_NAME}.app"
             "SRCROOT=${CMAKE_BINARY_DIR}"
+            "PYTHON_VERSION=${PYTHON_VERSION}"
             ${CMAKE_SOURCE_DIR}/tools/darwin/Support/copyframeworks-osx.command)
 set_target_properties(bundle PROPERTIES FOLDER "Build Utilities")
 add_dependencies(bundle ${APP_NAME_LC})
diff --git a/cmake/scripts/osx/Macros.cmake b/cmake/scripts/osx/Macros.cmake
index 52f87d1..251cc79 100644
--- a/cmake/scripts/osx/Macros.cmake
+++ b/cmake/scripts/osx/Macros.cmake
@@ -20,7 +20,7 @@ function(core_link_library lib wraplib)
 
     # iOS: EFFECTIVE_PLATFORM_NAME is not resolved
     # http://public.kitware.com/pipermail/cmake/2016-March/063049.html
-    if(CORE_SYSTEM_NAME STREQUAL ios AND CMAKE_GENERATOR STREQUAL Xcode)
+    if(CORE_SYSTEM_NAME STREQUAL darwin_embedded)
       get_target_property(dir ${lib} BINARY_DIR)
       set(link_lib ${dir}/${CORE_BUILD_CONFIG}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
     endif()
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake
index 032632c..f3628f2 100644
--- a/cmake/scripts/windows/ArchSetup.cmake
+++ b/cmake/scripts/windows/ArchSetup.cmake
@@ -35,7 +35,6 @@ set(MINGW_LIBS_DIR ${CMAKE_SOURCE_DIR}/${DEPS_FOLDER_RELATIVE}/mingwlibs/${ARCH}
 list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR})
 list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
 list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
-set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python)
 
 # -------- Compiler options ---------
 
@@ -46,12 +45,9 @@ set(SYSTEM_DEFINES -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_M
                    -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi"
                    -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi"
                    -DUNICODE -D_UNICODE
+                   -DFRIBIDI_STATIC
                    $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>)
 
-if(${ARCH} STREQUAL win32)
-  list(APPEND SYSTEM_DEFINES $<$<CONFIG:Debug>:-D_ITERATOR_DEBUG_LEVEL=0>)
-endif()
-
 # Additional SYSTEM_DEFINES
 list(APPEND SYSTEM_DEFINES -DHAS_WIN32_NETWORK -DHAS_FILESYSTEM_SMB)
 
@@ -74,7 +70,8 @@ link_directories(${DEPENDENCIES_DIR}/lib)
 
 # Additional libraries
 list(APPEND DEPLIBS bcrypt.lib d3d11.lib DInput8.lib DSound.lib winmm.lib Mpr.lib Iphlpapi.lib WS2_32.lib
-                    PowrProf.lib setupapi.lib Shlwapi.lib dwmapi.lib dxguid.lib DelayImp.lib)
+                    PowrProf.lib setupapi.lib Shlwapi.lib dwmapi.lib dxguid.lib DelayImp.lib version.lib
+                    crypt32.lib Mfplat.lib Mfuuid.lib Strmiids.lib)
 
 # NODEFAULTLIB option
 set(_nodefaultlibs_RELEASE libcmt)
@@ -87,7 +84,7 @@ foreach(_lib ${_nodefaultlibs_DEBUG})
 endforeach()
 
 # DELAYLOAD option
-set(_delayloadlibs zlib.dll libmysql.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll
+set(_delayloadlibs zlib.dll libmariadb.dll libxslt.dll dnssd.dll dwmapi.dll sqlite3.dll
                    d3dcompiler_47.dll)
 foreach(_lib ${_delayloadlibs})
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:\"${_lib}\"")
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake
index 2e6d7cb..ad55a01 100644
--- a/cmake/scripts/windowsstore/ArchSetup.cmake
+++ b/cmake/scripts/windowsstore/ArchSetup.cmake
@@ -53,8 +53,6 @@ list(APPEND CMAKE_PREFIX_PATH ${MINGW_LIBS_DIR})
 list(APPEND CMAKE_LIBRARY_PATH ${MINGW_LIBS_DIR}/bin)
 # dependencies
 list(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR})
-# for python
-set(PYTHON_INCLUDE_DIR ${DEPENDENCIES_DIR}/include/python)
 
 
 # -------- Compiler options ---------
@@ -64,22 +62,24 @@ add_options(CXX ALL_BUILDS "/wd\"4146\"")
 add_options(CXX ALL_BUILDS "/wd\"4251\"")
 add_options(CXX ALL_BUILDS "/wd\"4668\"")
 add_options(CXX ALL_BUILDS "/wd\"5033\"")
-set(ARCH_DEFINES -D_WINDOWS -DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DXBMC_EXPORT -DMS_UWP)
+set(ARCH_DEFINES -D_WINDOWS -DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DXBMC_EXPORT -DMS_UWP -DMS_STORE)
 if(NOT SDK_TARGET_ARCH STREQUAL arm)
   list(APPEND ARCH_DEFINES -D__SSE__ -D__SSE2__)
 endif()
 set(SYSTEM_DEFINES -DWIN32_LEAN_AND_MEAN -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_MACROS
-                   -DFMT_HEADER_ONLY -DTAGLIB_STATIC -DNPT_CONFIG_ENABLE_LOGGING
+                   -DTAGLIB_STATIC -DNPT_CONFIG_ENABLE_LOGGING
                    -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi"
                    -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi"
                    -DUNICODE -D_UNICODE
+                   -DFRIBIDI_STATIC
                    $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>)
 
 # Additional SYSTEM_DEFINES
 list(APPEND SYSTEM_DEFINES -DHAS_WIN10_NETWORK)
 
 # The /MP option enables /FS by default.
-set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS} /EHsc /await /std:c++latest")
+set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS} /EHsc /await")
+set(CMAKE_CXX_STANDARD 17)
 # Google Test needs to use shared version of runtime libraries
 set(gtest_force_shared_crt ON CACHE STRING "" FORCE)
 
@@ -91,7 +91,8 @@ set(gtest_force_shared_crt ON CACHE STRING "" FORCE)
 link_directories(${MINGW_LIBS_DIR}/lib
                  ${DEPENDENCIES_DIR}/lib)
 
-list(APPEND DEPLIBS bcrypt.lib d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.lib)
+list(APPEND DEPLIBS bcrypt.lib d3d11.lib WS2_32.lib dxguid.lib dloadhelper.lib WindowsApp.lib
+                    Mfplat.lib Mfuuid.lib Strmiids.lib)
 
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /WINMD:NO")
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:msvcrt /DEBUG:FASTLINK /OPT:NOREF /OPT:NOICF")
diff --git a/cmake/scripts/windowsstore/Macros.cmake b/cmake/scripts/windowsstore/Macros.cmake
index de89c62..c8cb960 100644
--- a/cmake/scripts/windowsstore/Macros.cmake
+++ b/cmake/scripts/windowsstore/Macros.cmake
@@ -112,7 +112,7 @@ endmacro()
 
 macro(winstore_append_props target)
   # exclude debug dlls from packaging
-  set(DEBUG_DLLS zlibd.dll freetyped.dll sqlite3d.dll)
+  set(DEBUG_DLLS zlibd.dll)
   foreach(_dll ${DEBUG_DLLS})
     if (DEBUG_DLLS_EXCLUDE)
       list(APPEND DEBUG_DLLS_EXCLUDE "\;$(BuildRootPath)/dlls/${_dll}")
diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt
index 335c331..0c4cf88 100644
--- a/cmake/treedata/android/subdirs.txt
+++ b/cmake/treedata/android/subdirs.txt
@@ -3,6 +3,7 @@ xbmc/cores/VideoPlayer/Process/android      cores/VideoPlayer/Process/android
 xbmc/input/touch                            input/touch
 xbmc/input/touch/generic                    input/touch/generic
 xbmc/media/decoderfilter                    media/decoderfilter
+xbmc/platform/android                       platform/android
 xbmc/platform/android/activity              platform/android/activity
 xbmc/platform/android/bionic_supplement     platform/android/bionicsupplement
 xbmc/platform/android/filesystem            platform/android/filesystem
@@ -12,7 +13,7 @@ xbmc/platform/android/network               platform/android/network
 xbmc/platform/android/peripherals           platform/android/peripherals
 xbmc/platform/android/powermanagement       platform/android/powermanagement
 xbmc/platform/android/storage               platform/android/storage
-xbmc/platform/linux                         platform/linux
+xbmc/platform/android/utils                 platform/android/utils
 xbmc/platform/linux/peripherals             platform/linux/peripherals
 xbmc/platform/posix                         platform/posix
 xbmc/platform/posix/filesystem              platform/posix/filesystem
diff --git a/cmake/treedata/common/gbm/gbm.txt b/cmake/treedata/common/gbm/gbm.txt
new file mode 100644
index 0000000..113c47b
--- /dev/null
+++ b/cmake/treedata/common/gbm/gbm.txt
@@ -0,0 +1,3 @@
+xbmc/cores/RetroPlayer/process/gbm cores/RetroPlayer/process/gbm
+xbmc/cores/VideoPlayer/Process/gbm cores/VideoPlayer/Process/gbm
+xbmc/windowing/gbm windowing/gbm
diff --git a/cmake/treedata/common/pvr.txt b/cmake/treedata/common/pvr.txt
index decdabb..74e766f 100644
--- a/cmake/treedata/common/pvr.txt
+++ b/cmake/treedata/common/pvr.txt
@@ -1,8 +1,12 @@
-xbmc/pvr            pvr
-xbmc/pvr/addons     pvr/addons
-xbmc/pvr/channels   pvr/channels
-xbmc/pvr/dialogs    pvr/dialogs
-xbmc/pvr/epg        pvr/epg
-xbmc/pvr/recordings pvr/recordings
-xbmc/pvr/timers     pvr/timers
-xbmc/pvr/windows    pvr/windows
+xbmc/pvr                pvr
+xbmc/pvr/addons         pvr/addons
+xbmc/pvr/channels       pvr/channels
+xbmc/pvr/dialogs        pvr/dialogs
+xbmc/pvr/epg            pvr/epg
+xbmc/pvr/filesystem     pvr/filesystem
+xbmc/pvr/guilib         pvr/guilib
+xbmc/pvr/guilib/guiinfo pvr/guilib/guiinfo
+xbmc/pvr/recordings     pvr/recordings
+xbmc/pvr/settings       pvr/settings
+xbmc/pvr/timers         pvr/timers
+xbmc/pvr/windows        pvr/windows
diff --git a/cmake/treedata/common/rbpi/rbpi.txt b/cmake/treedata/common/rbpi/rbpi.txt
new file mode 100644
index 0000000..dc268e7
--- /dev/null
+++ b/cmake/treedata/common/rbpi/rbpi.txt
@@ -0,0 +1,2 @@
+xbmc/cores/omxplayer cores/omxplayer
+xbmc/windowing/rpi   windowing/rpi
diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt
index 083e8ef..8131113 100644
--- a/cmake/treedata/common/subdirs.txt
+++ b/cmake/treedata/common/subdirs.txt
@@ -1,16 +1,21 @@
 xbmc                                            xbmc
 xbmc/addons                                     addons
+xbmc/addons/addoninfo                           addons_addoninfo
 xbmc/addons/binary-addons                       addons_binary-addons
 xbmc/addons/interfaces                          addons_interfaces
-xbmc/addons/interfaces/Addon                    addons_interfaces_addon
-xbmc/addons/interfaces/GUI                      addons_interfaces_gui
-xbmc/addons/interfaces/GUI/controls             addons_interfaces_gui_controls
-xbmc/addons/interfaces/GUI/dialogs              addons_interfaces_gui_dialogs
+xbmc/addons/interfaces/gui                      addons_interfaces_gui
+xbmc/addons/interfaces/gui/controls             addons_interfaces_gui_controls
+xbmc/addons/interfaces/gui/dialogs              addons_interfaces_gui_dialogs
 xbmc/addons/kodi-addon-dev-kit/include/kodi     addons_kodi-addon-dev-kit_include_kodi
 xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance addons_kodi-addon-dev-kit_include_kodi_addon-instance
+xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/pvr addons_kodi-addon-dev-kit_include_kodi_addon-instance_pvr
+xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api addons_kodi-addon-dev-kit_include_kodi_c-api
+xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance addons_kodi-addon-dev-kit_include_kodi_c-api_addon-instance
+xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr addons_kodi-addon-dev-kit_include_kodi_c-api_addon-instance_pvr
 xbmc/addons/kodi-addon-dev-kit/include/kodi/gui addons_kodi-addon-dev-kit_include_kodi_gui
 xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls addons_kodi-addon-dev-kit_include_kodi_gui_controls
 xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs addons_kodi-addon-dev-kit_include_kodi_gui_dialogs
+xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl addons_kodi-addon-dev-kit_include_kodi_gui_gl
 xbmc/addons/kodi-addon-dev-kit/include/kodi/tools addons_kodi-addon-dev-kit_include_kodi_tools
 xbmc/addons/settings                            addons_settings
 xbmc/commons                                    commons
diff --git a/cmake/treedata/common/tests.txt b/cmake/treedata/common/tests.txt
index 415eae6..9573812 100644
--- a/cmake/treedata/common/tests.txt
+++ b/cmake/treedata/common/tests.txt
@@ -5,6 +5,7 @@ xbmc/interfaces/python/test       test/python
 xbmc/music/tags/test              test/music_tags
 xbmc/network/test                 test/network
 xbmc/playlists/test               test/playlists
+xbmc/pvr/channels/test            test/pvrchannels
 xbmc/test                         test
 xbmc/threads/test                 test/threads
 xbmc/utils/test                   test/utils
diff --git a/cmake/treedata/common/videoplayer.txt b/cmake/treedata/common/videoplayer.txt
index ce6a757..8110f08 100644
--- a/cmake/treedata/common/videoplayer.txt
+++ b/cmake/treedata/common/videoplayer.txt
@@ -1,4 +1,5 @@
 xbmc/cores/VideoPlayer                             cores/VideoPlayer
+xbmc/cores/VideoPlayer/Buffers                     cores/VideoPlayer/Buffers
 xbmc/cores/VideoPlayer/DVDCodecs                   cores/VideoPlayer/codecs
 xbmc/cores/VideoPlayer/DVDCodecs/Audio             cores/VideoPlayer/codecs/audio
 xbmc/cores/VideoPlayer/DVDCodecs/Overlay           cores/VideoPlayer/codecs/overlay
diff --git a/cmake/treedata/optional/common/wayland.txt b/cmake/treedata/common/wayland/wayland.txt
index f8f77a6..bbbb14e 100644
--- a/cmake/treedata/optional/common/wayland.txt
+++ b/cmake/treedata/common/wayland/wayland.txt
@@ -1,3 +1,3 @@
-xbmc/cores/RetroPlayer/process/wayland cores/RetroPlayer/process/wayland # WAYLANDPP
-xbmc/cores/VideoPlayer/Process/wayland cores/VideoPlayer/Process/wayland # WAYLANDPP
-xbmc/windowing/wayland windowing/wayland # WAYLANDPP
+xbmc/cores/RetroPlayer/process/wayland cores/RetroPlayer/process/wayland
+xbmc/cores/VideoPlayer/Process/wayland cores/VideoPlayer/Process/wayland
+xbmc/windowing/wayland windowing/wayland
diff --git a/cmake/treedata/optional/common/X.txt b/cmake/treedata/common/x11/X.txt
index a250537..548c9dd 100644
--- a/cmake/treedata/optional/common/X.txt
+++ b/cmake/treedata/common/x11/X.txt
@@ -1,3 +1,3 @@
-xbmc/cores/RetroPlayer/process/X11 cores/RetroPlayer/process/X11 # X
-xbmc/cores/VideoPlayer/Process/X11 cores/VideoPlayer/Process/X11 # X
-xbmc/windowing/X11 windowing/X11 # X
+xbmc/cores/RetroPlayer/process/X11 cores/RetroPlayer/process/X11
+xbmc/cores/VideoPlayer/Process/X11 cores/VideoPlayer/Process/X11
+xbmc/windowing/X11 windowing/X11
diff --git a/cmake/treedata/darwin_embedded/ios/ios.txt b/cmake/treedata/darwin_embedded/ios/ios.txt
new file mode 100644
index 0000000..f5d13e3
--- /dev/null
+++ b/cmake/treedata/darwin_embedded/ios/ios.txt
@@ -0,0 +1,2 @@
+xbmc/platform/darwin/ios              platform/ios
+xbmc/windowing/ios                    windowing/ios
diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/darwin_embedded/subdirs.txt
index a3a03be..718c5c5 100644
--- a/cmake/treedata/ios/subdirs.txt
+++ b/cmake/treedata/darwin_embedded/subdirs.txt
@@ -3,13 +3,12 @@ xbmc/cores/VideoPlayer/Process/ios    cores/VideoPlayer/Process/ios
 xbmc/input/touch                      input/touch
 xbmc/input/touch/generic              input/touch/generic
 xbmc/platform/darwin                  platform/darwin
-xbmc/platform/darwin/ios              platform/ios
 xbmc/platform/darwin/ios-common       platform/ios-common
+xbmc/platform/darwin/ios-common/network  platform/ios-common/network
+xbmc/platform/darwin/ios-common/peripherals platform/ios-common/peripherals
+xbmc/platform/darwin/ios-common/storage platform/ios-common/storage
 xbmc/platform/darwin/network          platform/darwin/network
-xbmc/platform/darwin/storage          platform/storage
-xbmc/platform/linux                   platform/linux
-xbmc/platform/linux/network           platform/linux/network
+xbmc/platform/darwin/utils            platform/darwin/utils
 xbmc/platform/posix                   posix
 xbmc/platform/posix/filesystem        platform/posix/filesystem
 xbmc/platform/posix/utils             platform/posix/utils
-xbmc/windowing/ios                    windowing/ios
diff --git a/cmake/treedata/darwin_embedded/tvos/tvos.txt b/cmake/treedata/darwin_embedded/tvos/tvos.txt
new file mode 100755
index 0000000..1335e66
--- /dev/null
+++ b/cmake/treedata/darwin_embedded/tvos/tvos.txt
@@ -0,0 +1,5 @@
+xbmc/platform/darwin/tvos             platform/tvos
+xbmc/platform/darwin/tvos/filesystem  platform/darwin/tvos/filesystem
+xbmc/platform/darwin/tvos/input       platform/darwin/tvos/input
+xbmc/platform/darwin/tvos/powermanagement   platform/darwin/tvos/powermanagement
+xbmc/windowing/tvos                   windowing/tvos
diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt
index fd8ed5f..79e3462 100644
--- a/cmake/treedata/freebsd/subdirs.txt
+++ b/cmake/treedata/freebsd/subdirs.txt
@@ -3,13 +3,14 @@ xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi
 xbmc/input/touch                    input/touch
 xbmc/input/touch/generic            input/touch/generic
 xbmc/platform/freebsd               platform/freebsd
-xbmc/platform/linux                 platform/linux
+xbmc/platform/freebsd/network       platform/freebsd/network
 xbmc/platform/linux/input           platform/linux/input
-xbmc/platform/linux/network         platform/linux/network
 xbmc/platform/linux/peripherals     platform/linux/peripherals
 xbmc/platform/linux/powermanagement platform/linux/powermanagement
+xbmc/platform/linux/sse4            platform/linux/sse4
 xbmc/platform/linux/storage         platform/linux/storage
 xbmc/platform/posix                 platform/posix
 xbmc/platform/posix/filesystem      platform/posix/filesystem
+xbmc/platform/posix/network         platform/posix/network
 xbmc/platform/posix/utils           platform/posix/utils
 xbmc/windowing/linux                windowing/linux
diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt
index 7619e2e..51a7cbd 100644
--- a/cmake/treedata/linux/subdirs.txt
+++ b/cmake/treedata/linux/subdirs.txt
@@ -7,8 +7,10 @@ xbmc/platform/linux/input           platform/linux/input
 xbmc/platform/linux/network         platform/linux/network
 xbmc/platform/linux/peripherals     platform/linux/peripherals
 xbmc/platform/linux/powermanagement platform/linux/powermanagement
+xbmc/platform/linux/sse4            platform/linux/sse4
 xbmc/platform/linux/storage         platform/linux/storage
 xbmc/platform/posix                 platform/posix
 xbmc/platform/posix/filesystem      platform/posix/filesystem
+xbmc/platform/posix/network         platform/posix/network
 xbmc/platform/posix/utils           platform/posix/utils
 xbmc/windowing/linux                windowing/linux
diff --git a/cmake/treedata/linux/tests.txt b/cmake/treedata/linux/tests.txt
new file mode 100644
index 0000000..3f3a3e3
--- /dev/null
+++ b/cmake/treedata/linux/tests.txt
@@ -0,0 +1 @@
+xbmc/platform/linux/test platform/linux/test
diff --git a/cmake/treedata/optional/common/aml.txt b/cmake/treedata/optional/common/aml.txt
deleted file mode 100644
index 09bf2db..0000000
--- a/cmake/treedata/optional/common/aml.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-xbmc/cores/RetroPlayer/process/amlogic cores/RetroPlayer/process/amlogic # AML
-xbmc/windowing/amlogic windowing/amlogic # AML
diff --git a/cmake/treedata/optional/common/avahi.txt b/cmake/treedata/optional/common/avahi.txt
new file mode 100644
index 0000000..41b82b9
--- /dev/null
+++ b/cmake/treedata/optional/common/avahi.txt
@@ -0,0 +1 @@
+xbmc/platform/linux/network/zeroconf platform/linux/network/zeroconf # AVAHI
diff --git a/cmake/treedata/optional/common/gbm.txt b/cmake/treedata/optional/common/gbm.txt
deleted file mode 100644
index 5d898d4..0000000
--- a/cmake/treedata/optional/common/gbm.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-xbmc/cores/RetroPlayer/process/gbm cores/RetroPlayer/process/gbm # GBM
-xbmc/windowing/gbm windowing/gbm # GBM
diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt
index 943c366..fa28aa0 100644
--- a/cmake/treedata/osx/subdirs.txt
+++ b/cmake/treedata/osx/subdirs.txt
@@ -3,12 +3,13 @@ xbmc/cores/VideoPlayer/Process/osx    cores/VideoPlayer/Process/osx
 xbmc/platform/darwin                  platform/darwin
 xbmc/platform/darwin/network          platform/darwin/network
 xbmc/platform/darwin/osx              platform/osx
+xbmc/platform/darwin/osx/network      platform/darwin/osx/network
 xbmc/platform/darwin/osx/peripherals  platform/osx/peripherals
 xbmc/platform/darwin/osx/powermanagement platform/darwin/osx/powermanagement
-xbmc/platform/darwin/storage          platform/storage
-xbmc/platform/linux                   platform/linux
-xbmc/platform/linux/network           platform/linux/network
+xbmc/platform/darwin/osx/storage      platform/osx/storage
+xbmc/platform/darwin/utils            platform/darwin/utils
 xbmc/platform/posix                   posix
 xbmc/platform/posix/filesystem        platform/posix/filesystem
+xbmc/platform/posix/network           platform/posix/network
 xbmc/platform/posix/utils             platform/posix/utils
 xbmc/windowing/osx                    windowing/osx
diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt
index 0078758..c633977 100644
--- a/cmake/treedata/windows/subdirs.txt
+++ b/cmake/treedata/windows/subdirs.txt
@@ -1,6 +1,7 @@
 xbmc/cores/RetroPlayer/process/windows cores/RetroPlayer/process/windows
 xbmc/cores/RetroPlayer/rendering/VideoShaders/windows cores/RetroPlayer/rendering/VideoShaders/windows
 xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows
+xbmc/cores/VideoPlayer/VideoRenderers/windows cores/VideoPlayer/VideoRenderers/windows
 xbmc/input/touch                       input/touch
 xbmc/input/touch/generic               input/touch/generic
 xbmc/network/mdns                      network/mdns
diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt
index 0644fd2..da42566 100644
--- a/cmake/treedata/windowsstore/subdirs.txt
+++ b/cmake/treedata/windowsstore/subdirs.txt
@@ -1,4 +1,5 @@
 xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows
+xbmc/cores/VideoPlayer/VideoRenderers/windows cores/VideoPlayer/VideoRenderers/windows
 xbmc/input/touch                       input/touch
 xbmc/input/touch/generic               input/touch/generic
 xbmc/network/mdns                      network/mdns
diff --git a/xbmc/addons/AddonBindings.cmake b/xbmc/addons/AddonBindings.cmake
index 53a9801..7fb5aba 100644
--- a/xbmc/addons/AddonBindings.cmake
+++ b/xbmc/addons/AddonBindings.cmake
@@ -5,7 +5,6 @@
 # Keep this in alphabetical order
 set(CORE_ADDON_BINDINGS_FILES
     ${CORE_SOURCE_DIR}/xbmc/cores/AudioEngine/Utils/AEChannelData.h
-    ${CORE_SOURCE_DIR}/xbmc/filesystem/IFileTypes.h
     ${CORE_SOURCE_DIR}/xbmc/input/actions/ActionIDs.h
     ${CORE_SOURCE_DIR}/xbmc/input/XBMC_vkeys.h
 )
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
index db39f86..b0fddda 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
@@ -8,230 +8,137 @@
 
 #pragma once
 
-#include <stdarg.h>     /* va_list, va_start, va_arg, va_end */
+#include "c-api/addon_base.h"
+#include "versions.h"
+
+#include <assert.h> /* assert */
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
+#include <memory>
+#include <stdarg.h> /* va_list, va_start, va_arg, va_end */
 #include <stdexcept>
 #include <string>
 #include <vector>
 
-#ifndef TARGET_WINDOWS
-#ifndef __cdecl
-#define __cdecl
-#endif
-#ifndef __declspec
-#define __declspec(X)
-#endif
-#endif
-
-#undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN
-#undef PRAGMA_PACK_END
-
-#if defined(__GNUC__)
-  #define ATTRIBUTE_PACKED __attribute__ ((packed))
-  #define PRAGMA_PACK 0
-  #define ATTRIBUTE_HIDDEN __attribute__ ((visibility ("hidden")))
-#endif
-
-#if !defined(ATTRIBUTE_PACKED)
-  #define ATTRIBUTE_PACKED
-  #define PRAGMA_PACK 1
-#endif
-
-#if !defined(ATTRIBUTE_HIDDEN)
-  #define ATTRIBUTE_HIDDEN
-#endif
-
-#ifdef _MSC_VER
-    #define ATTRIBUTE_FORCEINLINE __forceinline
-#elif defined(__GNUC__)
-    #define ATTRIBUTE_FORCEINLINE inline __attribute__((__always_inline__))
-#elif defined(__CLANG__)
-    #if __has_attribute(__always_inline__)
-        #define ATTRIBUTE_FORCEINLINE inline __attribute__((__always_inline__))
-    #else
-        #define ATTRIBUTE_FORCEINLINE inline
-    #endif
-#else
-    #define ATTRIBUTE_FORCEINLINE inline
-#endif
-
-#include "versions.h"
-
-namespace kodi { namespace addon { class CAddonBase; }}
-namespace kodi { namespace addon { class IAddonInstance; }}
-
-extern "C" {
-
-//==============================================================================
-/// Standard undefined pointer handle
-typedef void* KODI_HANDLE;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-///
-typedef enum ADDON_STATUS
+namespace kodi
 {
-  ///
-  ADDON_STATUS_OK,
-
-  ///
-  ADDON_STATUS_LOST_CONNECTION,
-
-  ///
-  ADDON_STATUS_NEED_RESTART,
-
-  ///
-  ADDON_STATUS_NEED_SETTINGS,
 
-  ///
-  ADDON_STATUS_UNKNOWN,
-
-  /// permanent failure, like failing to resolve methods
-  ADDON_STATUS_PERMANENT_FAILURE,
-
-  /* internal used return error if function becomes not used from child on
-   * addon */
-  ADDON_STATUS_NOT_IMPLEMENTED
-} ADDON_STATUS;
-//------------------------------------------------------------------------------
+namespace gui
+{
+struct IRenderHelper;
+} // namespace gui
 
 //==============================================================================
-/// @todo remove start with ADDON_* after old way on libXBMC_addon.h is removed
+/// @ingroup cpp_kodi_addon_addonbase_Defs
+/// @defgroup cpp_kodi_addon_addonbase_Defs_CSettingValue class CSettingValue
+/// @brief Inside addon main instance used helper class to give settings value.
+///
+/// This is used on @ref addon::CAddonBase::SetSetting() to inform addon about
+/// settings change by used. This becomes then used to give the related value
+/// name.
+///
+/// ----------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_addon_addonbase_Defs_CSettingValue_Help
 ///
-typedef enum AddonLog
+/// ----------------------------------------------------------------------------
+///
+/// **Here is a code example how this is used:**
+///
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/AddonBase.h>
+///
+/// enum myEnumValue
+/// {
+///   valueA,
+///   valueB,
+///   valueC
+/// };
+///
+/// std::string m_myStringValue;
+/// int m_myIntegerValue;
+/// bool m_myBooleanValue;
+/// float m_myFloatingPointValue;
+/// myEnumValue m_myEnumValue;
+///
+///
+/// ADDON_STATUS CMyAddon::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue)
+/// {
+///   if (settingName == "my_string_value")
+///     m_myStringValue = settingValue.GetString();
+///   else if (settingName == "my_integer_value")
+///     m_myIntegerValue = settingValue.GetInt();
+///   else if (settingName == "my_boolean_value")
+///     m_myBooleanValue = settingValue.GetBoolean();
+///   else if (settingName == "my_float_value")
+///     m_myFloatingPointValue = settingValue.GetFloat();
+///   else if (settingName == "my_enum_value")
+///     m_myEnumValue = settingValue.GetEnum<myEnumValue>();
+/// }
+/// ~~~~~~~~~~~~~
+///
+/// @note The asked type should match the type used on settings.xml.
+///
+///@{
+class ATTRIBUTE_HIDDEN CSettingValue
 {
-  ///
-  ADDON_LOG_DEBUG = 0,
-
-  ///
-  ADDON_LOG_INFO = 1,
+public:
+  explicit CSettingValue(const void* settingValue) : m_settingValue(settingValue) {}
 
-  ///
-  ADDON_LOG_NOTICE = 2,
+  bool empty() const { return (m_settingValue == nullptr) ? true : false; }
 
+  /// @defgroup cpp_kodi_addon_addonbase_Defs_CSettingValue_Help Value Help
+  /// @ingroup cpp_kodi_addon_addonbase_Defs_CSettingValue
   ///
-  ADDON_LOG_WARNING = 3,
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_addon_addonbase_Defs_CSettingValue :</b>
+  /// | Name | Type | Get call
+  /// |------|------|----------
+  /// | **Settings value as string** | `std::string` | @ref CSettingValue::GetString "GetString"
+  /// | **Settings value as integer** | `int` | @ref CSettingValue::GetInt "GetInt"
+  /// | **Settings value as unsigned integer** | `unsigned int` | @ref CSettingValue::GetUInt "GetUInt"
+  /// | **Settings value as boolean** | `bool` | @ref CSettingValue::GetBoolean "GetBoolean"
+  /// | **Settings value as floating point** | `float` | @ref CSettingValue::GetFloat "GetFloat"
+  /// | **Settings value as enum** | `enum` | @ref CSettingValue::GetEnum "GetEnum"
+
+  /// @addtogroup cpp_kodi_addon_addonbase_Defs_CSettingValue
+  ///@{
+
+  /// @brief To get settings value as string.
+  std::string GetString() const { return (const char*)m_settingValue; }
 
-  ///
-  ADDON_LOG_ERROR = 4,
+  /// @brief To get settings value as integer.
+  int GetInt() const { return *(const int*)m_settingValue; }
 
-  ///
-  ADDON_LOG_SEVERE = 5,
+  /// @brief To get settings value as unsigned integer.
+  unsigned int GetUInt() const { return *(const unsigned int*)m_settingValue; }
 
-  ///
-  ADDON_LOG_FATAL = 6
-} AddonLog;
-//------------------------------------------------------------------------------
+  /// @brief To get settings value as boolean.
+  bool GetBoolean() const { return *(const bool*)m_settingValue; }
 
-/*!
- * @brief Handle used to return data from the PVR add-on to CPVRClient
- */
-struct ADDON_HANDLE_STRUCT
-{
-  void *callerAddress;  /*!< address of the caller */
-  void *dataAddress;    /*!< address to store data in */
-  int   dataIdentifier; /*!< parameter to pass back when calling the callback */
-};
-typedef ADDON_HANDLE_STRUCT *ADDON_HANDLE;
+  /// @brief To get settings value as floating point.
+  float GetFloat() const { return *(const float*)m_settingValue; }
 
-/*
- * To have a on add-on and kodi itself handled string always on known size!
- */
-#define ADDON_STANDARD_STRING_LENGTH 1024
-#define ADDON_STANDARD_STRING_LENGTH_SMALL 256
+  /// @brief To get settings value as enum.
+  /// @note Inside settings.xml them stored as integer.
+  template<typename enumType>
+  enumType GetEnum() const
+  {
+    return static_cast<enumType>(*(const int*)m_settingValue);
+  }
 
-/*
- * Callback function tables from addon to Kodi
- * Set complete from Kodi!
- */
-struct AddonToKodiFuncTable_kodi;
-struct AddonToKodiFuncTable_kodi_audioengine;
-struct AddonToKodiFuncTable_kodi_filesystem;
-struct AddonToKodiFuncTable_kodi_network;
-struct AddonToKodiFuncTable_kodi_gui;
-typedef struct AddonToKodiFuncTable_Addon
-{
-  // Pointer inside Kodi, used on callback functions to give related handle
-  // class, for this ADDON::CAddonDll inside Kodi.
-  KODI_HANDLE kodiBase;
-
-  // Function addresses used for callbacks from addon to Kodi
-  void (*free_string)(void* kodiBase, char* str);
-  void (*free_string_array)(void* kodiBase, char** arr, int numElements);
-  char* (*get_addon_path)(void* kodiBase);
-  char* (*get_base_user_path)(void* kodiBase);
-  void (*addon_log_msg)(void* kodiBase, const int loglevel, const char *msg);
-
-  bool (*get_setting_bool)(void* kodiBase, const char* id, bool* value);
-  bool (*get_setting_int)(void* kodiBase, const char* id, int* value);
-  bool (*get_setting_float)(void* kodiBase, const char* id, float* value);
-  bool (*get_setting_string)(void* kodiBase, const char* id, char** value);
-
-  bool (*set_setting_bool)(void* kodiBase, const char* id, bool value);
-  bool (*set_setting_int)(void* kodiBase, const char* id, int value);
-  bool (*set_setting_float)(void* kodiBase, const char* id, float value);
-  bool (*set_setting_string)(void* kodiBase, const char* id, const char* value);
-
-  AddonToKodiFuncTable_kodi* kodi;
-  AddonToKodiFuncTable_kodi_audioengine* kodi_audioengine;
-  AddonToKodiFuncTable_kodi_filesystem* kodi_filesystem;
-  AddonToKodiFuncTable_kodi_gui* kodi_gui;
-  AddonToKodiFuncTable_kodi_network *kodi_network;
-
-  void* (*get_interface)(void* kodiBase, const char *name, const char *version);
-} AddonToKodiFuncTable_Addon;
+  ///@}
 
-/*
- * Function tables from Kodi to addon
- */
-typedef struct KodiToAddonFuncTable_Addon
-{
-  void (*destroy)();
-  ADDON_STATUS (*get_status)();
-  ADDON_STATUS (*create_instance)(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent);
-  void (*destroy_instance)(int instanceType, KODI_HANDLE instance);
-  ADDON_STATUS (*set_setting)(const char *settingName, const void *settingValue);
-  ADDON_STATUS(*create_instance_ex)(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent, const char* version);
-} KodiToAddonFuncTable_Addon;
+private:
+  const void* m_settingValue;
+};
+///@}
+//------------------------------------------------------------------------------
 
-/*
- * Main structure passed from kodi to addon with basic information needed to
- * create add-on.
- */
-typedef struct AddonGlobalInterface
+namespace addon
 {
-  // String with full path where add-on is installed (without his name on end)
-  // Set from Kodi!
-  const char* libBasePath;
-
-  // Pointer of first created instance, used in case this add-on goes with single way
-  // Set from Kodi!
-  KODI_HANDLE firstKodiInstance;
-
-  // Pointer to master base class inside add-on
-  // Set from addon header!
-  kodi::addon::CAddonBase* addonBase;
-
-  // Pointer to a instance used on single way (together with this class)
-  // Set from addon header!
-  kodi::addon::IAddonInstance* globalSingleInstance;
-
-  // Callback function tables from addon to Kodi
-  // Set from Kodi!
-  AddonToKodiFuncTable_Addon* toKodi;
-
-  // Function tables from Kodi to addon
-  // Set from addon header!
-  KodiToAddonFuncTable_Addon* toAddon;
-} AddonGlobalInterface;
-
-} /* extern "C" */
 
 //==============================================================================
-namespace kodi {
-namespace addon {
 /*
  * Internal class to control various instance types with general parts defined
  * here.
@@ -241,66 +148,147 @@ namespace addon {
  * @note This class is not need to know during add-on development thats why
  * commented with "*".
  */
-class IAddonInstance
+class ATTRIBUTE_HIDDEN IAddonInstance
 {
 public:
-  explicit IAddonInstance(ADDON_TYPE type) : m_type(type) { }
-  virtual ~IAddonInstance() = default;
-
-  virtual ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance)
+  explicit IAddonInstance(ADDON_TYPE type, const std::string& version)
+    : m_type(type), m_kodiVersion(version)
   {
-    return ADDON_STATUS_NOT_IMPLEMENTED;
   }
+  virtual ~IAddonInstance() = default;
 
-  virtual ADDON_STATUS CreateInstanceEx(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance, const std::string &version)
+  virtual ADDON_STATUS CreateInstance(int instanceType,
+                                      const std::string& instanceID,
+                                      KODI_HANDLE instance,
+                                      const std::string& version,
+                                      KODI_HANDLE& addonInstance)
   {
-    return CreateInstance(instanceType, instanceID, instance, addonInstance);
+    return ADDON_STATUS_NOT_IMPLEMENTED;
   }
 
   const ADDON_TYPE m_type;
+  const std::string m_kodiVersion;
+  std::string m_id;
 };
-} /* namespace addon */
-} /* namespace kodi */
-//------------------------------------------------------------------------------
 
-//==============================================================================
-namespace kodi {
-///
-class CSettingValue
+/*
+ * Internally used helper class to manage processing of a "C" structure in "CPP"
+ * class.
+ *
+ * At constant, the "C" structure is copied, otherwise the given pointer is
+ * superseded and is changeable.
+ *
+ * -----------------------------------------------------------------------------
+ *
+ * Example:
+ *
+ * ~~~~~~~~~~~~~{.cpp}
+ * extern "C" typedef struct C_SAMPLE_DATA
+ * {
+ *   unsigned int iUniqueId;
+ * } C_SAMPLE_DATA;
+ *
+ * class CPPSampleData : public CStructHdl<CPPSampleData, C_SAMPLE_DATA>
+ * {
+ * public:
+ *   CPPSampleData() = default;
+ *   CPPSampleData(const CPPSampleData& sample) : CStructHdl(sample) { }
+ *   CPPSampleData(const C_SAMPLE_DATA* sample) : CStructHdl(sample) { }
+ *   CPPSampleData(C_SAMPLE_DATA* sample) : CStructHdl(sample) { }
+ *
+ *   void SetUniqueId(unsigned int uniqueId) { m_cStructure->iUniqueId = uniqueId; }
+ *   unsigned int GetUniqueId() const { return m_cStructure->iUniqueId; }
+ * };
+ *
+ * ~~~~~~~~~~~~~
+ *
+ * It also works with the following example:
+ *
+ * ~~~~~~~~~~~~~{.cpp}
+ * CPPSampleData test;
+ * // Some work
+ * C_SAMPLE_DATA* data = test;
+ * // Give "data" to Kodi
+ * ~~~~~~~~~~~~~
+ */
+template<class CPP_CLASS, typename C_STRUCT>
+class CStructHdl
 {
 public:
-  explicit CSettingValue(const void *settingValue) : m_settingValue(settingValue) {}
+  CStructHdl() : m_cStructure(new C_STRUCT()), m_owner(true) {}
 
-  bool empty() const { return (m_settingValue == nullptr) ? true : false; }
-  std::string GetString() const { return (const char*)m_settingValue; }
-  int GetInt() const { return *(const int*)m_settingValue; }
-  unsigned int GetUInt() const { return *(const unsigned int*)m_settingValue; }
-  bool GetBoolean() const { return *(const bool*)m_settingValue; }
-  float GetFloat() const { return *(const float*)m_settingValue; }
+  CStructHdl(const CPP_CLASS& cppClass)
+    : m_cStructure(new C_STRUCT(*cppClass.m_cStructure)), m_owner(true)
+  {
+  }
+
+  CStructHdl(const C_STRUCT* cStructure) : m_cStructure(new C_STRUCT(*cStructure)), m_owner(true) {}
+
+  CStructHdl(C_STRUCT* cStructure) : m_cStructure(cStructure) { assert(cStructure); }
+
+  const CStructHdl& operator=(const CStructHdl& right)
+  {
+    assert(&right.m_cStructure);
+    if (m_cStructure && !m_owner)
+    {
+      memcpy(m_cStructure, right.m_cStructure, sizeof(C_STRUCT));
+    }
+    else
+    {
+      if (m_owner)
+        delete m_cStructure;
+      m_owner = true;
+      m_cStructure = new C_STRUCT(*right.m_cStructure);
+    }
+    return *this;
+  }
+
+  const CStructHdl& operator=(const C_STRUCT& right)
+  {
+    assert(&right);
+    if (m_cStructure && !m_owner)
+    {
+      memcpy(m_cStructure, &right, sizeof(C_STRUCT));
+    }
+    else
+    {
+      if (m_owner)
+        delete m_cStructure;
+      m_owner = true;
+      m_cStructure = new C_STRUCT(*right);
+    }
+    return *this;
+  }
+
+  virtual ~CStructHdl()
+  {
+    if (m_owner)
+      delete m_cStructure;
+  }
+
+  operator C_STRUCT*() { return m_cStructure; }
+  operator const C_STRUCT*() const { return m_cStructure; }
+
+  const C_STRUCT* GetCStructure() const { return m_cStructure; }
+
+protected:
+  C_STRUCT* m_cStructure = nullptr;
 
 private:
-  const void *m_settingValue;
+  bool m_owner = false;
 };
-} /* namespace kodi */
-//------------------------------------------------------------------------------
 
-//==============================================================================
-namespace kodi {
-namespace addon {
 /// Add-on main instance class.
 class ATTRIBUTE_HIDDEN CAddonBase
 {
 public:
   CAddonBase()
   {
-    CAddonBase::m_interface->toAddon->destroy = ADDONBASE_Destroy;
-    CAddonBase::m_interface->toAddon->get_status = ADDONBASE_GetStatus;
-    CAddonBase::m_interface->toAddon->create_instance = ADDONBASE_CreateInstance;
-    CAddonBase::m_interface->toAddon->destroy_instance = ADDONBASE_DestroyInstance;
-    CAddonBase::m_interface->toAddon->set_setting = ADDONBASE_SetSetting;
-    // If version is present, we know that kodi has create_instance_ex implemented
-    if (!CAddonBase::m_strGlobalApiVersion.empty())
-      CAddonBase::m_interface->toAddon->create_instance_ex = ADDONBASE_CreateInstanceEx;
+    m_interface->toAddon->destroy = ADDONBASE_Destroy;
+    m_interface->toAddon->get_status = ADDONBASE_GetStatus;
+    m_interface->toAddon->create_instance = ADDONBASE_CreateInstance;
+    m_interface->toAddon->destroy_instance = ADDONBASE_DestroyInstance;
+    m_interface->toAddon->set_setting = ADDONBASE_SetSetting;
   }
 
   virtual ~CAddonBase() = default;
@@ -309,97 +297,301 @@ public:
 
   virtual ADDON_STATUS GetStatus() { return ADDON_STATUS_OK; }
 
-  virtual ADDON_STATUS SetSetting(const std::string& settingName, const CSettingValue& settingValue) { return ADDON_STATUS_UNKNOWN; }
-
-  virtual ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance)
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_addonbase
+  /// @brief To inform addon about changed settings values.
+  ///
+  /// This becomes called for every entry defined inside his settings.xml and
+  /// as **last** call the one where last in xml (to identify end of calls).
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_addon_addonbase_Defs_CSettingValue_Help
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here is a code example how this is used:**
+  ///
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/AddonBase.h>
+  ///
+  /// enum myEnumValue
+  /// {
+  ///   valueA,
+  ///   valueB,
+  ///   valueC
+  /// };
+  ///
+  /// std::string m_myStringValue;
+  /// int m_myIntegerValue;
+  /// bool m_myBooleanValue;
+  /// float m_myFloatingPointValue;
+  /// myEnumValue m_myEnumValue;
+  ///
+  ///
+  /// ADDON_STATUS CMyAddon::SetSetting(const std::string& settingName, const kodi::CSettingValue& settingValue)
+  /// {
+  ///   if (settingName == "my_string_value")
+  ///     m_myStringValue = settingValue.GetString();
+  ///   else if (settingName == "my_integer_value")
+  ///     m_myIntegerValue = settingValue.GetInt();
+  ///   else if (settingName == "my_boolean_value")
+  ///     m_myBooleanValue = settingValue.GetBoolean();
+  ///   else if (settingName == "my_float_value")
+  ///     m_myFloatingPointValue = settingValue.GetFloat();
+  ///   else if (settingName == "my_enum_value")
+  ///     m_myEnumValue = settingValue.GetEnum<myEnumValue>();
+  /// }
+  /// ~~~~~~~~~~~~~
+  ///
+  /// @note The asked type should match the type used on settings.xml.
+  ///
+  virtual ADDON_STATUS SetSetting(const std::string& settingName,
+                                  const kodi::CSettingValue& settingValue)
   {
-    /* The handling below is intended for the case of the add-on only one
-     * instance and this is integrated in the add-on base class.
-     */
-
-    /* Check about single instance usage */
-    if (CAddonBase::m_interface->firstKodiInstance == instance && // the kodi side instance pointer must be equal to first one
-        CAddonBase::m_interface->globalSingleInstance &&  // the addon side instance pointer must be set
-        CAddonBase::m_interface->globalSingleInstance->m_type == instanceType) // and the requested type must be equal with used add-on class
-    {
-      addonInstance = CAddonBase::m_interface->globalSingleInstance;
-      return ADDON_STATUS_OK;
-    }
-
     return ADDON_STATUS_UNKNOWN;
   }
+  //----------------------------------------------------------------------------
 
-  virtual ADDON_STATUS CreateInstanceEx(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance, const std::string &version)
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_addonbase
+  /// @brief Instance created
+  ///
+  /// @param[in] instanceType The requested type of required instance, see \ref ADDON_TYPE.
+  /// @param[in] instanceID An individual identification key string given by Kodi.
+  /// @param[in] instance The instance handler used by Kodi must be passed to
+  ///                     the classes created here. See in the example.
+  /// @param[in] version The from Kodi used version of instance. This can be
+  ///                    used to allow compatibility to older versions of
+  ///                    them. Further is this given to the parent instance
+  ///                    that it can handle differences.
+  /// @param[out] addonInstance The pointer to instance class created in addon.
+  ///                           Needed to be able to identify them on calls.
+  /// @return                   \ref ADDON_STATUS_OK if correct, for possible errors
+  ///                           see \ref ADDON_STATUS
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  /// **Here is a code example how this is used:**
+  ///
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/AddonBase.h>
+  ///
+  /// ...
+  ///
+  /// /* 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_SCREENSAVER)
+  ///   {
+  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Screensaver");
+  ///     addonInstance = new CMyScreensaver(instance);
+  ///     return ADDON_STATUS_OK;
+  ///   }
+  ///   else if (instanceType == ADDON_INSTANCE_VISUALIZATION)
+  ///   {
+  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Visualization");
+  ///     addonInstance = new CMyVisualization(instance);
+  ///     return ADDON_STATUS_OK;
+  ///   }
+  ///   else if (...)
+  ///   {
+  ///     ...
+  ///   }
+  ///   return ADDON_STATUS_UNKNOWN;
+  /// }
+  ///
+  /// ...
+  ///
+  /// ~~~~~~~~~~~~~
+  ///
+  virtual ADDON_STATUS CreateInstance(int instanceType,
+                                      const std::string& instanceID,
+                                      KODI_HANDLE instance,
+                                      const std::string& version,
+                                      KODI_HANDLE& addonInstance)
   {
-    return CreateInstance(instanceType, instanceID, instance, addonInstance);
+    return ADDON_STATUS_NOT_IMPLEMENTED;
   }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_addon_addonbase
+  /// @brief Instance destroy
+  ///
+  /// This function is optional and intended to notify addon that the instance
+  /// is terminating.
+  ///
+  /// @param[in] instanceType   The requested type of required instance, see \ref ADDON_TYPE.
+  /// @param[in] instanceID     An individual identification key string given by Kodi.
+  /// @param[in] addonInstance  The pointer to instance class created in addon.
+  ///
+  /// @warning This call is only used to inform that the associated instance
+  /// is terminated. The deletion is carried out in the background.
+  ///
+  virtual void DestroyInstance(int instanceType,
+                               const std::string& instanceID,
+                               KODI_HANDLE addonInstance)
+  {
+  }
+  //--------------------------------------------------------------------------
+
+  /* Background helper for GUI render systems, e.g. Screensaver or Visualization */
+  std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
 
   /* Global variables of class */
-  static AddonGlobalInterface* m_interface; // Interface function table to hold addresses on add-on and from kodi
-  static std::string m_strGlobalApiVersion;
+  static AddonGlobalInterface*
+      m_interface; // Interface function table to hold addresses on add-on and from kodi
 
-/*private:*/ /* Needed public as long the old call functions becomes used! */
+  /*private:*/ /* Needed public as long the old call functions becomes used! */
   static inline void ADDONBASE_Destroy()
   {
-    delete CAddonBase::m_interface->addonBase;
-    CAddonBase::m_interface->addonBase = nullptr;
+    delete static_cast<CAddonBase*>(m_interface->addonBase);
+    m_interface->addonBase = nullptr;
   }
 
-  static inline ADDON_STATUS ADDONBASE_GetStatus() { return CAddonBase::m_interface->addonBase->GetStatus(); }
-
-  static inline ADDON_STATUS ADDONBASE_SetSetting(const char *settingName, const void *settingValue)
+  static inline ADDON_STATUS ADDONBASE_GetStatus()
   {
-    return CAddonBase::m_interface->addonBase->SetSetting(settingName, CSettingValue(settingValue));
+    return static_cast<CAddonBase*>(m_interface->addonBase)->GetStatus();
   }
 
-  static inline ADDON_STATUS ADDONBASE_CreateInstance(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent)
+  static inline ADDON_STATUS ADDONBASE_SetSetting(const char* settingName, const void* settingValue)
   {
-    return ADDONBASE_CreateInstanceEx(instanceType, instanceID, instance, addonInstance, parent, "");
+    return static_cast<CAddonBase*>(m_interface->addonBase)
+        ->SetSetting(settingName, CSettingValue(settingValue));
   }
 
-  static inline ADDON_STATUS ADDONBASE_CreateInstanceEx(int instanceType, const char* instanceID, KODI_HANDLE instance, KODI_HANDLE* addonInstance, KODI_HANDLE parent, const char* version)
+private:
+  static inline ADDON_STATUS ADDONBASE_CreateInstance(int instanceType,
+                                                      const char* instanceID,
+                                                      KODI_HANDLE instance,
+                                                      const char* version,
+                                                      KODI_HANDLE* addonInstance,
+                                                      KODI_HANDLE parent)
   {
+    CAddonBase* base = static_cast<CAddonBase*>(m_interface->addonBase);
+
     ADDON_STATUS status = ADDON_STATUS_NOT_IMPLEMENTED;
-    if (parent != nullptr)
-      status = static_cast<IAddonInstance*>(parent)->CreateInstanceEx(instanceType, instanceID, instance, *addonInstance, version);
-    if (status == ADDON_STATUS_NOT_IMPLEMENTED)
-      status = CAddonBase::m_interface->addonBase->CreateInstanceEx(instanceType, instanceID, instance, *addonInstance, version);
+
+    /* Check about single instance usage:
+     * 1. The kodi side instance pointer must be equal to first one
+     * 2. The addon side instance pointer must be set
+     * 3. And the requested type must be equal with used add-on class
+     */
+    if (m_interface->firstKodiInstance == instance && m_interface->globalSingleInstance &&
+        static_cast<IAddonInstance*>(m_interface->globalSingleInstance)->m_type == instanceType)
+    {
+      /* The handling here is intended for the case of the add-on only one
+       * instance and this is integrated in the add-on base class.
+       */
+      *addonInstance = m_interface->globalSingleInstance;
+      status = ADDON_STATUS_OK;
+    }
+    else
+    {
+      /* Here it should use the CreateInstance instance function to allow
+       * creation of several on one addon.
+       */
+
+      /* Check first a parent is defined about (e.g. Codec within inputstream) */
+      if (parent != nullptr)
+        status = static_cast<IAddonInstance*>(parent)->CreateInstance(
+            instanceType, instanceID, instance, version, *addonInstance);
+
+      /* if no parent call the main instance creation function to get it */
+      if (status == ADDON_STATUS_NOT_IMPLEMENTED)
+      {
+        status = base->CreateInstance(instanceType, instanceID, instance, version, *addonInstance);
+      }
+    }
+
     if (*addonInstance == nullptr)
-      throw std::logic_error("kodi::addon::CAddonBase CreateInstanceEx returns a empty instance pointer!");
+    {
+      if (status == ADDON_STATUS_OK)
+      {
+        m_interface->toKodi->addon_log_msg(m_interface->toKodi->kodiBase, ADDON_LOG_FATAL,
+                                           "kodi::addon::CAddonBase CreateInstance returned an "
+                                           "empty instance pointer, but reported OK!");
+        return ADDON_STATUS_PERMANENT_FAILURE;
+      }
+      else
+      {
+        return status;
+      }
+    }
+
+    if (static_cast<IAddonInstance*>(*addonInstance)->m_type != instanceType)
+    {
+      m_interface->toKodi->addon_log_msg(
+          m_interface->toKodi->kodiBase, ADDON_LOG_FATAL,
+          "kodi::addon::CAddonBase CreateInstance difference between given and returned");
+      delete static_cast<IAddonInstance*>(*addonInstance);
+      *addonInstance = nullptr;
+      return ADDON_STATUS_PERMANENT_FAILURE;
+    }
 
-    if (static_cast<::kodi::addon::IAddonInstance*>(*addonInstance)->m_type != instanceType)
-      throw std::logic_error("kodi::addon::CAddonBase CreateInstanceEx with difference on given and returned instance type!");
+    // Store the used ID inside instance, to have on destroy calls by addon to identify
+    static_cast<IAddonInstance*>(*addonInstance)->m_id = instanceID;
 
     return status;
   }
 
   static inline void ADDONBASE_DestroyInstance(int instanceType, KODI_HANDLE instance)
   {
-    if (CAddonBase::m_interface->globalSingleInstance == nullptr && instance != CAddonBase::m_interface->addonBase)
+    CAddonBase* base = static_cast<CAddonBase*>(m_interface->addonBase);
+
+    if (m_interface->globalSingleInstance == nullptr && instance != base)
     {
-      if (static_cast<::kodi::addon::IAddonInstance*>(instance)->m_type == instanceType)
-        delete static_cast<::kodi::addon::IAddonInstance*>(instance);
-      else
-        throw std::logic_error("kodi::addon::CAddonBase DestroyInstance called with difference on given and present instance type!");
+      base->DestroyInstance(instanceType, static_cast<IAddonInstance*>(instance)->m_id, instance);
+      delete static_cast<IAddonInstance*>(instance);
     }
   }
 };
+
 } /* namespace addon */
-} /* namespace kodi */
+
+//==============================================================================
+/// @ingroup cpp_kodi_addon
+/// @brief To get used version inside Kodi itself about asked type.
+///
+/// This thought to allow a addon a handling of newer addon versions within
+/// older Kodi until the type min version not changed.
+///
+/// @param[in] type The wanted type of @ref ADDON_TYPE to ask
+/// @return The version string about type in MAJOR.MINOR.PATCH style.
+///
+inline std::string ATTRIBUTE_HIDDEN GetKodiTypeVersion(int type)
+{
+  using namespace kodi::addon;
+
+  char* str = CAddonBase::m_interface->toKodi->get_type_version(
+      CAddonBase::m_interface->toKodi->kodiBase, type);
+  std::string ret = str;
+  CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, str);
+  return ret;
+}
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
 ///
-inline std::string GetAddonPath(const std::string& append = "")
+inline std::string ATTRIBUTE_HIDDEN GetAddonPath(const std::string& append = "")
 {
-  char* str = ::kodi::addon::CAddonBase::m_interface->toKodi->get_addon_path(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
+  using namespace kodi::addon;
+
+  char* str =
+      CAddonBase::m_interface->toKodi->get_addon_path(CAddonBase::m_interface->toKodi->kodiBase);
   std::string ret = str;
-  ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, str);
+  CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, str);
   if (!append.empty())
   {
-    if (append.at(0) != '\\' &&
-        append.at(0) != '/')
+    if (append.at(0) != '\\' && append.at(0) != '/')
 #ifdef TARGET_WINDOWS
       ret.append("\\");
 #else
@@ -409,21 +601,21 @@ inline std::string GetAddonPath(const std::string& append = "")
   }
   return ret;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
 ///
-inline std::string GetBaseUserPath(const std::string& append = "")
+inline std::string ATTRIBUTE_HIDDEN GetBaseUserPath(const std::string& append = "")
 {
-  char* str = ::kodi::addon::CAddonBase::m_interface->toKodi->get_base_user_path(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
+  using namespace kodi::addon;
+
+  char* str = CAddonBase::m_interface->toKodi->get_base_user_path(
+      CAddonBase::m_interface->toKodi->kodiBase);
   std::string ret = str;
-  ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, str);
+  CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, str);
   if (!append.empty())
   {
-    if (append.at(0) != '\\' &&
-        append.at(0) != '/')
+    if (append.at(0) != '\\' && append.at(0) != '/')
 #ifdef TARGET_WINDOWS
       ret.append("\\");
 #else
@@ -433,174 +625,574 @@ inline std::string GetBaseUserPath(const std::string& append = "")
   }
   return ret;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
 ///
-inline std::string GetLibPath()
+inline std::string ATTRIBUTE_HIDDEN GetLibPath()
 {
-  return ::kodi::addon::CAddonBase::m_interface->libBasePath;
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->libBasePath;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
+/// @ingroup cpp_kodi
+/// @brief Add a message to Kodi's log.
+///
+/// @param[in] loglevel The log level of the message.
+/// @param[in] format The format of the message to pass to Kodi.
+/// @param[in] ... Additional text to insert in format text
+///
+///
+/// @note This method uses limited buffer (16k) for the formatted output.
+/// So data, which will not fit into it, will be silently discarded.
 ///
-inline void Log(const AddonLog loglevel, const char* format, ...)
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// kodi::Log(ADDON_LOG_ERROR, "%s: There is an error occurred!", __func__);
+///
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN Log(const AddonLog loglevel, const char* format, ...)
 {
+  using namespace kodi::addon;
+
   char buffer[16384];
   va_list args;
   va_start(args, format);
-  vsprintf(buffer, format, args);
+  vsnprintf(buffer, sizeof(buffer), format, args);
   va_end(args);
-  ::kodi::addon::CAddonBase::m_interface->toKodi->addon_log_msg(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, loglevel, buffer);
+  CAddonBase::m_interface->toKodi->addon_log_msg(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 loglevel, buffer);
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//##############################################################################
+/// @ingroup cpp_kodi
+/// @defgroup cpp_kodi_settings 1. Setting control
+/// @brief **Functions to handle settings access**\n
+/// This can be used to get and set the addon related values inside his
+/// settings.xml.
+///
+/// The settings style is given with installed part on e.g.
+/// <b>`$HOME/.kodi/addons/myspecial.addon/resources/settings.xml`</b>. The
+/// related edit becomes then stored inside
+/// <b>`$HOME/.kodi/userdata/addon_data/myspecial.addon/settings.xml`</b>.
+///
+/*!@{*/
+
+//==============================================================================
+/// @brief Check the given setting name is set to default value.
 ///
-inline bool CheckSettingString(const std::string& settingName, std::string& settingValue)
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @return true if setting is the default
+///
+inline bool ATTRIBUTE_HIDDEN IsSettingUsingDefault(const std::string& settingName)
 {
+  using namespace kodi::addon;
+  return CAddonBase::m_interface->toKodi->is_setting_using_default(
+      CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief Check and get a string setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[out] settingValue The given setting value
+/// @return true if setting was successfully found and "settingValue" is set
+///
+/// @note If returns false, the "settingValue" is not changed.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// std::string value;
+/// if (!kodi::CheckSettingString("my_string_value", value))
+///   value = "my_default_if_setting_not_work";
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN CheckSettingString(const std::string& settingName,
+                                                std::string& settingValue)
+{
+  using namespace kodi::addon;
+
   char* buffer = nullptr;
-  bool ret = ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &buffer);
+  bool ret = CAddonBase::m_interface->toKodi->get_setting_string(
+      CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &buffer);
   if (buffer)
   {
     if (ret)
       settingValue = buffer;
-    ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, buffer);
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, buffer);
   }
   return ret;
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Get string setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[in] defaultValue [opt] Default value if not found
+/// @return The value of setting, empty if not found;
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// std::string value = kodi::GetSettingString("my_string_value");
+/// ~~~~~~~~~~~~~
 ///
-inline std::string GetSettingString(const std::string& settingName)
+inline std::string ATTRIBUTE_HIDDEN GetSettingString(const std::string& settingName,
+                                                     const std::string& defaultValue = "")
 {
-  std::string settingValue;
+  std::string settingValue = defaultValue;
   CheckSettingString(settingName, settingValue);
   return settingValue;
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Set string setting of addon.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of setting
+/// @param[in] settingValue The setting value to write
+///
 ///
-inline void SetSettingString(const std::string& settingName, const std::string& settingValue)
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// std::string value = "my_new_name for";
+/// kodi::SetSettingString("my_string_value", value);
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN SetSettingString(const std::string& settingName,
+                                              const std::string& settingValue)
 {
-  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue.c_str());
+  using namespace kodi::addon;
+
+  CAddonBase::m_interface->toKodi->set_setting_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                      settingName.c_str(), settingValue.c_str());
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Check and get a integer setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[out] settingValue The given setting value
+/// @return true if setting was successfully found and "settingValue" is set
+///
+/// @note If returns false, the "settingValue" is not changed.
 ///
-inline bool CheckSettingInt(const std::string& settingName, int& settingValue)
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// int value = 0;
+/// if (!kodi::CheckSettingInt("my_integer_value", value))
+///   value = 123; // My default of them
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN CheckSettingInt(const std::string& settingName, int& settingValue)
 {
-  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting_int(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->get_setting_int(CAddonBase::m_interface->toKodi->kodiBase,
+                                                          settingName.c_str(), &settingValue);
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Get integer setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[in] defaultValue [opt] Default value if not found
+/// @return The value of setting, <b>`0`</b> or defaultValue if not found
 ///
-inline int GetSettingInt(const std::string& settingName)
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// int value = kodi::GetSettingInt("my_integer_value");
+/// ~~~~~~~~~~~~~
+///
+inline int ATTRIBUTE_HIDDEN GetSettingInt(const std::string& settingName, int defaultValue = 0)
 {
-  int settingValue = 0;
+  int settingValue = defaultValue;
   CheckSettingInt(settingName, settingValue);
   return settingValue;
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Set integer setting of addon.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of setting
+/// @param[in] settingValue The setting value to write
 ///
-inline void SetSettingInt(const std::string& settingName, int settingValue)
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// int value = 123;
+/// kodi::SetSettingInt("my_integer_value", value);
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN SetSettingInt(const std::string& settingName, int settingValue)
 {
-  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting_int(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue);
+  using namespace kodi::addon;
+
+  CAddonBase::m_interface->toKodi->set_setting_int(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   settingName.c_str(), settingValue);
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Check and get a boolean setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[out] settingValue The given setting value
+/// @return true if setting was successfully found and "settingValue" is set
+///
+/// @note If returns false, the "settingValue" is not changed.
+///
+///
+/// ----------------------------------------------------------------------------
 ///
-inline bool CheckSettingBoolean(const std::string& settingName, bool& settingValue)
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// bool value = false;
+/// if (!kodi::CheckSettingBoolean("my_boolean_value", value))
+///   value = true; // My default of them
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN CheckSettingBoolean(const std::string& settingName, bool& settingValue)
 {
-  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting_bool(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->get_setting_bool(
+      CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Get boolean setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[in] defaultValue [opt] Default value if not found
+/// @return The value of setting, <b>`false`</b> or defaultValue if not found
+///
+///
+/// ----------------------------------------------------------------------------
 ///
-inline bool GetSettingBoolean(const std::string& settingName)
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// bool value = kodi::GetSettingBoolean("my_boolean_value");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN GetSettingBoolean(const std::string& settingName,
+                                               bool defaultValue = false)
 {
-  bool settingValue = false;
+  bool settingValue = defaultValue;
   CheckSettingBoolean(settingName, settingValue);
   return settingValue;
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Set boolean setting of addon.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of setting
+/// @param[in] settingValue The setting value to write
+///
+///
+/// ----------------------------------------------------------------------------
 ///
-inline void SetSettingBoolean(const std::string& settingName, bool settingValue)
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// bool value = true;
+/// kodi::SetSettingBoolean("my_boolean_value", value);
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN SetSettingBoolean(const std::string& settingName, bool settingValue)
 {
-  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting_bool(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue);
+  using namespace kodi::addon;
+
+  CAddonBase::m_interface->toKodi->set_setting_bool(CAddonBase::m_interface->toKodi->kodiBase,
+                                                    settingName.c_str(), settingValue);
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Check and get a floating point setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[out] settingValue The given setting value
+/// @return true if setting was successfully found and "settingValue" is set
+///
+/// @note If returns false, the "settingValue" is not changed.
+///
 ///
-inline bool CheckSettingFloat(const std::string& settingName, float& settingValue)
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// float value = 0.0f;
+/// if (!kodi::CheckSettingBoolean("my_float_value", value))
+///   value = 1.0f; // My default of them
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN CheckSettingFloat(const std::string& settingName, float& settingValue)
 {
-  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting_float(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->get_setting_float(
+      CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Get floating point setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[in] defaultValue [opt] Default value if not found
+/// @return The value of setting, <b>`0.0`</b> or defaultValue if not found
+///
 ///
-inline float GetSettingFloat(const std::string& settingName)
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// float value = kodi::GetSettingFloat("my_float_value");
+/// ~~~~~~~~~~~~~
+///
+inline float ATTRIBUTE_HIDDEN GetSettingFloat(const std::string& settingName,
+                                              float defaultValue = 0.0f)
 {
-  float settingValue = 0.0f;
+  float settingValue = defaultValue;
   CheckSettingFloat(settingName, settingValue);
   return settingValue;
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 
-//============================================================================
-namespace kodi {
+//==============================================================================
+/// @brief Set floating point setting of addon.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of setting
+/// @param[in] settingValue The setting value to write
+///
+///
+/// ----------------------------------------------------------------------------
 ///
-inline void SetSettingFloat(const std::string& settingName, float settingValue)
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// float value = 1.0f;
+/// kodi::SetSettingFloat("my_float_value", value);
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN SetSettingFloat(const std::string& settingName, float settingValue)
 {
-  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting_float(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue);
+  using namespace kodi::addon;
+
+  CAddonBase::m_interface->toKodi->set_setting_float(CAddonBase::m_interface->toKodi->kodiBase,
+                                                     settingName.c_str(), settingValue);
 }
-} /* namespace kodi */
-//----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief Check and get a enum setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[out] settingValue The given setting value
+/// @return true if setting was successfully found and "settingValue" is set
+///
+/// @remark The enums are used as integer inside settings.xml.
+/// @note If returns false, the "settingValue" is not changed.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// enum myEnumValue
+/// {
+///   valueA,
+///   valueB,
+///   valueC
+/// };
+///
+/// myEnumValue value;
+/// if (!kodi::CheckSettingEnum<myEnumValue>("my_enum_value", value))
+///   value = valueA; // My default of them
+/// ~~~~~~~~~~~~~
+///
+template<typename enumType>
+inline bool ATTRIBUTE_HIDDEN CheckSettingEnum(const std::string& settingName,
+                                              enumType& settingValue)
+{
+  using namespace kodi::addon;
+
+  int settingValueInt = static_cast<int>(settingValue);
+  bool ret = CAddonBase::m_interface->toKodi->get_setting_int(
+      CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValueInt);
+  if (ret)
+    settingValue = static_cast<enumType>(settingValueInt);
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief Get enum setting value.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of asked setting
+/// @param[in] defaultValue [opt] Default value if not found
+/// @return The value of setting, forced to <b>`0`</b> or defaultValue if not found
+///
+/// @remark The enums are used as integer inside settings.xml.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// enum myEnumValue
+/// {
+///   valueA,
+///   valueB,
+///   valueC
+/// };
+///
+/// myEnumValue value = kodi::GetSettingEnum<myEnumValue>("my_enum_value");
+/// ~~~~~~~~~~~~~
+///
+template<typename enumType>
+inline enumType ATTRIBUTE_HIDDEN GetSettingEnum(const std::string& settingName,
+                                                enumType defaultValue = static_cast<enumType>(0))
+{
+  enumType settingValue = defaultValue;
+  CheckSettingEnum(settingName, settingValue);
+  return settingValue;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @brief Set enum setting of addon.
+///
+/// The setting name relate to names used in his <b>settings.xml</b> file.
+///
+/// @param[in] settingName The name of setting
+/// @param[in] settingValue The setting value to write
+///
+/// @remark The enums are used as integer inside settings.xml.
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+///
+/// enum myEnumValue
+/// {
+///   valueA,
+///   valueB,
+///   valueC
+/// };
+///
+/// myEnumValue value = valueA;
+/// kodi::SetSettingEnum<myEnumValue>("my_enum_value", value);
+/// ~~~~~~~~~~~~~
+///
+template<typename enumType>
+inline void ATTRIBUTE_HIDDEN SetSettingEnum(const std::string& settingName, enumType settingValue)
+{
+  using namespace kodi::addon;
+
+  CAddonBase::m_interface->toKodi->set_setting_int(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   settingName.c_str(),
+                                                   static_cast<int>(settingValue));
+}
+//------------------------------------------------------------------------------
+
+/*!@}*/
 
 //============================================================================
-namespace kodi {
 ///
-inline std::string TranslateAddonStatus(ADDON_STATUS status)
+inline std::string ATTRIBUTE_HIDDEN TranslateAddonStatus(ADDON_STATUS status)
 {
   switch (status)
   {
@@ -623,13 +1215,10 @@ inline std::string TranslateAddonStatus(ADDON_STATUS status)
   }
   return "Unknown";
 }
-} /* namespace kodi */
 //----------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
-/// \ingroup cpp_kodi
+/// @ingroup cpp_kodi
 /// @brief Returns a function table to a named interface
 ///
 /// @return pointer to struct containing interface functions
@@ -646,12 +1235,16 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline void* GetInterface(const std::string &name, const std::string &version)
+inline void* GetInterface(const std::string& name, const std::string& version)
 {
-  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+  using namespace kodi::addon;
+
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
 
   return toKodi->get_interface(toKodi->kodiBase, name.c_str(), version.c_str());
 }
+//----------------------------------------------------------------------------
+
 } /* namespace kodi */
 
 /*! addon creation macro
@@ -663,17 +1256,13 @@ inline void* GetInterface(const std::string &name, const std::string &version)
  * Becomes really cleaned up soon :D
  */
 #define ADDONCREATOR(AddonClass) \
-  extern "C" __declspec(dllexport) void get_addon(void* pAddon) {} \
-  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_Create(KODI_HANDLE addonInterface, void *unused) \
+  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_Create( \
+      KODI_HANDLE addonInterface, const char* /*globalApiVersion*/, void* /*unused*/) \
   { \
     kodi::addon::CAddonBase::m_interface = static_cast<AddonGlobalInterface*>(addonInterface); \
     kodi::addon::CAddonBase::m_interface->addonBase = new AddonClass; \
-    return kodi::addon::CAddonBase::m_interface->addonBase->Create(); \
-  } \
-  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_CreateEx(KODI_HANDLE addonInterface, const char* globalApiVersion, void *unused) \
-  { \
-    kodi::addon::CAddonBase::m_strGlobalApiVersion = globalApiVersion; \
-    return ADDON_Create(addonInterface, unused); \
+    return static_cast<kodi::addon::CAddonBase*>(kodi::addon::CAddonBase::m_interface->addonBase) \
+        ->Create(); \
   } \
   extern "C" __declspec(dllexport) void ADDON_Destroy() \
   { \
@@ -683,7 +1272,8 @@ inline void* GetInterface(const std::string &name, const std::string &version)
   { \
     return kodi::addon::CAddonBase::ADDONBASE_GetStatus(); \
   } \
-  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue) \
+  extern "C" __declspec(dllexport) ADDON_STATUS ADDON_SetSetting(const char* settingName, \
+                                                                 const void* settingValue) \
   { \
     return kodi::addon::CAddonBase::ADDONBASE_SetSetting(settingName, settingValue); \
   } \
@@ -695,6 +1285,4 @@ inline void* GetInterface(const std::string &name, const std::string &version)
   { \
     return kodi::addon::GetTypeMinVersion(type); \
   } \
-  AddonGlobalInterface* kodi::addon::CAddonBase::m_interface = nullptr; \
-  std::string kodi::addon::CAddonBase::m_strGlobalApiVersion;
-
+  AddonGlobalInterface* kodi::addon::CAddonBase::m_interface = nullptr;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h
new file mode 100644
index 0000000..0cfefac
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AudioEngine.h
@@ -0,0 +1,618 @@
+/*
+ *  Copyright (C) 2005-2019 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/audio_engine.h"
+
+#ifdef __cplusplus
+
+namespace kodi
+{
+namespace audioengine
+{
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// Main page text for audio engine group by Doxygen.
+//{{{
+
+//==============================================================================
+///
+/// @defgroup cpp_kodi_audioengine  Interface - kodi::audioengine
+/// @ingroup cpp
+/// @brief **Audio engine functions**\n
+/// This interface contains auxiliary functions and classes which allow an addon
+/// to play their own individual audio stream in Kodi.
+///
+/// Using @ref cpp_kodi_audioengine_CAEStream "kodi::audioengine::CAEStream",
+/// a class can be created in this regard, about which the necessary stream data and
+/// information are given to Kodi.
+///
+/// Via @ref kodi::audioengine::GetCurrentSinkFormat(), the audio formats currently
+/// processed in Kodi can be called up beforehand in order to adapt your own stream
+/// to them.
+///
+/// However, the created stream can also differ from this because Kodi changes
+/// it to suit it.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+///
+/// #include <kodi/AudioEngine.h>
+///
+/// ...
+///
+/// kodi::audioengine::AudioEngineFormat format;
+/// if (!kodi::audioengine::GetCurrentSinkFormat(format))
+///   return false;
+///
+/// format.SetDataFormat(AUDIOENGINE_FMT_FLOATP);
+/// format.SetChannelLayout(std::vector<AudioEngineChannel>(AUDIOENGINE_CH_FL, AUDIOENGINE_CH_FR));
+///
+/// unsigned int myUsedSampleRate = format.GetSampleRate();
+///
+/// ...
+///
+/// kodi::audioengine::CAEStream* stream = new kodi::audioengine::CAEStream(format, AUDIO_STREAM_AUTOSTART);
+///
+/// ~~~~~~~~~~~~~
+///
+/// ------------------------------------------------------------------------
+///
+/// It has the header \ref AudioEngine.h "#include <kodi/AudioEngine.h>" be included
+/// to enjoy it.
+///
+//------------------------------------------------------------------------------
+
+//==============================================================================
+///
+/// @defgroup cpp_kodi_audioengine_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_audioengine
+/// @brief **Library definition values**\n
+/// All audio engine functions associated data structures.
+///
+//------------------------------------------------------------------------------
+
+//}}}
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" related audio engine definitions
+//{{{
+
+//==============================================================================
+/// @defgroup cpp_kodi_audioengine_Defs_AudioEngineFormat class AudioEngineFormat
+/// @ingroup cpp_kodi_audioengine_Defs
+/// @brief **Audio format structure**\n
+/// The audio format structure that fully defines a stream's audio
+/// information.
+///
+/// With the help of this format information, Kodi adjusts its processing
+/// accordingly.
+///
+//@{
+class ATTRIBUTE_HIDDEN AudioEngineFormat
+  : public addon::CStructHdl<AudioEngineFormat, AUDIO_ENGINE_FORMAT>
+{
+public:
+  /*! \cond PRIVATE */
+  AudioEngineFormat()
+  {
+    m_cStructure->m_dataFormat = AUDIOENGINE_FMT_INVALID;
+    m_cStructure->m_sampleRate = 0;
+    m_cStructure->m_encodedRate = 0;
+    m_cStructure->m_frames = 0;
+    m_cStructure->m_frameSize = 0;
+    m_cStructure->m_channelCount = 0;
+
+    for (size_t ch = 0; ch < AUDIOENGINE_CH_MAX; ++ch)
+      m_cStructure->m_channels[ch] = AUDIOENGINE_CH_NULL;
+  }
+  AudioEngineFormat(const AudioEngineFormat& channel) : CStructHdl(channel) {}
+  AudioEngineFormat(const AUDIO_ENGINE_FORMAT* channel) : CStructHdl(channel) {}
+  AudioEngineFormat(AUDIO_ENGINE_FORMAT* channel) : CStructHdl(channel) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_audioengine_Defs_AudioEngineFormat_Help *Value Help*
+  /// @ingroup cpp_kodi_audioengine_Defs_AudioEngineFormat
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_audioengine_Defs_AudioEngineFormat :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Data format**, see @ref AudioEngineDataFormat for available types | enum | @ref AudioEngineFormat::SetDataFormat "SetDataFormat" | @ref AudioEngineFormat::GetDataFormat "GetDataFormat"
+  /// | **Sample rate** | unsigned int | @ref AudioEngineFormat::SetSampleRate "SetSampleRate" | @ref AudioEngineFormat::GetSampleRate "GetSampleRate"
+  /// | **Encoded rate** | unsigned int | @ref AudioEngineFormat::SetEncodedRate "SetEncodedRate" | @ref AudioEngineFormat::GetEncodedRate "GetEncodedRate"
+  /// | **Channel layout**, see @ref AudioEngineChannel for available types | std::vector<enum AudioEngineChannel> | @ref AudioEngineFormat::SetChannelLayout "SetChannelLayout" | @ref AudioEngineFormat::GetChannelLayout "GetChannelLayout"
+  /// | **Frames amount** | unsigned int | @ref AudioEngineFormat::SetFramesAmount "SetFramesAmount" | @ref AudioEngineFormat::GetFramesAmount "GetFramesAmount"
+  /// | **Frame size** | unsigned int | @ref AudioEngineFormat::SetFrameSize "SetFrameSize" | @ref AudioEngineFormat::GetFrameSize "GetFrameSize"
+  ///
+  /// Further is @ref AudioEngineFormat::CompareFormat "CompareFormat" included to compare this class with another.
+  ///
+
+  /// @addtogroup cpp_kodi_audioengine_Defs_AudioEngineFormat
+  /// @copydetails cpp_kodi_audioengine_Defs_AudioEngineFormat_Help
+  //@{
+
+  /// @brief The stream's data format (eg, AUDIOENGINE_FMT_S16LE)
+  void SetDataFormat(enum AudioEngineDataFormat format) { m_cStructure->m_dataFormat = format; }
+
+  /// @brief To get with @ref SetDataFormat changed values.
+  enum AudioEngineDataFormat GetDataFormat() const { return m_cStructure->m_dataFormat; }
+
+  /// @brief The stream's sample rate (eg, 48000)
+  void SetSampleRate(unsigned int rate) { m_cStructure->m_sampleRate = rate; }
+
+  /// @brief To get with @ref SetSampleRate changed values.
+  unsigned int GetSampleRate() const { return m_cStructure->m_sampleRate; }
+
+  /// @brief The encoded streams sample rate if a bitstream, otherwise undefined
+  void SetEncodedRate(unsigned int rate) { m_cStructure->m_encodedRate = rate; }
+
+  /// @brief To get with @ref SetEncodedRate changed values.
+  unsigned int GetEncodedRate() const { return m_cStructure->m_encodedRate; }
+
+  /// @brief The stream's channel layout
+  void SetChannelLayout(const std::vector<enum AudioEngineChannel>& layout)
+  {
+    // Reset first all to empty values to AUDIOENGINE_CH_NULL, in case given list is empty
+    m_cStructure->m_channelCount = 0;
+    for (size_t ch = 0; ch < AUDIOENGINE_CH_MAX; ++ch)
+      m_cStructure->m_channels[ch] = AUDIOENGINE_CH_NULL;
+
+    for (size_t ch = 0; ch < layout.size() && ch < AUDIOENGINE_CH_MAX; ++ch)
+    {
+      m_cStructure->m_channels[ch] = layout[ch];
+      m_cStructure->m_channelCount++;
+    }
+  }
+
+  /// @brief To get with @ref SetChannelLayout changed values.
+  std::vector<enum AudioEngineChannel> GetChannelLayout() const
+  {
+    std::vector<enum AudioEngineChannel> channels;
+    for (size_t ch = 0; ch < AUDIOENGINE_CH_MAX; ++ch)
+    {
+      if (m_cStructure->m_channels[ch] == AUDIOENGINE_CH_NULL)
+        break;
+
+      channels.push_back(m_cStructure->m_channels[ch]);
+    }
+    return channels;
+  }
+
+  /// @brief The number of frames per period
+  void SetFramesAmount(unsigned int frames) { m_cStructure->m_frames = frames; }
+
+  /// @brief To get with @ref SetFramesAmount changed values.
+  unsigned int GetFramesAmount() const { return m_cStructure->m_frames; }
+
+  /// @brief The size of one frame in bytes
+  void SetFrameSize(unsigned int frameSize) { m_cStructure->m_frameSize = frameSize; }
+
+  /// @brief To get with @ref SetFrameSize changed values.
+  unsigned int GetFrameSize() const { return m_cStructure->m_frameSize; }
+
+  /// @brief Function to compare the format structure with another
+  bool CompareFormat(const AudioEngineFormat* fmt)
+  {
+    if (!fmt)
+    {
+      return false;
+    }
+
+    if (m_cStructure->m_dataFormat != fmt->m_cStructure->m_dataFormat ||
+        m_cStructure->m_sampleRate != fmt->m_cStructure->m_sampleRate ||
+        m_cStructure->m_encodedRate != fmt->m_cStructure->m_encodedRate ||
+        m_cStructure->m_frames != fmt->m_cStructure->m_frames ||
+        m_cStructure->m_frameSize != fmt->m_cStructure->m_frameSize ||
+        m_cStructure->m_channelCount != fmt->m_cStructure->m_channelCount)
+    {
+      return false;
+    }
+
+    for (unsigned int ch = 0; ch < AUDIOENGINE_CH_MAX; ++ch)
+    {
+      if (fmt->m_cStructure->m_channels[ch] != m_cStructure->m_channels[ch])
+      {
+        return false;
+      }
+    }
+
+    return true;
+  }
+};
+//@}
+//----------------------------------------------------------------------------
+
+//}}}
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" AudioEngine addon interface
+//{{{
+
+//============================================================================
+///
+/// @defgroup cpp_kodi_audioengine_CAEStream class CAEStream
+/// @ingroup cpp_kodi_audioengine
+/// @brief **Audio Engine Stream Class**\n
+/// Class that can be created by the addon in order to be able to transfer
+/// audiostream data processed on the addon to Kodi and output it audibly.
+///
+/// This can create individually several times and performed in different
+/// processes simultaneously.
+///
+/// It has the header @ref AudioEngine.h "#include <kodi/AudioEngine.h>" be
+/// included to enjoy it.
+///
+//----------------------------------------------------------------------------
+class ATTRIBUTE_HIDDEN CAEStream
+{
+public:
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Contructs new class to an Kodi IAEStream in the format specified.
+  ///
+  /// @param[in] format       The data format the incoming audio will be in
+  ///                         (e.g. \ref AUDIOENGINE_FMT_S16LE)
+  /// @param[in] options      [opt] A bit field of stream options (see: enum \ref AudioEngineStreamOptions)
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// @copydetails cpp_kodi_audioengine_Defs_AudioEngineFormat_Help
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Bit options to pass (on Kodi by <c>IAE::MakeStream</c>)**
+  ///
+  /// | enum AEStreamOptions        | Value: | Description:
+  /// |----------------------------:|:------:|:-----------------------------------
+  /// | AUDIO_STREAM_FORCE_RESAMPLE | 1 << 0 | Force resample even if rates match
+  /// | AUDIO_STREAM_PAUSED         | 1 << 1 | Create the stream paused
+  /// | AUDIO_STREAM_AUTOSTART      | 1 << 2 | Autostart the stream when enough data is buffered
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  ///
+  /// #include <kodi/AudioEngine.h>
+  ///
+  /// ...
+  ///
+  /// kodi::audioengine::AudioEngineFormat format;
+  ///
+  /// format.SetDataFormat(AUDIOENGINE_FMT_FLOATP); /* The stream's data format (eg, AUDIOENGINE_FMT_S16LE) */
+  /// format.SetChannelLayout(std::vector<AudioEngineChannel>(AUDIOENGINE_CH_FL, AUDIOENGINE_CH_FR)); /* The stream's channel layout */
+  /// format.SetSampleRate(48000); /* The stream's sample rate (eg, 48000) */
+  /// format.SetFrameSize(sizeof(float)*2); /* The size of one frame in bytes */
+  /// format.SetFramesAmount(882); /* The number of samples in one frame */
+  ///
+  /// kodi::audioengine::CAEStream* stream = new kodi::audioengine::CAEStream(format, AUDIO_STREAM_AUTOSTART);
+  ///
+  /// ~~~~~~~~~~~~~
+  ///
+  CAEStream(AudioEngineFormat& format, unsigned int options = 0)
+    : m_kodiBase(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase),
+      m_cb(::kodi::addon::CAddonBase::m_interface->toKodi->kodi_audioengine)
+  {
+    m_StreamHandle = m_cb->make_stream(m_kodiBase, format, options);
+    if (m_StreamHandle == nullptr)
+    {
+      kodi::Log(ADDON_LOG_FATAL, "CAEStream: make_stream failed!");
+    }
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Class destructor.
+  ///
+  ~CAEStream()
+  {
+    if (m_StreamHandle)
+    {
+      m_cb->free_stream(m_kodiBase, m_StreamHandle);
+      m_StreamHandle = nullptr;
+    }
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns the amount of space available in the stream.
+  ///
+  /// @return The number of bytes AddData will consume
+  ///
+  unsigned int GetSpace() { return m_cb->aestream_get_space(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Add planar or interleaved PCM data to the stream.
+  ///
+  /// @param[in] data array of pointers to the planes
+  /// @param[in] offset to frame in frames
+  /// @param[in] frames number of frames
+  /// @param[in] pts [opt] presentation timestamp, default is 0
+  /// @param[in] hasDownmix [opt] set true if downmix is present, default is false
+  /// @param[in] centerMixLevel [opt] level to mix left and right to center default is 1.0
+  /// @return The number of frames consumed
+  ///
+  unsigned int AddData(uint8_t* const* data,
+                       unsigned int offset,
+                       unsigned int frames,
+                       double pts = 0,
+                       bool hasDownmix = false,
+                       double centerMixLevel = 1.0)
+  {
+    return m_cb->aestream_add_data(m_kodiBase, m_StreamHandle, data, offset, frames, pts,
+                                   hasDownmix, centerMixLevel);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns the time in seconds that it will take for the next added
+  /// packet to be heard from the speakers.
+  ///
+  /// @return seconds
+  ///
+  double GetDelay() { return m_cb->aestream_get_delay(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns if the stream is buffering.
+  ///
+  /// @return True if the stream is buffering
+  ///
+  bool IsBuffering() { return m_cb->aestream_is_buffering(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns the time in seconds of the stream's cached audio samples.
+  /// Engine buffers excluded.
+  ///
+  /// @return seconds
+  ///
+  double GetCacheTime() { return m_cb->aestream_get_cache_time(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns the total time in seconds of the cache.
+  ///
+  /// @return seconds
+  ///
+  double GetCacheTotal() { return m_cb->aestream_get_cache_total(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Pauses the stream playback.
+  ///
+  void Pause() { return m_cb->aestream_pause(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Resumes the stream after pausing
+  ///
+  void Resume() { return m_cb->aestream_resume(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Start draining the stream.
+  ///
+  /// @param[in] wait [opt] Wait until drain is finished if set to true,
+  ///                 otherwise it returns direct
+  ///
+  /// @note Once called AddData will not consume more data.
+  ///
+  void Drain(bool wait = true) { return m_cb->aestream_drain(m_kodiBase, m_StreamHandle, wait); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns true if the is stream draining.
+  ///
+  bool IsDraining() { return m_cb->aestream_is_draining(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns true if the is stream has finished draining.
+  ///
+  bool IsDrained() { return m_cb->aestream_is_drained(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Flush all buffers dropping the audio data.
+  ///
+  void Flush() { return m_cb->aestream_flush(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Return the stream's current volume level.
+  ///
+  /// @return The volume level between 0.0 and 1.0
+  ///
+  float GetVolume() { return m_cb->aestream_get_volume(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Set the stream's volume level.
+  ///
+  /// @param[in] volume               The new volume level between 0.0 and 1.0
+  ///
+  void SetVolume(float volume)
+  {
+    return m_cb->aestream_set_volume(m_kodiBase, m_StreamHandle, volume);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Gets the stream's volume amplification in linear units.
+  ///
+  /// @return The volume amplification factor between 1.0 and 1000.0
+  ///
+  float GetAmplification() { return m_cb->aestream_get_amplification(m_kodiBase, m_StreamHandle); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Sets the stream's volume amplification in linear units.
+  ///
+  /// @param[in] amplify The volume amplification factor between 1.0 and 1000.0
+  ///
+  void SetAmplification(float amplify)
+  {
+    return m_cb->aestream_set_amplification(m_kodiBase, m_StreamHandle, amplify);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns the size of one audio frame in bytes (channelCount * resolution).
+  ///
+  /// @return The size in bytes of one frame
+  ///
+  unsigned int GetFrameSize() const
+  {
+    return m_cb->aestream_get_frame_size(m_kodiBase, m_StreamHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns the number of channels the stream is configured to accept.
+  ///
+  /// @return The channel count
+  ///
+  unsigned int GetChannelCount() const
+  {
+    return m_cb->aestream_get_channel_count(m_kodiBase, m_StreamHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Returns the stream's sample rate, if the stream is using a dynamic
+  /// sample rate, this value will NOT reflect any changes made by calls to
+  /// SetResampleRatio().
+  ///
+  /// @return The stream's sample rate (eg, 48000)
+  ///
+  unsigned int GetSampleRate() const
+  {
+    return m_cb->aestream_get_sample_rate(m_kodiBase, m_StreamHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Return the data format the stream has been configured with.
+  ///
+  /// @return The stream's data format (eg, AUDIOENGINE_FMT_S16LE)
+  ///
+  AudioEngineDataFormat GetDataFormat() const
+  {
+    return m_cb->aestream_get_data_format(m_kodiBase, m_StreamHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Return the resample ratio.
+  ///
+  /// @note This will return an undefined value if the stream is not resampling.
+  ///
+  /// @return the current resample ratio or undefined if the stream is not resampling
+  ///
+  double GetResampleRatio()
+  {
+    return m_cb->aestream_get_resample_ratio(m_kodiBase, m_StreamHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_audioengine_CAEStream
+  /// @brief Sets the resample ratio.
+  ///
+  /// @note This function may return false if the stream is not resampling, if
+  /// you wish to use this be sure to set the AESTREAM_FORCE_RESAMPLE option.
+  ///
+  /// @param[in] ratio the new sample rate ratio, calculated by
+  ///                  ((double)desiredRate / (double)GetSampleRate())
+  ///
+  void SetResampleRatio(double ratio)
+  {
+    m_cb->aestream_set_resample_ratio(m_kodiBase, m_StreamHandle, ratio);
+  }
+  //--------------------------------------------------------------------------
+
+private:
+  void* m_kodiBase;
+  AddonToKodiFuncTable_kodi_audioengine* m_cb;
+  AEStreamHandle* m_StreamHandle;
+};
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_audioengine
+/// @brief Get the current sink data format.
+///
+/// @param[in] format Current sink data format. For more details see AudioEngineFormat.
+/// @return Returns true on success, else false.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+///
+/// #include <kodi/AudioEngine.h>
+///
+/// ...
+///
+/// kodi::audioengine::AudioEngineFormat format;
+/// if (!kodi::audioengine::GetCurrentSinkFormat(format))
+///   return false;
+///
+/// std::vector<AudioEngineChannel> layout = format.GetChannelLayout();
+///
+/// ...
+/// return true;
+///
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN GetCurrentSinkFormat(AudioEngineFormat& format)
+{
+  using namespace kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi_audioengine->get_current_sink_format(
+      CAddonBase::m_interface->toKodi->kodiBase, format);
+}
+//----------------------------------------------------------------------------
+
+//}}}
+
+} // namespace audioengine
+} // namespace kodi
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/CMakeLists.txt
index 2b98154..de7cb3e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/CMakeLists.txt
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/CMakeLists.txt
@@ -1,22 +1,11 @@
 set(HEADERS AddonBase.h
+            AudioEngine.h
             Filesystem.h
             General.h
             Network.h
             StreamCodec.h
             StreamCrypto.h
-            kodi_game_dll.h
-            kodi_game_types.h
-            kodi_vfs_types.h
-            libKODI_game.h
-            libKODI_guilib.h
-            libXBMC_addon.h
-            libXBMC_pvr.h
-            versions.h
-            xbmc_addon_dll.h
-            xbmc_addon_types.h
-            xbmc_epg_types.h
-            xbmc_pvr_dll.h
-            xbmc_pvr_types.h)
+            versions.h)
 
 if(CORE_SYSTEM_NAME STREQUAL android)
   list(APPEND SOURCES platform/android/System.h)
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
index 3df6cec..2054ce6 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
@@ -9,1627 +9,2313 @@
 #pragma once
 
 #include "AddonBase.h"
+#include "c-api/filesystem.h"
 
+#ifdef __cplusplus
+
+#include <cstring>
 #include <map>
 #include <vector>
 
-#if !defined(_WIN32)
-  #include <sys/stat.h>
-  #if !defined(__stat64)
-    #if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD)
-      #define __stat64 stat
-    #else
-      #define __stat64 stat64
-    #endif
-  #endif
-#endif
-#ifdef _WIN32                   // windows
-#ifndef _SSIZE_T_DEFINED
-  typedef intptr_t      ssize_t;
-  #define _SSIZE_T_DEFINED
-#endif // !_SSIZE_T_DEFINED
-#endif
-
-#ifndef S_ISDIR
-  #define S_ISDIR(mode)  ((((mode)) & 0170000) == (0040000))
-#endif
-
-#ifndef S_ISLNK
-  #define S_ISLNK(mode)  ((((mode)) & 0170000) == (0120000))
-#endif
-
-/*
- * For interface between add-on and kodi.
- *
- * This structure defines the addresses of functions stored inside Kodi which
- * are then available for the add-on to call
- *
- * All function pointers there are used by the C++ interface functions below.
- * You find the set of them on xbmc/addons/interfaces/General.cpp
- *
- * Note: For add-on development itself this is not needed
- */
-extern "C"
+namespace kodi
+{
+namespace vfs
 {
 
-  struct VFSProperty
-  {
-    char* name;
-    char* val;
-  };
-
-  struct VFSDirEntry
-  {
-    char* label;             //!< item label
-    char* title;             //!< item title
-    char* path;              //!< item path
-    unsigned int num_props;  //!< Number of properties attached to item
-    VFSProperty* properties; //!< Properties
-    time_t date_time;        //!< file creation date & time
-    bool folder;             //!< Item is a folder
-    uint64_t size;           //!< Size of file represented by item
-  };
-
-  typedef struct AddonToKodiFuncTable_kodi_filesystem
-  {
-    bool (*can_open_directory)(void* kodiBase, const char* url);
-    bool (*create_directory)(void* kodiBase, const char* path);
-    bool (*remove_directory)(void* kodiBase, const char* path);
-    bool (*directory_exists)(void* kodiBase, const char* path);
-    bool (*get_directory)(void* kodiBase, const char* path, const char* mask, VFSDirEntry** items, unsigned int* num_items);
-    void (*free_directory)(void* kodiBase, VFSDirEntry* items, unsigned int num_items);
-
-    bool (*file_exists)(void* kodiBase, const char *filename, bool useCache);
-    int (*stat_file)(void* kodiBase, const char *filename, struct __stat64* buffer);
-    bool (*delete_file)(void* kodiBase, const char *filename);
-    bool (*rename_file)(void* kodiBase, const char *filename, const char *newFileName);
-    bool (*copy_file)(void* kodiBase, const char *filename, const char *dest);
-
-    char* (*get_file_md5)(void* kodiBase, const char* filename);
-    char* (*get_cache_thumb_name)(void* kodiBase, const char* filename);
-    char* (*make_legal_filename)(void* kodiBase, const char* filename);
-    char* (*make_legal_path)(void* kodiBase, const char* path);
-    char* (*translate_special_protocol)(void* kodiBase, const char *strSource);
-
-    void* (*open_file)(void* kodiBase, const char* filename, unsigned int flags);
-    void* (*open_file_for_write)(void* kodiBase, const char* filename, bool overwrite);
-    ssize_t (*read_file)(void* kodiBase, void* file, void* ptr, size_t size);
-    bool (*read_file_string)(void* kodiBase, void* file, char *szLine, int iLineLength);
-    ssize_t (*write_file)(void* kodiBase, void* file, const void* ptr, size_t size);
-    void (*flush_file)(void* kodiBase, void* file);
-    int64_t (*seek_file)(void* kodiBase, void* file, int64_t position, int whence);
-    int (*truncate_file)(void* kodiBase, void* file, int64_t size);
-    int64_t (*get_file_position)(void* kodiBase, void* file);
-    int64_t (*get_file_length)(void* kodiBase, void* file);
-    double (*get_file_download_speed)(void* kodiBase, void* file);
-    void (*close_file)(void* kodiBase, void* file);
-    int (*get_file_chunk_size)(void* kodiBase, void* file);
-    char** (*get_property_values)(void* kodiBase, void* file, int type, const char *name, int *numValues);
-
-    void* (*curl_create)(void* kodiBase, const char* url);
-    bool (*curl_add_option)(void* kodiBase, void* file, int type, const char* name, const char* value);
-    bool (*curl_open)(void* kodiBase, void* file, unsigned int flags);
-  } AddonToKodiFuncTable_kodi_filesystem;
-
-} /* extern "C" */
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// Main page text for filesystem group by Doxygen.
+//{{{
 
 //==============================================================================
 ///
-/// \defgroup cpp_kodi_vfs  Interface - kodi::vfs
-/// \ingroup cpp
-/// @brief **Virtual filesystem functions**
+/// @defgroup cpp_kodi_vfs  Interface - kodi::vfs
+/// @ingroup cpp
+/// @brief **Virtual filesystem functions**\n
+/// Offers classes and functions for access to the Virtual File Server (VFS)
+/// which you can use to manipulate files and folders.
 ///
+/// This system allow the use of ["Special Protocol"](https://kodi.wiki/view/Special_protocol)
+/// where is Kodi's solution to platform dependent directories. Common directory
+/// names are assigned a <b>`special://[name]`</b> path which is passed around
+/// inside Kodi and then translated to the platform specific path before the
+/// operating system sees it. This helps keep most of the platform mess
+/// centralized in the code.\n
+/// To become a correct path back can be @ref TranslateSpecialProtocol() used.
 ///
-/// It has the header \ref Filesystem.h "#include <kodi/Filesystem.h>" be
+/// It has the header @ref Filesystem.h "#include <kodi/Filesystem.h>" be
 /// included to enjoy it.
 ///
 //------------------------------------------------------------------------------
 
 //==============================================================================
-/// \defgroup cpp_kodi_vfs_Defs Definitions, structures and enumerators
-/// \ingroup cpp_kodi_vfs
-/// @brief **Virtual file Server definition values**
+/// @defgroup cpp_kodi_vfs_Defs Definitions, structures and enumerators
+/// @ingroup cpp_kodi_vfs
+/// @brief **Virtual file Server definition values**\n
+/// All to VFS system functions associated data structures.
+///
 //------------------------------------------------------------------------------
 
 //==============================================================================
+/// @defgroup cpp_kodi_vfs_Directory 1. Directory functions
+/// @ingroup cpp_kodi_vfs
+/// @brief **Globally available directories related functions**\n
+/// Used to perform typical operations with it.
 ///
-/// @ingroup cpp_kodi_vfs_Defs
-/// Flags to define way how file becomes opened with kodi::vfs::CFile::OpenFile()
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_vfs_File 2. File functions
+/// @ingroup cpp_kodi_vfs
+/// @brief **Globally available file related functions**\n
+/// Used to perform typical operations with it.
 ///
-/// The values can be used together, e.g. <b>`file.Open("myfile", READ_TRUNCATED | READ_CHUNKED);`</b>
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_vfs_General 3. General functions
+/// @ingroup cpp_kodi_vfs
+/// @brief **Other globally available functions**\n
+/// Used to perform typical operations with it.
 ///
-typedef enum OpenFileFlags
+//------------------------------------------------------------------------------
+
+//}}}
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" related filesystem definitions
+//{{{
+
+//==============================================================================
+/// @defgroup cpp_kodi_vfs_Defs_FileStatus class FileStatus
+/// @ingroup cpp_kodi_vfs_Defs
+/// @brief **File information status**\n
+/// Used on kodi::vfs::StatFile() to get detailed information about a file.
+///
+//@{
+class ATTRIBUTE_HIDDEN FileStatus : public kodi::addon::CStructHdl<FileStatus, STAT_STRUCTURE>
 {
-  /// indicate that caller can handle truncated reads, where function returns
-  /// before entire buffer has been filled
-  READ_TRUNCATED = 0x01,
+public:
+  /*! \cond PRIVATE */
+  FileStatus() { memset(m_cStructure, 0, sizeof(STAT_STRUCTURE)); }
+  FileStatus(const FileStatus& channel) : CStructHdl(channel) {}
+  FileStatus(const STAT_STRUCTURE* channel) : CStructHdl(channel) {}
+  FileStatus(STAT_STRUCTURE* channel) : CStructHdl(channel) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_vfs_Defs_FileStatus_Help *Value Help*
+  /// @ingroup cpp_kodi_vfs_Defs_FileStatus
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_vfs_Defs_FileStatus :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **ID of device containing file** | `uint32_t` | @ref FileStatus::SetDeviceId "SetDeviceId" | @ref FileStatus::GetDeviceId "GetDeviceId"
+  /// | **Total size, in bytes** | `uint64_t` | @ref FileStatus::SetSize "SetSize" | @ref FileStatus::GetSize "GetSize"
+  /// | **Time of last access** | `time_t` | @ref FileStatus::SetAccessTime "SetAccessTime" | @ref FileStatus::GetAccessTime "GetAccessTime"
+  /// | **Time of last modification** | `time_t` | @ref FileStatus::SetModificationTime "SetModificationTime" | @ref FileStatus::GetModificationTime "GetModificationTime"
+  /// | **Time of last status change** | `time_t` | @ref FileStatus::SetStatusTime "SetStatusTime" | @ref FileStatus::GetStatusTime "GetStatusTime"
+  /// | **Stat url is a directory** | `bool` | @ref FileStatus::SetIsDirectory "SetIsDirectory" | @ref FileStatus::GetIsDirectory "GetIsDirectory"
+  /// | **Stat url as a symbolic link** | `bool` | @ref FileStatus::SetIsSymLink "SetIsSymLink" | @ref FileStatus::GetIsSymLink "GetIsSymLink"
+  ///
+
+  /// @addtogroup cpp_kodi_vfs_Defs_FileStatus
+  /// @copydetails cpp_kodi_vfs_Defs_FileStatus_Help
+  //@{
 
-  /// indicate that that caller support read in the minimum defined chunk size,
-  /// this disables internal cache then
-  READ_CHUNKED = 0x02,
+  /// @brief Set ID of device containing file.
+  void SetDeviceId(uint32_t deviceId) { m_cStructure->deviceId = deviceId; }
 
-  /// use cache to access this file
-  READ_CACHED = 0x04,
+  /// @brief Get ID of device containing file.
+  uint32_t GetDeviceId() const { return m_cStructure->deviceId; }
 
-  /// open without caching. regardless to file type
-  READ_NO_CACHE = 0x08,
+  /// @brief Set total size, in bytes.
+  void SetSize(uint64_t size) { m_cStructure->size = size; }
+
+  /// @brief Get total size, in bytes.
+  uint64_t GetSize() const { return m_cStructure->size; }
+
+  /// @brief Set time of last access.
+  void SetAccessTime(time_t accessTime) { m_cStructure->accessTime = accessTime; }
+
+  /// @brief Get time of last access.
+  time_t GetAccessTime() const { return m_cStructure->accessTime; }
+
+  /// @brief Set time of last modification.
+  void SetModificationTime(time_t modificationTime)
+  {
+    m_cStructure->modificationTime = modificationTime;
+  }
 
-  /// calcuate bitrate for file while reading
-  READ_BITRATE = 0x10,
+  /// @brief Get time of last modification.
+  time_t GetModificationTime() const { return m_cStructure->modificationTime; }
 
-  /// indicate to the caller we will seek between multiple streams in the file
-  /// frequently
-  READ_MULTI_STREAM = 0x20,
+  /// @brief Set time of last status change.
+  void SetStatusTime(time_t statusTime) { m_cStructure->statusTime = statusTime; }
 
-  /// indicate to the caller file is audio and/or video (and e.g. may grow)
-  READ_AUDIO_VIDEO = 0x40,
+  /// @brief Get time of last status change.
+  time_t GetStatusTime() const { return m_cStructure->statusTime; }
 
-  /// indicate that caller will do write operations before reading
-  READ_AFTER_WRITE = 0x80,
+  /// @brief Set the stat url is a directory.
+  void SetIsDirectory(bool isDirectory) { m_cStructure->isDirectory = isDirectory; }
 
-  /// indicate that caller want to reopen a file if its already open
-  READ_REOPEN = 0x100
-} OpenFileFlags;
+  /// @brief The stat url is a directory if returns true.
+  bool GetIsDirectory() const { return m_cStructure->isDirectory; }
+
+  /// @brief Set stat url as a symbolic link.
+  void SetIsSymLink(bool isSymLink) { m_cStructure->isSymLink = isSymLink; }
+
+  /// @brief Get stat url is a symbolic link.
+  bool GetIsSymLink() const { return m_cStructure->isSymLink; }
+
+  //@}
+};
+//@}
 //------------------------------------------------------------------------------
 
 //==============================================================================
-/// \ingroup cpp_kodi_vfs_Defs
-/// @brief CURL message types
-///
-/// Used on kodi::vfs::CFile::CURLAddOption()
+/// @defgroup cpp_kodi_vfs_Defs_CacheStatus class CacheStatus
+/// @ingroup cpp_kodi_vfs_Defs
+/// @brief **Cache information status**\n
+/// Used on kodi::vfs::CFile::IoControlGetCacheStatus() to get running cache
+/// status of proccessed stream.
 ///
-typedef enum CURLOptiontype
+//@{
+class ATTRIBUTE_HIDDEN CacheStatus
+  : public kodi::addon::CStructHdl<CacheStatus, VFS_CACHE_STATUS_DATA>
 {
-  /// Set a general option
-  ADDON_CURL_OPTION_OPTION,
-
-  /// Set a protocol option
-  ///
-  /// The following names for *ADDON_CURL_OPTION_PROTOCOL* are possible:
-  ///
-  /// | Option name                | Description
-  /// |---------------------------:|:----------------------------------------------------------
-  /// | accept-charset             | Set the "accept-charset" header
-  /// | acceptencoding or encoding | Set the "accept-encoding" header
-  /// | active-remote              | Set the "active-remote" header
-  /// | auth                       | Set the authentication method. Possible values: any, anysafe, digest, ntlm
-  /// | connection-timeout         | Set the connection timeout in seconds
-  /// | cookie                     | Set the "cookie" header
-  /// | customrequest              | Set a custom HTTP request like DELETE
-  /// | noshout                    | Set to true if kodi detects a stream as shoutcast by mistake.
-  /// | postdata                   | Set the post body (value needs to be base64 encoded). (Implicitly sets the request to POST)
-  /// | referer                    | Set the "referer" header
-  /// | user-agent                 | Set the "user-agent" header
-  /// | seekable                   | Set the stream seekable. 1: enable, 0: disable
-  /// | sslcipherlist              | Set list of accepted SSL ciphers.
-  ///
-  ADDON_CURL_OPTION_PROTOCOL,
-
-  /// Set User and password
-  ADDON_CURL_OPTION_CREDENTIALS,
-
-  /// Add a Header
-  ADDON_CURL_OPTION_HEADER
-} CURLOptiontype;
+public:
+  /*! \cond PRIVATE */
+  CacheStatus() { memset(m_cStructure, 0, sizeof(VFS_CACHE_STATUS_DATA)); }
+  CacheStatus(const CacheStatus& channel) : CStructHdl(channel) {}
+  CacheStatus(const VFS_CACHE_STATUS_DATA* channel) : CStructHdl(channel) {}
+  CacheStatus(VFS_CACHE_STATUS_DATA* channel) : CStructHdl(channel) {}
+  /*! \endcond */
+
+  /// @defgroup cpp_kodi_vfs_Defs_CacheStatus_Help *Value Help*
+  /// @ingroup cpp_kodi_vfs_Defs_CacheStatus
+  /// ----------------------------------------------------------------------------
+  ///
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_vfs_Defs_CacheStatus :</b>
+  /// | Name | Type | Set call | Get call
+  /// |------|------|----------|----------
+  /// | **Number of bytes cached** | `uint64_t` | @ref CacheStatus::SetForward "SetForward" | @ref CacheStatus::GetForward "GetForward"
+  /// | **Maximum number of bytes per second** | `unsigned int` | @ref CacheStatus::SetMaxRate "SetMaxRate" | @ref CacheStatus::GetMaxRate "GetMaxRate"
+  /// | **Average read rate from source file** | `unsigned int` | @ref CacheStatus::SetCurrentRate "SetCurrentRate" | @ref CacheStatus::GetCurrentRate "GetCurrentRate"
+  /// | **Cache low speed condition detected** | `bool` | @ref CacheStatus::SetLowspeed "SetLowspeed" | @ref CacheStatus::GetLowspeed "GetLowspeed"
+  ///
+
+  /// @addtogroup cpp_kodi_vfs_Defs_CacheStatus
+  /// @copydetails cpp_kodi_vfs_Defs_CacheStatus_Help
+  //@{
+
+  /// @brief Set number of bytes cached forward of current position.
+  void SetForward(uint64_t forward) { m_cStructure->forward = forward; }
+
+  /// @brief Get number of bytes cached forward of current position.
+  uint64_t GetForward() { return m_cStructure->forward; }
+
+  /// @brief Set maximum number of bytes per second cache is allowed to fill.
+  void SetMaxRate(unsigned int maxrate) { m_cStructure->maxrate = maxrate; }
+
+  /// @brief Set maximum number of bytes per second cache is allowed to fill.
+  unsigned int GetMaxRate() { return m_cStructure->maxrate; }
+
+  /// @brief Set average read rate from source file since last position change.
+  void SetCurrentRate(unsigned int currate) { m_cStructure->currate = currate; }
+
+  /// @brief Get average read rate from source file since last position change.
+  unsigned int GetCurrentRate() { return m_cStructure->currate; }
+
+  /// @brief Set cache low speed condition detected.
+  void SetLowspeed(bool lowspeed) { m_cStructure->lowspeed = lowspeed; }
+
+  /// @brief Get cache low speed condition detected.
+  bool GetLowspeed() { return m_cStructure->lowspeed; }
+
+  //@}
+};
+//@}
 //------------------------------------------------------------------------------
 
 //==============================================================================
-/// \ingroup cpp_kodi_vfs_Defs
-/// @brief CURL message types
+/// @defgroup cpp_kodi_vfs_Defs_HttpHeader class HttpHeader
+/// @ingroup cpp_kodi_vfs_Defs
+/// @brief **HTTP header information**\n
+/// The class used to access HTTP header information and get his information.
 ///
-/// Used on kodi::vfs::CFile::GetPropertyValue() and kodi::vfs::CFile::GetPropertyValues()
+/// Used on @ref kodi::vfs::GetHttpHeader().
 ///
-typedef enum FilePropertyTypes
-{
-  /// Get protocol response line
-  ADDON_FILE_PROPERTY_RESPONSE_PROTOCOL,
-  /// Get a response header
-  ADDON_FILE_PROPERTY_RESPONSE_HEADER,
-  /// Get file content type
-  ADDON_FILE_PROPERTY_CONTENT_TYPE,
-  /// Get file content charset
-  ADDON_FILE_PROPERTY_CONTENT_CHARSET,
-  /// Get file mime type
-  ADDON_FILE_PROPERTY_MIME_TYPE,
-  /// Get file effective URL (last one if redirected)
-  ADDON_FILE_PROPERTY_EFFECTIVE_URL
-} FilePropertyTypes;
-//------------------------------------------------------------------------------
-
-//============================================================================
-///
-/// \ingroup cpp_kodi_vfs_Defs
-/// @brief File information status
+/// ----------------------------------------------------------------------------
 ///
-/// Used on kodi::vfs::StatFile(), all of these calls return a this stat
-/// structure, which contains the following fields:
+/// @copydetails cpp_kodi_vfs_Defs_HttpHeader_Help
 ///
-struct STAT_STRUCTURE
+///@{
+class ATTRIBUTE_HIDDEN HttpHeader
 {
-  /// ID of device containing file
-  uint32_t    deviceId;
-  /// Total size, in bytes
-  uint64_t    size;
-#ifdef TARGET_WINDOWS
-  /// Time of last access
-  __time64_t  accessTime;
-  /// Time of last modification
-  __time64_t  modificationTime;
-  /// Time of last status change
-  __time64_t  statusTime;
-#else
-  /// Time of last access
-  timespec    accessTime;
-  /// Time of last modification
-  timespec    modificationTime;
-  /// Time of last status change
-  timespec    statusTime;
-#endif
-  /// The stat url is a directory
-  bool        isDirectory;
-  /// The stat url is a symbolic link
-  bool        isSymLink;
-};
-//------------------------------------------------------------------------------
+public:
+  //==========================================================================
+  /// @brief Http header parser class constructor.
+  ///
+  HttpHeader()
+  {
+    using namespace ::kodi::addon;
 
-namespace kodi
-{
-namespace vfs
-{
+    CAddonBase::m_interface->toKodi->kodi_filesystem->http_header_create(
+        CAddonBase::m_interface->toKodi->kodiBase, &m_handle);
+  }
+  //--------------------------------------------------------------------------
 
-  //============================================================================
+  //==========================================================================
+  /// @brief Class destructor.
   ///
-  /// \defgroup cpp_kodi_vfs_CDirEntry class CDirEntry
-  /// \ingroup cpp_kodi_vfs
+  ~HttpHeader()
+  {
+    using namespace ::kodi::addon;
+
+    CAddonBase::m_interface->toKodi->kodi_filesystem->http_header_free(
+        CAddonBase::m_interface->toKodi->kodiBase, &m_handle);
+  }
+  //--------------------------------------------------------------------------
+
+  /// @defgroup cpp_kodi_vfs_Defs_HttpHeader_Help *Value Help*
+  /// @ingroup cpp_kodi_vfs_Defs_HttpHeader
   ///
-  /// @brief **Virtual file server directory entry**
+  /// <b>The following table contains values that can be get with @ref cpp_kodi_vfs_Defs_HttpHeader :</b>
+  /// | Description | Type | Get call
+  /// |-------------|------|------------
+  /// | **Get the value associated with this parameter of these HTTP headers** | `std::string` | @ref HttpHeader::GetValue "GetValue"
+  /// | **Get the values as list associated with this parameter of these HTTP headers** | `std::vector<std::string>` | @ref HttpHeader::GetValues "GetValues"
+  /// | **Get the full header string associated with these HTTP headers** | `std::string` | @ref HttpHeader::GetHeader "GetHeader"
+  /// | **Get the mime type associated with these HTTP headers** | `std::string` | @ref HttpHeader::GetMimeType "GetMimeType"
+  /// | **Get the charset associated with these HTTP headers** | `std::string` | @ref HttpHeader::GetCharset "GetCharset"
+  /// | **The protocol line associated with these HTTP headers** | `std::string` | @ref HttpHeader::GetProtoLine "GetProtoLine"
   ///
-  /// This class is used as an entry for files and folders in
-  /// kodi::vfs::GetDirectory().
+
+  /// @addtogroup cpp_kodi_vfs_Defs_HttpHeader
+  ///@{
+
+  //==========================================================================
+  /// @brief Get the value associated with this parameter of these HTTP
+  /// headers.
   ///
+  /// @param[in] param The name of the parameter a value is required for
+  /// @return The value found
   ///
-  /// ------------------------------------------------------------------------
+  std::string GetValue(const std::string& param) const
+  {
+    using namespace ::kodi::addon;
+
+    if (!m_handle.handle)
+      return "";
+
+    std::string protoLine;
+    char* string = m_handle.get_value(CAddonBase::m_interface->toKodi->kodiBase, m_handle.handle,
+                                      param.c_str());
+    if (string != nullptr)
+    {
+      protoLine = string;
+      CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   string);
+    }
+    return protoLine;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Get the values as list associated with this parameter of these
+  /// HTTP headers.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
+  /// @param[in] param The name of the parameter values are required for
+  /// @return The values found
   ///
-  /// ...
+  std::vector<std::string> GetValues(const std::string& param) const
+  {
+    using namespace kodi::addon;
+
+    if (!m_handle.handle)
+      return std::vector<std::string>();
+
+    int numValues = 0;
+    char** res(m_handle.get_values(CAddonBase::m_interface->toKodi->kodiBase, m_handle.handle,
+                                   param.c_str(), &numValues));
+    if (res)
+    {
+      std::vector<std::string> vecReturn;
+      for (int i = 0; i < numValues; ++i)
+      {
+        vecReturn.emplace_back(res[i]);
+      }
+      CAddonBase::m_interface->toKodi->free_string_array(CAddonBase::m_interface->toKodi->kodiBase,
+                                                         res, numValues);
+      return vecReturn;
+    }
+    return std::vector<std::string>();
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Get the full header string associated with these HTTP headers.
   ///
-  /// std::vector<kodi::vfs::CDirEntry> items;
-  /// kodi::vfs::GetDirectory("special://temp", "", items);
+  /// @return The header as a string
   ///
-  /// fprintf(stderr, "Directory have %lu entries\n", items.size());
-  /// for (unsigned long i = 0; i < items.size(); i++)
-  /// {
-  ///   char buff[20];
-  ///   time_t now = items[i].DateTime();
-  ///   strftime(buff, 20, "%Y-%m-%d %H:%M:%S", gmtime(&now));
-  ///   fprintf(stderr, " - %04lu -- Folder: %s -- Name: %s -- Path: %s -- Time: %s\n",
-  ///             i+1,
-  ///             items[i].IsFolder() ? "yes" : "no ",
-  ///             items[i].Label().c_str(),
-  ///             items[i].Path().c_str(),
-  ///             buff);
-  /// }
-  /// ~~~~~~~~~~~~~
+  std::string GetHeader() const
+  {
+    using namespace ::kodi::addon;
+
+    if (!m_handle.handle)
+      return "";
+
+    std::string header;
+    char* string = m_handle.get_header(CAddonBase::m_interface->toKodi->kodiBase, m_handle.handle);
+    if (string != nullptr)
+    {
+      header = string;
+      CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   string);
+    }
+    return header;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Get the mime type associated with these HTTP headers.
   ///
-  /// It has the header \ref Filesystem.h "#include <kodi/Filesystem.h>" be included
-  /// to enjoy it.
+  /// @return The mime type
   ///
-  //@{
-  class CDirEntry
+  std::string GetMimeType() const
+  {
+    using namespace ::kodi::addon;
+
+    if (!m_handle.handle)
+      return "";
+
+    std::string protoLine;
+    char* string =
+        m_handle.get_mime_type(CAddonBase::m_interface->toKodi->kodiBase, m_handle.handle);
+    if (string != nullptr)
+    {
+      protoLine = string;
+      CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   string);
+    }
+    return protoLine;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief Get the charset associated with these HTTP headers.
+  ///
+  /// @return The charset
+  ///
+  std::string GetCharset() const
+  {
+    using namespace ::kodi::addon;
+
+    if (!m_handle.handle)
+      return "";
+
+    std::string protoLine;
+    char* string = m_handle.get_charset(CAddonBase::m_interface->toKodi->kodiBase, m_handle.handle);
+    if (string != nullptr)
+    {
+      protoLine = string;
+      CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   string);
+    }
+    return protoLine;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @brief The protocol line associated with these HTTP headers.
+  ///
+  /// @return The protocol line
+  ///
+  std::string GetProtoLine() const
   {
-  public:
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Constructor for VFS directory entry
-    ///
-    /// @param[in] label   [opt] Name to use for entry
-    /// @param[in] path    [opt] Used path of the entry
-    /// @param[in] folder  [opt] If set entry used as folder
-    /// @param[in] size    [opt] If used as file, his size defined there
-    ///
-    CDirEntry(const std::string& label = "",
-              const std::string& path = "",
-              bool folder = false,
-              int64_t size = -1) :
-      m_label(label),
-      m_path(path),
-      m_folder(folder),
-      m_size(size)
+    using namespace ::kodi::addon;
+
+    if (!m_handle.handle)
+      return "";
+
+    std::string protoLine;
+    char* string =
+        m_handle.get_proto_line(CAddonBase::m_interface->toKodi->kodiBase, m_handle.handle);
+    if (string != nullptr)
     {
+      protoLine = string;
+      CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   string);
     }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    // @note Not for addon development itself needed, thats why below is
-    // disabled for doxygen!
-    //
-    // @ingroup cpp_kodi_vfs_CDirEntry
-    // @brief Constructor to create own copy
-    //
-    // @param[in] dirEntry pointer to own class type
-    //
-    explicit CDirEntry(const VFSDirEntry& dirEntry) :
-      m_label(dirEntry.label ? dirEntry.label : ""),
+    return protoLine;
+  }
+  //--------------------------------------------------------------------------
+
+  ///@}
+
+  KODI_HTTP_HEADER m_handle;
+};
+///@}
+//----------------------------------------------------------------------------
+
+//==============================================================================
+/// @defgroup cpp_kodi_vfs_CDirEntry class CDirEntry
+/// @ingroup cpp_kodi_vfs_Defs
+///
+/// @brief **Virtual file server directory entry**\n
+/// This class is used as an entry for files and folders in
+/// kodi::vfs::GetDirectory().
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+///
+/// ...
+///
+/// std::vector<kodi::vfs::CDirEntry> items;
+/// kodi::vfs::GetDirectory("special://temp", "", items);
+///
+/// fprintf(stderr, "Directory have %lu entries\n", items.size());
+/// for (unsigned long i = 0; i < items.size(); i++)
+/// {
+///   char buff[20];
+///   time_t now = items[i].DateTime();
+///   strftime(buff, 20, "%Y-%m-%d %H:%M:%S", gmtime(&now));
+///   fprintf(stderr, " - %04lu -- Folder: %s -- Name: %s -- Path: %s -- Time: %s\n",
+///             i+1,
+///             items[i].IsFolder() ? "yes" : "no ",
+///             items[i].Label().c_str(),
+///             items[i].Path().c_str(),
+///             buff);
+/// }
+/// ~~~~~~~~~~~~~
+///
+/// It has the header @ref Filesystem.h "#include <kodi/Filesystem.h>" be included
+/// to enjoy it.
+///
+//@{
+class ATTRIBUTE_HIDDEN CDirEntry
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_vfs_CDirEntry
+  /// @brief Constructor for VFS directory entry
+  ///
+  /// @param[in] label    [opt] Name to use for entry
+  /// @param[in] path     [opt] Used path of the entry
+  /// @param[in] folder   [opt] If set entry used as folder
+  /// @param[in] size     [opt] If used as file, his size defined there
+  /// @param[in] dateTime [opt] Date time of the entry
+  ///
+  CDirEntry(const std::string& label = "",
+            const std::string& path = "",
+            bool folder = false,
+            int64_t size = -1,
+            time_t dateTime = 0)
+    : m_label(label), m_path(path), m_folder(folder), m_size(size), m_dateTime(dateTime)
+  {
+  }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  // @note Not for addon development itself needed, thats why below is
+  // disabled for doxygen!
+  //
+  // @ingroup cpp_kodi_vfs_CDirEntry
+  // @brief Constructor to create own copy
+  //
+  // @param[in] dirEntry pointer to own class type
+  //
+  explicit CDirEntry(const VFSDirEntry& dirEntry)
+    : m_label(dirEntry.label ? dirEntry.label : ""),
       m_path(dirEntry.path ? dirEntry.path : ""),
       m_folder(dirEntry.folder),
       m_size(dirEntry.size),
       m_dateTime(dirEntry.date_time)
-    {
-    }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Get the directory entry name
-    ///
-    /// @return Name of the entry
-    ///
-    const std::string& Label(void) const { return m_label; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Get the optional title of entry
-    ///
-    /// @return Title of the entry, if exists
-    ///
-    const std::string& Title(void) const { return m_title; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Get the path of the entry
-    ///
-    /// @return File system path of the entry
-    ///
-    const std::string& Path(void) const { return m_path; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Used to check entry is folder
-    ///
-    /// @return true if entry is a folder
-    ///
-    bool IsFolder(void) const { return m_folder; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief If file, the size of the file
-    ///
-    /// @return Defined file size
-    ///
-    int64_t Size(void) const { return m_size; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Get file time and date for a new entry
-    ///
-    /// @return The with time_t defined date and time of file
-    ///
-    time_t DateTime() { return m_dateTime; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Set the label name
-    ///
-    /// @param[in] label name of entry
-    ///
-    void SetLabel(const std::string& label) { m_label = label; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Set the title name
-    ///
-    /// @param[in] title title name of entry
-    ///
-    void SetTitle(const std::string& title) { m_title = title; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Set the path of the entry
-    ///
-    /// @param[in] path path of entry
-    ///
-    void SetPath(const std::string& path) { m_path = path; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Set the entry defined as folder
-    ///
-    /// @param[in] folder If true becomes entry defined as folder
-    ///
-    void SetFolder(bool folder) { m_folder = folder; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Set a file size for a new entry
-    ///
-    /// @param[in] size Size to set for dir entry
-    ///
-    void SetSize(int64_t size) { m_size = size; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Set file time and date for a new entry
-    ///
-    /// @param[in] dateTime The with time_t defined date and time of file
-    ///
-    void SetDateTime(time_t dateTime) { m_dateTime = dateTime; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Add a by string defined property entry to directory entry
-    ///
-    /// @note A property can be used to add some special information about a file
-    /// or directory entry, this can be used on other places to do the right work
-    /// of them.
-    ///
-    /// @param[in] id     Identification name of property
-    /// @param[in] value  The property value to add by given id
-    ///
-    void AddProperty(const std::string& id, const std::string& value) { m_properties[id] = value; }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Clear all present properties
-    ///
-    void ClearProperties() { m_properties.clear(); }
-    //----------------------------------------------------------------------------
-
-    //============================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CDirEntry
-    /// @brief Get the present properties list on directory entry
-    ///
-    /// @return map with all present properties
-    ///
-    const std::map<std::string, std::string>& GetProperties() const { return m_properties; }
-    //----------------------------------------------------------------------------
-
-  private:
-    std::string m_label;
-    std::string m_title;
-    std::string m_path;
-    std::map<std::string, std::string> m_properties;
-    bool m_folder;
-    int64_t m_size;
-    time_t m_dateTime;
-  };
-  //@}
+  {
+  }
   //----------------------------------------------------------------------------
 
-  //============================================================================
+  /// @defgroup cpp_kodi_vfs_CDirEntry_Help *Value Help*
+  /// @ingroup cpp_kodi_vfs_CDirEntry
+  /// --------------------------------------------------------------------------
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Make a directory
+  /// <b>The following table contains values that can be set with @ref cpp_kodi_vfs_CDirEntry :</b>
+  /// | Name | Type | Set call | Get call | Clear call |
+  /// |------|------|----------|----------|------------|
+  /// | **Directory entry name** | `std::string` | @ref CDirEntry::SetLabel "SetLabel" | @ref CDirEntry::Label "Label" | |
+  /// | **Title of entry** | `std::string` | @ref CDirEntry::SetTitle "SetTitle" | @ref CDirEntry::Title "Title" | |
+  /// | **Path of the entry** | `std::string` | @ref CDirEntry::SetPath "SetPath" | @ref CDirEntry::Path "Path" | |
+  /// | **Entry is folder** | `bool` | @ref CDirEntry::SetFolder "SetFolder" | @ref CDirEntry::IsFolder "IsFolder" | |
+  /// | **The size of the file** | `int64_t` | @ref CDirEntry::SetSize "SetSize" | @ref CDirEntry::Size "Size" | |
+  /// | **File time and date** | `time_t` | @ref CDirEntry::SetDateTime "SetDateTime" | @ref CDirEntry::DateTime "DateTime" | |
+  /// | **Property entries** | `std::string, std::string` | @ref CDirEntry::AddProperty "AddProperty" | @ref CDirEntry::GetProperties "GetProperties" | @ref CDirEntry::ClearProperties "ClearProperties"
   ///
-  /// The kodi::vfs::CreateDirectory() function shall create a
-  /// new directory with name path.
-  ///
-  /// The newly created directory shall be an empty directory.
-  ///
-  /// @param[in] path           Path to the directory.
-  /// @return  Upon successful completion, CreateDirectory() shall return true.
-  ///          Otherwise false shall be returned, no directory shall be created.
+
+  /// @addtogroup cpp_kodi_vfs_CDirEntry
+  /// @copydetails cpp_kodi_vfs_CDirEntry_Help
+  //@{
+
+  //============================================================================
+  /// @brief Get the directory entry name.
   ///
+  /// @return Name of the entry
   ///
-  /// -------------------------------------------------------------------------
+  const std::string& Label(void) const { return m_label; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the optional title of entry.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// std::string directory = "C:\\my_dir";
-  /// bool ret = kodi::vfs::CreateDirectory(directory);
-  /// fprintf(stderr, "Directory '%s' successfull created: %s\n", directory.c_str(), ret ? "yes" : "no");
-  /// ...
-  /// ~~~~~~~~~~~~~
+  /// @return Title of the entry, if exists
   ///
-  inline bool CreateDirectory(const std::string& path)
-  {
-    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->create_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
-  }
+  const std::string& Title(void) const { return m_title; }
   //----------------------------------------------------------------------------
 
   //============================================================================
+  /// @brief Get the path of the entry.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Verifying the Existence of a Directory
+  /// @return File system path of the entry
   ///
-  /// The kodi::vfs::DirectoryExists() method determines whether
-  /// a specified folder exists.
-  ///
-  /// @param[in] path Path to the directory.
-  /// @return True when it exists, false otherwise.
+  const std::string& Path(void) const { return m_path; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Used to check entry is folder.
   ///
+  /// @return true if entry is a folder
   ///
-  /// -------------------------------------------------------------------------
+  bool IsFolder(void) const { return m_folder; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief If file, the size of the file.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// std::string directory = "C:\\my_dir";
-  /// bool ret = kodi::vfs::DirectoryExists(directory);
-  /// fprintf(stderr, "Directory '%s' present: %s\n", directory.c_str(), ret ? "yes" : "no");
-  /// ...
-  /// ~~~~~~~~~~~~~
+  /// @return Defined file size
   ///
-  inline bool DirectoryExists(const std::string& path)
-  {
-    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->directory_exists(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
-  }
+  int64_t Size(void) const { return m_size; }
   //----------------------------------------------------------------------------
 
   //============================================================================
+  /// @brief Get file time and date for a new entry.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Removes a directory.
+  /// @return The with time_t defined date and time of file
   ///
-  /// The kodi::vfs::RemoveDirectory() function shall remove a
-  /// directory whose name is given by path.
-  ///
-  /// @param[in] path Path to the directory.
-  /// @return  Upon successful completion, the function RemoveDirectory() shall
-  ///          return true. Otherwise, false shall be returned, and errno set
-  ///          to indicate the error. If false is returned, the named directory
-  ///          shall not be changed.
+  time_t DateTime() { return m_dateTime; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set the label name.
   ///
+  /// @param[in] label name of entry
   ///
-  /// -------------------------------------------------------------------------
+  void SetLabel(const std::string& label) { m_label = label; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set the title name.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// bool ret = kodi::vfs::RemoveDirectory("C:\\my_dir");
-  /// ...
-  /// ~~~~~~~~~~~~~
+  /// @param[in] title title name of entry
   ///
-  inline bool RemoveDirectory(const std::string& path)
-  {
-    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->remove_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
-  }
+  void SetTitle(const std::string& title) { m_title = title; }
   //----------------------------------------------------------------------------
 
   //============================================================================
+  /// @brief Set the path of the entry.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Lists a directory.
+  /// @param[in] path path of entry
   ///
-  /// Return the list of files and directories which have been found in the
-  /// specified directory and which respect the given constraint.
-  ///
-  /// It can handle the normal OS dependent paths and also the special virtual
-  /// filesystem from Kodi what starts with \b special://.
+  void SetPath(const std::string& path) { m_path = path; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set the entry defined as folder.
   ///
-  /// @param[in]  path  The path in which the files and directories are located.
-  /// @param[in]  mask  Mask to filter out requested files, e.g. "*.avi|*.mpg" to
-  ///                   files with this ending.
-  /// @param[out] items The returned list directory entries.
-  /// @return           True if listing was successful, false otherwise.
+  /// @param[in] folder If true becomes entry defined as folder
   ///
+  void SetFolder(bool folder) { m_folder = folder; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set a file size for a new entry.
   ///
-  /// -------------------------------------------------------------------------
+  /// @param[in] size Size to set for dir entry
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
+  void SetSize(int64_t size) { m_size = size; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Set file time and date for a new entry.
   ///
-  /// std::vector<kodi::vfs::CDirEntry> items;
-  /// kodi::vfs::GetDirectory("special://temp", "", items);
+  /// @param[in] dateTime The with time_t defined date and time of file
   ///
-  /// fprintf(stderr, "Directory have %lu entries\n", items.size());
-  /// for (unsigned long i = 0; i < items.size(); i++)
-  /// {
-  ///   fprintf(stderr, " - %04lu -- Folder: %s -- Name: %s -- Path: %s\n",
-  ///             i+1,
-  ///             items[i].IsFolder() ? "yes" : "no ",
-  ///             items[i].Label().c_str(),
-  ///             items[i].Path().c_str());
-  /// }
-  /// ~~~~~~~~~~~~~
-  inline bool GetDirectory(const std::string& path, const std::string& mask, std::vector<CDirEntry>& items)
-  {
-    VFSDirEntry* dir_list = nullptr;
-    unsigned int num_items = 0;
-    if (::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), mask.c_str(), &dir_list, &num_items))
-    {
-      if (dir_list)
-      {
-        for (unsigned int i = 0; i < num_items; ++i)
-          items.push_back(CDirEntry(dir_list[i]));
-
-        ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->free_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, dir_list, num_items);
-      }
-
-      return true;
-    }
-    return false;
-  }
+  void SetDateTime(time_t dateTime) { m_dateTime = dateTime; }
   //----------------------------------------------------------------------------
 
   //============================================================================
+  /// @brief Add a by string defined property entry to directory entry.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Retrieve MD5sum of a file
+  /// @note A property can be used to add some special information about a file
+  /// or directory entry, this can be used on other places to do the right work
+  /// of them.
   ///
-  /// @param[in] path path to the file to MD5sum
-  /// @return md5 sum of the file
+  /// @param[in] id     Identification name of property
+  /// @param[in] value  The property value to add by given id
   ///
+  void AddProperty(const std::string& id, const std::string& value) { m_properties[id] = value; }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Clear all present properties.
   ///
-  /// -------------------------------------------------------------------------
+  void ClearProperties() { m_properties.clear(); }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Get the present properties list on directory entry.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// #include <kodi/gui/DialogFileBrowser.h>
-  /// ...
-  /// std::string md5;
-  /// std::string filename;
-  /// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "*.avi|*.mpg|*.mp4",
-  ///                                                "Test File selection to get MD5",
-  ///                                                filename))
-  /// {
-  ///   md5 = kodi::vfs::GetFileMD5(filename);
-  ///   fprintf(stderr, "MD5 of file '%s' is %s\n", md5.c_str(), filename.c_str());
-  /// }
-  /// ~~~~~~~~~~~~~
+  /// @return map with all present properties
   ///
-  inline std::string GetFileMD5(const std::string& path)
+  const std::map<std::string, std::string>& GetProperties() const { return m_properties; }
+  //----------------------------------------------------------------------------
+
+  //@}
+
+private:
+  std::string m_label;
+  std::string m_title;
+  std::string m_path;
+  std::map<std::string, std::string> m_properties;
+  bool m_folder;
+  int64_t m_size;
+  time_t m_dateTime;
+};
+//@}
+//------------------------------------------------------------------------------
+
+//}}}
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" Directory related functions
+//{{{
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_Directory
+/// @brief Make a directory.
+///
+/// The kodi::vfs::CreateDirectory() function shall create a
+/// new directory with name path.
+///
+/// The newly created directory shall be an empty directory.
+///
+/// @param[in] path Path to the directory.
+/// @return Upon successful completion, CreateDirectory() shall return true.
+///         Otherwise false shall be returned, no directory shall be created.
+///
+///
+/// -------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string directory = "C:\\my_dir";
+/// bool ret = kodi::vfs::CreateDirectory(directory);
+/// fprintf(stderr, "Directory '%s' successfull created: %s\n", directory.c_str(), ret ? "yes" : "no");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN CreateDirectory(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->create_directory(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_Directory
+/// @brief Verifying the Existence of a Directory.
+///
+/// The kodi::vfs::DirectoryExists() method determines whether
+/// a specified folder exists.
+///
+/// @param[in] path Path to the directory.
+/// @return True when it exists, false otherwise.
+///
+///
+/// -------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string directory = "C:\\my_dir";
+/// bool ret = kodi::vfs::DirectoryExists(directory);
+/// fprintf(stderr, "Directory '%s' present: %s\n", directory.c_str(), ret ? "yes" : "no");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN DirectoryExists(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->directory_exists(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_Directory
+/// @brief Removes a directory.
+///
+/// The kodi::vfs::RemoveDirectory() function shall remove a
+/// directory whose name is given by path.
+///
+/// @param[in] path Path to the directory.
+/// @return Upon successful completion, the function RemoveDirectory() shall
+///         return true. Otherwise, false shall be returned, and errno set
+///         to indicate the error. If false is returned, the named directory
+///         shall not be changed.
+///
+///
+/// -------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// bool ret = kodi::vfs::RemoveDirectory("C:\\my_dir");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN RemoveDirectory(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->remove_directory(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_Directory
+/// @brief Lists a directory.
+///
+/// Return the list of files and directories which have been found in the
+/// specified directory and which respect the given constraint.
+///
+/// It can handle the normal OS dependent paths and also the special virtual
+/// filesystem from Kodi what starts with \b special://.
+///
+/// @param[in]  path  The path in which the files and directories are located.
+/// @param[in]  mask  Mask to filter out requested files, e.g. "*.avi|*.mpg" to
+///                   files with this ending.
+/// @param[out] items The returned list directory entries.
+/// @return           True if listing was successful, false otherwise.
+///
+///
+/// -------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+///
+/// std::vector<kodi::vfs::CDirEntry> items;
+/// kodi::vfs::GetDirectory("special://temp", "", items);
+///
+/// fprintf(stderr, "Directory have %lu entries\n", items.size());
+/// for (unsigned long i = 0; i < items.size(); i++)
+/// {
+///   fprintf(stderr, " - %04lu -- Folder: %s -- Name: %s -- Path: %s\n",
+///             i+1,
+///             items[i].IsFolder() ? "yes" : "no ",
+///             items[i].Label().c_str(),
+///             items[i].Path().c_str());
+/// }
+/// ~~~~~~~~~~~~~
+inline bool ATTRIBUTE_HIDDEN GetDirectory(const std::string& path,
+                                          const std::string& mask,
+                                          std::vector<kodi::vfs::CDirEntry>& items)
+{
+  using namespace kodi::addon;
+
+  VFSDirEntry* dir_list = nullptr;
+  unsigned int num_items = 0;
+  if (CAddonBase::m_interface->toKodi->kodi_filesystem->get_directory(
+          CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), mask.c_str(), &dir_list,
+          &num_items))
   {
-    std::string strReturn;
-    char* strMd5 = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_md5(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
-    if (strMd5 != nullptr)
+    if (dir_list)
     {
-      if (std::strlen(strMd5))
-        strReturn = strMd5;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strMd5);
+      for (unsigned int i = 0; i < num_items; ++i)
+        items.emplace_back(dir_list[i]);
+
+      CAddonBase::m_interface->toKodi->kodi_filesystem->free_directory(
+          CAddonBase::m_interface->toKodi->kodiBase, dir_list, num_items);
     }
-    return strReturn;
+
+    return true;
   }
+  return false;
+}
+//------------------------------------------------------------------------------
+
+//}}}
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" File related functions
+//{{{
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_File
+/// @brief Check if a file exists.
+///
+/// @param[in] filename The filename to check.
+/// @param[in] usecache Check in file cache.
+/// @return true if the file exists false otherwise.
+///
+///
+/// -------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// bool exists = kodi::vfs::FileExists("special://temp/kodi.log");
+/// fprintf(stderr, "Log file should be always present, is it present? %s\n", exists ? "yes" : "no");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN FileExists(const std::string& filename, bool usecache = false)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->file_exists(
+      CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), usecache);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_File
+/// @brief Get file status.
+///
+/// These function return information about a file. Execute (search)
+/// permission is required on all of the directories in path that
+/// lead to the file.
+///
+/// The call return a stat structure, which contains the on
+/// @ref cpp_kodi_vfs_Defs_FileStatus defined values.
+///
+/// @warning Not all of the OS file systems implement all of the time fields.
+///
+/// @param[in] filename The filename to read the status from.
+/// @param[out] buffer The file status is written into this buffer.
+/// @return On success, trur is returned. On error, false is returned
+///
+///
+/// @copydetails cpp_kodi_vfs_Defs_FileStatus_Help
+///
+/// -------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// kodi::vfs::FileStatus statFile;
+/// int ret = kodi::vfs::StatFile("special://temp/kodi.log", statFile);
+/// fprintf(stderr, "deviceId (ID of device containing file)       = %u\n"
+///                 "size (total size, in bytes)                   = %lu\n"
+///                 "accessTime (time of last access)              = %lu\n"
+///                 "modificationTime (time of last modification)  = %lu\n"
+///                 "statusTime (time of last status change)       = %lu\n"
+///                 "isDirectory (The stat url is a directory)     = %s\n"
+///                 "isSymLink (The stat url is a symbolic link)   = %s\n"
+///                 "Return value                                  = %i\n",
+///                      statFile.GetDeviceId(),
+///                      statFile.GetSize(),
+///                      statFile.GetAccessTime(),
+///                      statFile.GetModificationTime(),
+///                      statFile.GetStatusTime(),
+///                      statFile.GetIsDirectory() ? "true" : "false",
+///                      statFile.GetIsSymLink() ? "true" : "false",
+///                      ret);
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN StatFile(const std::string& filename, kodi::vfs::FileStatus& buffer)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->stat_file(
+      CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), buffer);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_File
+/// @brief Deletes a file.
+///
+/// @param[in] filename The filename to delete.
+/// @return The file was successfully deleted.
+///
+///
+/// -------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// #include <kodi/gui/DialogFileBrowser.h>
+/// #include <kodi/gui/DialogOK.h>
+/// ...
+/// std::string filename;
+/// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "",
+///                                                  "Test File selection and delete of them!",
+///                                                  filename))
+/// {
+///   bool successed = kodi::vfs::DeleteFile(filename);
+///   if (!successed)
+///     kodi::gui::DialogOK::ShowAndGetInput("Error", "Delete of File", filename, "failed!");
+///   else
+///     kodi::gui::DialogOK::ShowAndGetInput("Information", "Delete of File", filename, "successfull done.");
+/// }
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN DeleteFile(const std::string& filename)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->delete_file(
+      CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_File
+/// @brief Rename a file name.
+///
+/// @param[in] filename The filename to copy.
+/// @param[in] newFileName The new filename
+/// @return true if successfully renamed
+///
+///
+inline bool ATTRIBUTE_HIDDEN RenameFile(const std::string& filename, const std::string& newFileName)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->rename_file(
+      CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), newFileName.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_File
+/// @brief Copy a file from source to destination.
+///
+/// @param[in] filename The filename to copy.
+/// @param[in] destination The destination to copy file to
+/// @return true if successfully copied
+///
+///
+inline bool ATTRIBUTE_HIDDEN CopyFile(const std::string& filename, const std::string& destination)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->copy_file(
+      CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), destination.c_str());
+}
+//------------------------------------------------------------------------------
+
+//}}}
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" General filesystem functions
+//{{{
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Retrieve MD5sum of a file.
+///
+/// @param[in] path Path to the file to MD5sum
+/// @return MD5 sum of the file
+///
+///
+/// -------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// #include <kodi/gui/DialogFileBrowser.h>
+/// ...
+/// std::string md5;
+/// std::string filename;
+/// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "*.avi|*.mpg|*.mp4",
+///                                                "Test File selection to get MD5",
+///                                                filename))
+/// {
+///   md5 = kodi::vfs::GetFileMD5(filename);
+///   fprintf(stderr, "MD5 of file '%s' is %s\n", md5.c_str(), filename.c_str());
+/// }
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN GetFileMD5(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  std::string strReturn;
+  char* strMd5 = CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_md5(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+  if (strMd5 != nullptr)
+  {
+    if (std::strlen(strMd5))
+      strReturn = strMd5;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, strMd5);
+  }
+  return strReturn;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Returns a thumb cache filename.
+///
+/// @param[in] filename Path to file
+/// @return Cache filename
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// #include <kodi/gui/DialogFileBrowser.h>
+/// ...
+/// std::string thumb;
+/// std::string filename;
+/// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "*.avi|*.mpg|*.mp4",
+///                                                "Test File selection to get Thumnail",
+///                                                filename))
+/// {
+///   thumb = kodi::vfs::GetCacheThumbName(filename);
+///   fprintf(stderr, "Thumb name of file '%s' is %s\n", thumb.c_str(), filename.c_str());
+/// }
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN GetCacheThumbName(const std::string& filename)
+{
+  using namespace kodi::addon;
+
+  std::string strReturn;
+  char* strThumbName = CAddonBase::m_interface->toKodi->kodi_filesystem->get_cache_thumb_name(
+      CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
+  if (strThumbName != nullptr)
+  {
+    if (std::strlen(strThumbName))
+      strReturn = strThumbName;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 strThumbName);
+  }
+  return strReturn;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Make filename valid.
+///
+/// Function to replace not valid characters with '_'. It can be also
+/// compared with original before in a own loop until it is equal
+/// (no invalid characters).
+///
+/// @param[in] filename Filename to check and fix
+/// @return The legal filename
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string fileName = "///\\jk???lj????.mpg";
+/// std::string legalName = kodi::vfs::MakeLegalFileName(fileName);
+/// fprintf(stderr, "Legal name of '%s' is '%s'\n", fileName.c_str(), legalName.c_str());
+///
+/// /* Returns as legal: 'jk___lj____.mpg' */
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN MakeLegalFileName(const std::string& filename)
+{
+  using namespace kodi::addon;
+
+  std::string strReturn;
+  char* strLegalFileName = CAddonBase::m_interface->toKodi->kodi_filesystem->make_legal_filename(
+      CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
+  if (strLegalFileName != nullptr)
+  {
+    if (std::strlen(strLegalFileName))
+      strReturn = strLegalFileName;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 strLegalFileName);
+  }
+  return strReturn;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Make directory name valid.
+///
+/// Function to replace not valid characters with '_'. It can be also
+/// compared with original before in a own loop until it is equal
+/// (no invalid characters).
+///
+/// @param[in] path Directory name to check and fix
+/// @return The legal directory name
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string path = "///\\jk???lj????\\hgjkg";
+/// std::string legalPath = kodi::vfs::MakeLegalPath(path);
+/// fprintf(stderr, "Legal name of '%s' is '%s'\n", path.c_str(), legalPath.c_str());
+///
+/// /* Returns as legal: '/jk___lj____/hgjkg' */
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN MakeLegalPath(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  std::string strReturn;
+  char* strLegalPath = CAddonBase::m_interface->toKodi->kodi_filesystem->make_legal_path(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+  if (strLegalPath != nullptr)
+  {
+    if (std::strlen(strLegalPath))
+      strReturn = strLegalPath;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 strLegalPath);
+  }
+  return strReturn;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Returns the translated path.
+///
+/// @param[in] source String or unicode - Path to format
+/// @return A human-readable string suitable for logging
+///
+/// @note Only useful if you are coding for both Linux and Windows. e.g.
+/// Converts 'special://masterprofile/script_data' ->
+/// '/home/user/.kodi/UserData/script_data' on Linux.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string path = kodi::vfs::TranslateSpecialProtocol("special://masterprofile/script_data");
+/// fprintf(stderr, "Translated path is: %s\n", path.c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+/// or
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// fprintf(stderr, "Directory 'special://temp' is '%s'\n", kodi::vfs::TranslateSpecialProtocol("special://temp").c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN TranslateSpecialProtocol(const std::string& source)
+{
+  using namespace kodi::addon;
+
+  std::string strReturn;
+  char* protocol = CAddonBase::m_interface->toKodi->kodi_filesystem->translate_special_protocol(
+      CAddonBase::m_interface->toKodi->kodiBase, source.c_str());
+  if (protocol != nullptr)
+  {
+    if (std::strlen(protocol))
+      strReturn = protocol;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 protocol);
+  }
+  return strReturn;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Retrieves information about the amount of space that is available on
+/// a disk volume.
+///
+/// Path can be also with Kodi's special protocol.
+///
+/// @param[in] path Path for where to check
+/// @param[out] capacity The total number of bytes in the file system
+/// @param[out] free The total number of free bytes in the file system
+/// @param[out] available The total number of free bytes available to a
+///                       non-privileged process
+/// @return true if successfully done and set
+///
+/// @warning This only works with paths belonging to OS. If <b>"special://"</b>
+/// is used, it must point to a place on your own OS.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <climits> // for ULLONG_MAX
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string path = "special://temp";
+/// uint64_t capacity = ULLONG_MAX;
+/// uint64_t free = ULLONG_MAX;
+/// uint64_t available = ULLONG_MAX;
+/// kodi::vfs::GetDiskSpace(path, capacity, free, available);
+/// fprintf(stderr, "Path '%s' sizes:\n", path.c_str());
+/// fprintf(stderr, " - capacity:  %lu MByte\n", capacity / 1024 / 1024);
+/// fprintf(stderr, " - free:      %lu MByte\n", free / 1024 / 1024);
+/// fprintf(stderr, " - available: %lu MByte\n", available / 1024 / 1024);
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN GetDiskSpace(const std::string& path,
+                                          uint64_t& capacity,
+                                          uint64_t& free,
+                                          uint64_t& available)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->get_disk_space(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), &capacity, &free, &available);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Return the file name from given complate path string.
+///
+/// @param[in] path The complete path include file and directory
+/// @return Filename from path
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string fileName = kodi::vfs::GetFileName("special://temp/kodi.log");
+/// fprintf(stderr, "File name is '%s'\n", fileName.c_str());
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN GetFileName(const std::string& path)
+{
+  /* find the last slash */
+  const size_t slash = path.find_last_of("/\\");
+  return path.substr(slash + 1);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Return the directory name from given complate path string.
+///
+/// @param[in] path The complete path include file and directory
+/// @return Directory name from path
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string dirName = kodi::vfs::GetDirectoryName("special://temp/kodi.log");
+/// fprintf(stderr, "Directory name is '%s'\n", dirName.c_str());
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN GetDirectoryName(const std::string& path)
+{
+  // Will from a full filename return the directory the file resides in.
+  // Keeps the final slash at end and possible |option=foo options.
+
+  size_t iPosSlash = path.find_last_of("/\\");
+  if (iPosSlash == std::string::npos)
+    return ""; // No slash, so no path (ignore any options)
+
+  size_t iPosBar = path.rfind('|');
+  if (iPosBar == std::string::npos)
+    return path.substr(0, iPosSlash + 1); // Only path
+
+  return path.substr(0, iPosSlash + 1) + path.substr(iPosBar); // Path + options
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Remove the slash on given path name.
+///
+/// @param[in,out] path The complete path
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string dirName = "special://temp/";
+/// kodi::vfs::RemoveSlashAtEnd(dirName);
+/// fprintf(stderr, "Directory name is '%s'\n", dirName.c_str());
+/// ~~~~~~~~~~~~~
+///
+inline void ATTRIBUTE_HIDDEN RemoveSlashAtEnd(std::string& path)
+{
+  if (!path.empty())
+  {
+    char last = path[path.size() - 1];
+    if (last == '/' || last == '\\')
+      path.erase(path.size() - 1);
+  }
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Return a size aligned to the chunk size at least as large as the
+/// chunk size.
+///
+/// @param[in] chunk The chunk size
+/// @param[in] minimum The minimum size (or maybe the minimum number of chunks?)
+/// @return The aligned size
+///
+inline unsigned int ATTRIBUTE_HIDDEN GetChunkSize(unsigned int chunk, unsigned int minimum)
+{
+  if (chunk)
+    return chunk * ((minimum + chunk - 1) / chunk);
+  else
+    return minimum;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Checks the given path contains a known internet protocol.
+///
+/// About following protocols are the path checked:
+/// | Protocol | Return true condition | Protocol | Return true condition
+/// |----------|-----------------------|----------|-----------------------
+/// | **dav**  | strictCheck = true    | **rtmps**    | always
+/// | **davs** | strictCheck = true    | **rtmpt**    | always
+/// | **ftp**  | strictCheck = true    | **rtmpte**   | always
+/// | **ftps** | strictCheck = true    | **rtp**      | always
+/// | **http** | always                | **rtsp**     | always
+/// | **https**| always                | **sdp**      | always
+/// | **mms**  | always                | **sftp**     | strictCheck = true
+/// | **mmsh** | always                | **stack**    | always
+/// | **mmst** | always                | **tcp**      | always
+/// | **rtmp** | always                | **udp**      | always
+/// | **rtmpe**| always                |              | |
+///
+/// @param[in] path To checked path/URL
+/// @param[in] strictCheck [opt] If True the set of protocols used will be
+///                        extended to include ftp, ftps, dav, davs and sftp.
+/// @return True if path is to a internet stream, false otherwise
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// // Check should return false
+/// fprintf(stderr, "File name 1 is internet stream '%s' (should no)\n",
+///                     kodi::vfs::IsInternetStream("D:/my-file.mkv") ? "yes" : "no");
+///
+/// // Check should return true
+/// fprintf(stderr, "File name 2 is internet stream '%s' (should yes)\n",
+///                     kodi::vfs::IsInternetStream("http://distribution.bbb3d.renderfarming.net/video/mp4/bbb_sunflower_1080p_30fps_normal.mp4") ? "yes" : "no");
+///
+/// // Check should return false
+/// fprintf(stderr, "File name 1 is internet stream '%s' (should no)\n",
+///                     kodi::vfs::IsInternetStream("ftp://do-somewhere.com/the-file.mkv") ? "yes" : "no", false);
+///
+/// // Check should return true
+/// fprintf(stderr, "File name 1 is internet stream '%s' (should yes)\n",
+///                     kodi::vfs::IsInternetStream("ftp://do-somewhere.com/the-file.mkv") ? "yes" : "no", true);
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN IsInternetStream(const std::string& path, bool strictCheck = false)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->is_internet_stream(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str(), strictCheck);
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Checks whether the specified path refers to a local network.
+///
+/// In difference to @ref IsHostOnLAN() include this more deeper checks where
+/// also handle Kodi's special protocol and stacks.
+///
+/// @param[in] path To checked path
+/// @return True if path is on LAN, false otherwise
+///
+/// @note Check includes @ref IsHostOnLAN() too.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// // Check should return true
+/// bool lan = kodi::vfs::IsOnLAN("smb://path/to/file");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN IsOnLAN(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->is_on_lan(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Checks specified path for external network.
+///
+/// @param[in] path To checked path
+/// @return True if path is remote, false otherwise
+///
+/// @note This does not apply to the local network.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// // Check should return true
+/// bool remote = kodi::vfs::IsRemote("http://path/to/file");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN IsRemote(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->is_remote(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Checks whether the given path refers to the own system.
+///
+/// @param[in] path To checked path
+/// @return True if path is local, false otherwise
+///
+inline bool ATTRIBUTE_HIDDEN IsLocal(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->is_local(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Checks specified path is a regular URL, e.g. "someprotocol://path/to/file"
+///
+/// @return True if file item is URL, false otherwise
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+///
+/// bool isURL;
+/// // Check should return true
+/// isURL = kodi::vfs::IsURL("someprotocol://path/to/file");
+///
+/// // Check should return false
+/// isURL = kodi::vfs::IsURL("/path/to/file");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN IsURL(const std::string& path)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->is_url(
+      CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
+}
+//--------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief To get HTTP header information.
+///
+/// @param[in] url URL source of the data
+/// @param[out] header The @ref cpp_kodi_vfs_Defs_HttpHeader
+/// @return true if successfully done, otherwise false
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// @copydetails cpp_kodi_vfs_Defs_HttpHeader_Help
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// kodi::vfs::HttpHeader header;
+/// bool ret = kodi::vfs::GetHttpHeader(url, header);
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN GetHttpHeader(const std::string& url, HttpHeader& header)
+{
+  using namespace ::kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_filesystem->get_http_header(
+      CAddonBase::m_interface->toKodi->kodiBase, url.c_str(), &header.m_handle);
+}
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Get file mime type.
+///
+/// @param[in] url URL source of the data
+/// @param[out] mimeType the mime type of the URL
+/// @param[in] useragent to be used when retrieving the MimeType [opt]
+/// @return true if successfully done, otherwise false
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string mimeType;.
+/// if (kodi::vfs::GetMimeType(url, mimeType))
+///   fprintf(stderr, "The mime type is '%s'\n", mimeType.c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN GetMimeType(const std::string& url,
+                                         std::string& mimeType,
+                                         const std::string& useragent = "")
+{
+  using namespace ::kodi::addon;
+
+  char* cMimeType = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_filesystem->get_mime_type(
+      CAddonBase::m_interface->toKodi->kodiBase, url.c_str(), &cMimeType, useragent.c_str());
+  if (cMimeType != nullptr)
+  {
+    mimeType = cMimeType;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 cMimeType);
+  }
+  return ret;
+}
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Get file content-type.
+///
+/// @param[in] url URL source of the data
+/// @param[out] content The returned type
+/// @param[in] useragent to be used when retrieving the MimeType [opt]
+/// @return true if successfully done, otherwise false
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string content;.
+/// if (kodi::vfs::GetContentType(url, content))
+///   fprintf(stderr, "The content type is '%s'\n", content.c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN GetContentType(const std::string& url,
+                                            std::string& content,
+                                            const std::string& useragent = "")
+{
+  using namespace ::kodi::addon;
+
+  char* cContent = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_filesystem->get_content_type(
+      CAddonBase::m_interface->toKodi->kodiBase, url.c_str(), &cContent, useragent.c_str());
+  if (cContent != nullptr)
+  {
+    content = cContent;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 cContent);
+  }
+  return ret;
+}
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_vfs_General
+/// @brief Get cookies stored by CURL in RFC 2109 format.
+///
+/// @param[in] url URL source of the data
+/// @param[out] cookies The text list of available cookies
+/// @return true if successfully done, otherwise false
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+/// ...
+/// std::string url = "";
+/// std::string cookies;
+/// bool ret = kodi::vfs::GetCookies(url, cookies);
+/// fprintf(stderr, "Cookies from URL '%s' are '%s' (return was %s)\n",
+///         url.c_str(), cookies.c_str(), ret ? "true" : "false");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN GetCookies(const std::string& url, std::string& cookies)
+{
+  using namespace ::kodi::addon;
+
+  char* cCookies = nullptr;
+  bool ret = CAddonBase::m_interface->toKodi->kodi_filesystem->get_cookies(
+      CAddonBase::m_interface->toKodi->kodiBase, url.c_str(), &cCookies);
+  if (cCookies != nullptr)
+  {
+    cookies = cCookies;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 cCookies);
+  }
+  return ret;
+}
+//----------------------------------------------------------------------------
+
+//}}}
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C++" CFile class
+//{{{
+
+//==============================================================================
+/// @defgroup cpp_kodi_vfs_CFile 4. class CFile
+/// @ingroup cpp_kodi_vfs
+///
+/// @brief **Creatable class for virtual file server control**\n
+/// To perform file read/write with Kodi's filesystem parts.
+///
+/// CFile is the class used for handling Files in Kodi. This class can be used
+/// for creating, reading, writing and modifying files. It directly provides unbuffered, binary disk input/output services
+///
+/// It has the header @ref Filesystem.h "#include <kodi/Filesystem.h>" be included
+/// to enjoy it.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Filesystem.h>
+///
+/// ...
+///
+/// /* Create the needed file handle class */
+/// kodi::vfs::CFile myFile();
+///
+/// /* In this example we use the user path for the add-on */
+/// std::string file = kodi::GetUserPath() + "/myFile.txt";
+///
+/// /* Now create and open the file or overwrite if present */
+/// myFile.OpenFileForWrite(file, true);
+///
+/// const char* str = "I love Kodi!";
+///
+/// /* write string */
+/// myFile.Write(str, sizeof(str));
+///
+/// /* On this way the Close() is not needed to call, becomes done from destructor */
+///
+/// ~~~~~~~~~~~~~
+///
+//@{
+class ATTRIBUTE_HIDDEN CFile
+{
+public:
+  //============================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Construct a new, unopened file.
+  ///
+  CFile() = default;
   //----------------------------------------------------------------------------
 
   //============================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief <b>`Close()`</b> is called from the destructor, so explicitly
+  /// closing the file isn't required.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Returns a thumb cache filename
+  virtual ~CFile() { Close(); }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Open the file with filename via Kodi's @ref cpp_kodi_vfs_CFile
+  /// "CFile". Needs to be closed by calling Close() when done.
   ///
-  /// @param[in] filename path to file
-  /// @return cache filename
+  /// @param[in] filename The filename to open.
+  /// @param[in] flags [opt] The flags to pass, see @ref OpenFileFlags
+  /// @return True on success or false on failure
   ///
+  bool OpenFile(const std::string& filename, unsigned int flags = 0)
+  {
+    using namespace kodi::addon;
+
+    Close();
+    m_file = CAddonBase::m_interface->toKodi->kodi_filesystem->open_file(
+        CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), flags);
+    return m_file != nullptr;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Open the file with filename via Kodi's @ref cpp_kodi_vfs_CFile
+  /// "CFile" in write mode. Needs to be closed by calling Close() when
+  /// done.
   ///
-  /// ------------------------------------------------------------------------
+  /// @note Related folders becomes created if not present.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// #include <kodi/gui/DialogFileBrowser.h>
-  /// ...
-  /// std::string thumb;
-  /// std::string filename;
-  /// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "*.avi|*.mpg|*.mp4",
-  ///                                                "Test File selection to get Thumnail",
-  ///                                                filename))
-  /// {
-  ///   thumb = kodi::vfs::GetCacheThumbName(filename);
-  ///   fprintf(stderr, "Thumb name of file '%s' is %s\n", thumb.c_str(), filename.c_str());
-  /// }
-  /// ~~~~~~~~~~~~~
+  /// @param[in] filename The filename to open.
+  /// @param[in] overwrite True to overwrite, false otherwise.
+  /// @return True on success or false on failure
   ///
-  inline std::string GetCacheThumbName(const std::string& filename)
+  bool OpenFileForWrite(const std::string& filename, bool overwrite = false)
   {
-    std::string strReturn;
-    char* strThumbName = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_cache_thumb_name(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
-    if (strThumbName != nullptr)
+    using namespace kodi::addon;
+
+    Close();
+
+    // Try to open the file. If it fails, check if we need to create the directory first
+    // This way we avoid checking if the directory exists every time
+    m_file = CAddonBase::m_interface->toKodi->kodi_filesystem->open_file_for_write(
+        CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), overwrite);
+    if (!m_file)
     {
-      if (std::strlen(strThumbName))
-        strReturn = strThumbName;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strThumbName);
+      std::string cacheDirectory = kodi::vfs::GetDirectoryName(filename);
+      if (CAddonBase::m_interface->toKodi->kodi_filesystem->directory_exists(
+              CAddonBase::m_interface->toKodi->kodiBase, cacheDirectory.c_str()) ||
+          CAddonBase::m_interface->toKodi->kodi_filesystem->create_directory(
+              CAddonBase::m_interface->toKodi->kodiBase, cacheDirectory.c_str()))
+        m_file = CAddonBase::m_interface->toKodi->kodi_filesystem->open_file_for_write(
+            CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), overwrite);
     }
-    return strReturn;
+    return m_file != nullptr;
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
-  ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Make filename valid
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Check file is opened.
   ///
-  /// Function to replace not valid characters with '_'. It can be also
-  /// compared with original before in a own loop until it is equal
-  /// (no invalid characters).
+  /// @return True on open or false on closed or failure
   ///
-  /// @param[in] filename Filename to check and fix
-  /// @return            The legal filename
+  bool IsOpen() const { return m_file != nullptr; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Close an open file.
   ///
+  void Close()
+  {
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return;
+    CAddonBase::m_interface->toKodi->kodi_filesystem->close_file(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
+    m_file = nullptr;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Create a Curl representation
   ///
-  /// ------------------------------------------------------------------------
+  /// @param[in] url The URL of the Type.
+  /// @return True on success or false on failure
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// std::string fileName = "///\\jk???lj????.mpg";
-  /// std::string legalName = kodi::vfs::MakeLegalFileName(fileName);
-  /// fprintf(stderr, "Legal name of '%s' is '%s'\n", fileName.c_str(), legalName.c_str());
+  bool CURLCreate(const std::string& url)
+  {
+    using namespace kodi::addon;
+
+    m_file = CAddonBase::m_interface->toKodi->kodi_filesystem->curl_create(
+        CAddonBase::m_interface->toKodi->kodiBase, url.c_str());
+    return m_file != nullptr;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Add options to the curl file created with CURLCreate.
   ///
-  /// /* Returns as legal: 'jk___lj____.mpg' */
-  /// ~~~~~~~~~~~~~
+  /// @param[in] type Option type to set, see @ref CURLOptiontype
+  /// @param[in] name Name of the option
+  /// @param[in] value Value of the option
+  /// @return True on success or false on failure
   ///
-  inline std::string MakeLegalFileName(const std::string& filename)
+  bool CURLAddOption(CURLOptiontype type, const std::string& name, const std::string& value)
   {
-    std::string strReturn;
-    char* strLegalFileName = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->make_legal_filename(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
-    if (strLegalFileName != nullptr)
+    using namespace kodi::addon;
+
+    if (!m_file)
     {
-      if (std::strlen(strLegalFileName))
-        strReturn = strLegalFileName;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strLegalFileName);
+      kodi::Log(ADDON_LOG_ERROR, "kodi::vfs::CURLCreate(...) needed to call before!");
+      return false;
     }
-    return strReturn;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->curl_add_option(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, type, name.c_str(), value.c_str());
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
-  ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Make directory name valid
-  ///
-  /// Function to replace not valid characters with '_'. It can be also
-  /// compared with original before in a own loop until it is equal
-  /// (no invalid characters).
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Open the curl file created with CURLCreate.
   ///
-  /// @param[in] path Directory name to check and fix
-  /// @return        The legal directory name
+  /// @param[in] flags [opt] The flags to pass, see @ref OpenFileFlags
+  /// @return True on success or false on failure
   ///
-  ///
-  /// ------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// std::string path = "///\\jk???lj????\\hgjkg";
-  /// std::string legalPath = kodi::vfs::MakeLegalPath(path);
-  /// fprintf(stderr, "Legal name of '%s' is '%s'\n", path.c_str(), legalPath.c_str());
-  ///
-  /// /* Returns as legal: '/jk___lj____/hgjkg' */
-  /// ~~~~~~~~~~~~~
-  ///
-  inline std::string MakeLegalPath(const std::string& path)
+  bool CURLOpen(unsigned int flags = 0)
   {
-    std::string strReturn;
-    char* strLegalPath = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->make_legal_path(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, path.c_str());
-    if (strLegalPath != nullptr)
+    using namespace kodi::addon;
+
+    if (!m_file)
     {
-      if (std::strlen(strLegalPath))
-        strReturn = strLegalPath;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strLegalPath);
+      kodi::Log(ADDON_LOG_ERROR, "kodi::vfs::CURLCreate(...) needed to call before!");
+      return false;
     }
-    return strReturn;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->curl_open(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, flags);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
-  ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Returns the translated path
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Read from an open file.
   ///
-  /// @param[in] source  string or unicode - Path to format
-  /// @return      A human-readable string suitable for logging
+  /// @param[in] ptr The buffer to store the data in.
+  /// @param[in] size The size of the buffer.
+  /// @return number of successfully read bytes if any bytes were read and
+  ///         stored in buffer, zero if no bytes are available to read (end of
+  ///         file was reached) or undetectable error occur, -1 in case of any
+  ///         explicit error
   ///
-  /// @note        Only useful if you are coding for both Linux and Windows.
-  ///              e.g. Converts 'special://masterprofile/script_data' -> '/home/user/.kodi/UserData/script_data'
-  ///              on Linux.
-  ///
-  ///
-  /// ------------------------------------------------------------------------
+  ssize_t Read(void* ptr, size_t size)
+  {
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return -1;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->read_file(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, ptr, size);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Read a string from an open file.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// std::string path = kodi::vfs::TranslateSpecialProtocol("special://masterprofile/script_data");
-  /// fprintf(stderr, "Translated path is: %s\n", path.c_str());
-  /// ...
-  /// ~~~~~~~~~~~~~
-  /// or
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// fprintf(stderr, "Directory 'special://temp' is '%s'\n", kodi::vfs::TranslateSpecialProtocol("special://temp").c_str());
-  /// ...
-  /// ~~~~~~~~~~~~~
+  /// @param[out] line The buffer to store the data in.
+  /// @return True when a line was read, false otherwise.
   ///
-  inline std::string TranslateSpecialProtocol(const std::string& source)
+  bool ReadLine(std::string& line)
   {
-    std::string strReturn;
-    char* protocol = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->translate_special_protocol(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, source.c_str());
-    if (protocol != nullptr)
+    using namespace kodi::addon;
+
+    line.clear();
+    if (!m_file)
+      return false;
+    // TODO: Read 1024 chars into buffer. If file position advanced that many
+    // chars, we didn't hit a newline. Otherwise, if file position is 1 or 2
+    // past the number of bytes read, we read (and skipped) a newline sequence.
+    char buffer[1025];
+    if (CAddonBase::m_interface->toKodi->kodi_filesystem->read_file_string(
+            CAddonBase::m_interface->toKodi->kodiBase, m_file, buffer, sizeof(buffer)))
     {
-      if (std::strlen(protocol))
-        strReturn = protocol;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, protocol);
+      line = buffer;
+      return !line.empty();
     }
-    return strReturn;
+    return false;
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
-  ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Return the file name from given complate path string
-  ///
-  /// @param[in] path The complete path include file and directory
-  /// @return Filename from path
-  ///
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Write to a file opened in write mode.
   ///
-  /// ------------------------------------------------------------------------
+  /// @param[in] ptr Pointer to the data to write, converted to a <b>`const void*`</b>.
+  /// @param[in] size Size of the data to write.
+  /// @return number of successfully written bytes if any bytes were written,
+  ///         zero if no bytes were written and no detectable error occur,-1
+  ///         in case of any explicit error
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// std::string fileName = kodi::vfs::GetFileName("special://temp/kodi.log");
-  /// fprintf(stderr, "File name is '%s'\n", fileName.c_str());
-  /// ~~~~~~~~~~~~~
-  ///
-  inline std::string GetFileName(const std::string& path)
+  ssize_t Write(const void* ptr, size_t size)
   {
-    /* find the last slash */
-    const size_t slash = path.find_last_of("/\\");
-    return path.substr(slash+1);
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return -1;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->write_file(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, ptr, size);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
-  ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Return the directory name from given complate path string
-  ///
-  /// @param[in] path The complete path include file and directory
-  /// @return Directory name from path
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Flush buffered data.
   ///
+  /// If the given stream was open for writing (or if it was open for updating
+  /// and the last i/o operation was an output operation) any unwritten data
+  /// in its output buffer is written to the file.
   ///
-  /// ------------------------------------------------------------------------
+  /// The stream remains open after this call.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// std::string dirName = kodi::vfs::GetDirectoryName("special://temp/kodi.log");
-  /// fprintf(stderr, "Directory name is '%s'\n", dirName.c_str());
-  /// ~~~~~~~~~~~~~
+  /// When a file is closed, either because of a call to close or because the
+  /// class is destructed, all the buffers associated with it are
+  /// automatically flushed.
   ///
-  inline std::string GetDirectoryName(const std::string& path)
+  void Flush()
   {
-    // Will from a full filename return the directory the file resides in.
-    // Keeps the final slash at end and possible |option=foo options.
+    using namespace kodi::addon;
 
-    size_t iPosSlash = path.find_last_of("/\\");
-    if (iPosSlash == std::string::npos)
-      return ""; // No slash, so no path (ignore any options)
-
-    size_t iPosBar = path.rfind('|');
-    if (iPosBar == std::string::npos)
-      return path.substr(0, iPosSlash + 1); // Only path
-
-    return path.substr(0, iPosSlash + 1) + path.substr(iPosBar); // Path + options
+    if (!m_file)
+      return;
+    CAddonBase::m_interface->toKodi->kodi_filesystem->flush_file(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-
-  //============================================================================
-  ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Remove the slash on given path name
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Set the file's current position.
   ///
-  /// @param[in,out] path The complete path
+  /// The whence argument is optional and defaults to SEEK_SET (0)
   ///
+  /// @param[in] position the position that you want 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 Returns the resulting offset location as measured in bytes from
+  ///         the beginning of the file. On error, the value -1 is returned.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// std::string dirName = "special://temp/";
-  /// kodi::vfs::RemoveSlashAtEnd(dirName);
-  /// fprintf(stderr, "Directory name is '%s'\n", dirName.c_str());
-  /// ~~~~~~~~~~~~~
-  ///
-  inline void RemoveSlashAtEnd(std::string& path)
+  int64_t Seek(int64_t position, int whence = SEEK_SET)
   {
-    if (!path.empty())
-    {
-      char last = path[path.size() - 1];
-      if (last == '/' || last == '\\')
-        path.erase(path.size() - 1);
-    }
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return -1;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->seek_file(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, position, whence);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Truncate a file to the requested size.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Return a size aligned to the chunk size at least as large as the chunk size.
+  /// @param[in] size The new max size.
+  /// @return New size? On error, the value -1 is returned.
   ///
-  /// @param[in] chunk The chunk size
-  /// @param[in] minimum The minimum size (or maybe the minimum number of chunks?)
-  /// @return The aligned size
-  ///
-  inline unsigned int GetChunkSize(unsigned int chunk, unsigned int minimum)
+  int Truncate(int64_t size)
   {
-    if (chunk)
-      return chunk * ((minimum + chunk - 1) / chunk);
-    else
-      return minimum;
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return -1;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->truncate_file(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, size);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
-  ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Check if a file exists.
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief The current offset in an open file.
   ///
-  /// @param[in] filename       The filename to check.
-  /// @param[in] usecache       Check in file cache.
-  /// @return                   true if the file exists false otherwise.
+  /// @return The requested offset. On error, the value -1 is returned.
   ///
+  int64_t GetPosition() const
+  {
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return -1;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_position(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Get the file size of an open file.
   ///
-  /// -------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// bool exists = kodi::vfs::FileExists("special://temp/kodi.log");
-  /// fprintf(stderr, "Log file should be always present, is it present? %s\n", exists ? "yes" : "no");
-  /// ~~~~~~~~~~~~~
+  /// @return The requested size. On error, the value -1 is returned.
   ///
-  inline bool FileExists(const std::string& filename, bool usecache = false)
+  int64_t GetLength() const
   {
-    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->file_exists(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), usecache);
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return -1;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_length(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Checks the file access is on end position.
+  ///
+  /// @return If you've reached the end of the file, AtEnd() returns true.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Get file status.
-  ///
-  /// These function return information about a file. Execute (search)
-  /// permission is required on all of the directories in path that
-  /// lead to the file.
-  ///
-  /// The call return a stat structure, which contains the on \ref STAT_STRUCTURE
-  /// defined values.
-  ///
-  /// @warning Not all of the OS file systems implement all of the time fields.
-  ///
-  /// @param[in] filename The filename to read the status from.
-  /// @param[out] buffer The file status is written into this buffer.
-  /// @return On success, tru is returned. On error, fale is returned
-  ///
-  ///
-  /// -------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// ...
-  /// STAT_STRUCTURE statFile;
-  /// int ret = kodi::vfs::StatFile("special://temp/kodi.log", statFile);
-  /// fprintf(stderr, "deviceId (ID of device containing file)       = %u\n"
-  ///                 "size (total size, in bytes)                   = %lu\n"
-  ///                 "accessTime (time of last access)              = %lu\n"
-  ///                 "modificationTime (time of last modification)  = %lu\n"
-  ///                 "statusTime (time of last status change)       = %lu\n"
-  ///                 "isDirectory (The stat url is a directory)     = %s\n"
-  ///                 "isSymLink (The stat url is a symbolic link)   = %s\n"
-  ///                 "Return value                                  = %i\n",
-  ///                      statFile.deviceId,
-  ///                      statFile.size,
-  ///                      statFile.accessTime,
-  ///                      statFile.modificationTime,
-  ///                      statFile.statusTime,
-  ///                      statFile.isDirectory ? "true" : "false",
-  ///                      statFile.isSymLink ? "true" : "false",
-  ///                      ret);
-  /// ~~~~~~~~~~~~~
-  ///
-  inline bool StatFile(const std::string& filename, STAT_STRUCTURE& buffer)
+  bool AtEnd() const
   {
-    struct __stat64 frontendBuffer = { };
-    if (::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->stat_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), &frontendBuffer))
-    {
-      buffer.deviceId         = frontendBuffer.st_dev;
-      buffer.size             = frontendBuffer.st_size;
-#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD)
-      buffer.accessTime       = frontendBuffer.st_atimespec;
-      buffer.modificationTime = frontendBuffer.st_mtimespec;
-      buffer.statusTime       = frontendBuffer.st_ctimespec;
-#elif defined(TARGET_WINDOWS)
-      buffer.accessTime       = frontendBuffer.st_atime;
-      buffer.modificationTime = frontendBuffer.st_mtime;
-      buffer.statusTime       = frontendBuffer.st_ctime;
-#elif defined(TARGET_ANDROID)
-      buffer.accessTime.tv_sec = frontendBuffer.st_atime;
-      buffer.accessTime.tv_nsec = frontendBuffer.st_atime_nsec;
-      buffer.modificationTime.tv_sec = frontendBuffer.st_mtime;
-      buffer.modificationTime.tv_nsec = frontendBuffer.st_mtime_nsec;
-      buffer.statusTime.tv_sec = frontendBuffer.st_ctime;
-      buffer.statusTime.tv_nsec = frontendBuffer.st_ctime_nsec;
-#else
-      buffer.accessTime       = frontendBuffer.st_atim;
-      buffer.modificationTime = frontendBuffer.st_mtim;
-      buffer.statusTime       = frontendBuffer.st_ctim;
-#endif
-      buffer.isDirectory      = S_ISDIR(frontendBuffer.st_mode);
-      buffer.isSymLink        = S_ISLNK(frontendBuffer.st_mode);
+    using namespace kodi::addon;
+
+    if (!m_file)
       return true;
-    }
-    return false;
+    int64_t length = CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_length(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
+    int64_t position = CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_position(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
+    return position >= length;
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Get the chunk size for an open file.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Deletes a file.
-  ///
-  /// @param[in] filename The filename to delete.
-  /// @return The file was successfully deleted.
-  ///
-  ///
-  /// -------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
-  /// #include <kodi/gui/DialogFileBrowser.h>
-  /// #include <kodi/gui/DialogOK.h>
-  /// ...
-  /// std::string filename;
-  /// if (kodi::gui::DialogFileBrowser::ShowAndGetFile("local", "",
-  ///                                                  "Test File selection and delete of them!",
-  ///                                                  filename))
-  /// {
-  ///   bool successed = kodi::vfs::DeleteFile(filename);
-  ///   if (!successed)
-  ///     kodi::gui::DialogOK::ShowAndGetInput("Error", "Delete of File", filename, "failed!");
-  ///   else
-  ///     kodi::gui::DialogOK::ShowAndGetInput("Information", "Delete of File", filename, "successfull done.");
-  /// }
-  /// ~~~~~~~~~~~~~
-  ///
-  inline bool DeleteFile(const std::string& filename)
+  /// @return The requested size. On error, the value -1 is returned.
+  ///
+  int GetChunkSize() const
   {
-    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->delete_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return -1;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_chunk_size(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
-  ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Rename a file name
-  ///
-  /// @param[in] filename       The filename to copy.
-  /// @param[in] newFileName    The new filename
-  /// @return                   true if successfully renamed
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief To check seek possible on current stream by file.
   ///
+  /// @return true if seek possible, false if not
   ///
-  inline bool RenameFile(const std::string& filename, const std::string& newFileName)
+  bool IoControlGetSeekPossible() const
   {
-    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->rename_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), newFileName.c_str());
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return false;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->io_control_get_seek_possible(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief To check a running stream on file for state of his cache.
   ///
-  /// @ingroup cpp_kodi_vfs
-  /// @brief Copy a file from source to destination
+  /// @param[in] status Information about current cache status
+  /// @return true if successfull done, false otherwise
   ///
-  /// @param[in] filename       The filename to copy.
-  /// @param[in] destination    The destination to copy file to
-  /// @return                   true if successfully copied
   ///
+  /// @copydetails cpp_kodi_vfs_Defs_CacheStatus_Help
   ///
-  inline bool CopyFile(const std::string& filename, const std::string& destination)
+  bool IoControlGetCacheStatus(CacheStatus& status) const
   {
-    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->copy_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), destination.c_str());
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return false;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->io_control_get_cache_status(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, status);
   }
-  //----------------------------------------------------------------------------
+  //--------------------------------------------------------------------------
 
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_vfs_CFile class CFile
-  /// \ingroup cpp_kodi_vfs
-  ///
-  /// @brief **Virtual file server control**
-  ///
-  /// CFile is the class used for handling Files in Kodi. This class can be used
-  /// for creating, reading, writing and modifying files. It directly provides unbuffered, binary disk input/output services
-  ///
-  /// It has the header \ref Filesystem.h "#include <kodi/Filesystem.h>" be included
-  /// to enjoy it.
-  ///
-  ///
-  /// ------------------------------------------------------------------------
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Unsigned int with speed limit for caching in bytes per second.
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Filesystem.h>
+  /// @param[in] rate Cache rate size to use
+  /// @return true if successfull done, false otherwise
   ///
-  /// ...
-  ///
-  /// /* Create the needed file handle class */
-  /// kodi::vfs::CFile myFile();
-  ///
-  /// /* In this example we use the user path for the add-on */
-  /// std::string file = kodi::GetUserPath() + "/myFile.txt";
-  ///
-  /// /* Now create and open the file or overwrite if present */
-  /// myFile.OpenFileForWrite(file, true);
-  ///
-  /// const char* str = "I love Kodi!";
+  bool IoControlSetCacheRate(unsigned int rate)
+  {
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return false;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->io_control_set_cache_rate(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, rate);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Enable/disable retry within the protocol handler (if supported).
   ///
-  /// /* write string */
-  /// myFile.Write(str, sizeof(str));
+  /// @param[in] retry To set the retry, true for use, false for not
+  /// @return true if successfull done, false otherwise
   ///
-  /// /* On this way the Close() is not needed to call, becomes done from destructor */
+  bool IoControlSetRetry(bool retry)
+  {
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return false;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->io_control_set_retry(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, retry);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Retrieve a file property.
   ///
-  /// ~~~~~~~~~~~~~
+  /// @param[in] type The type of the file property to retrieve the value for
+  /// @param[in] name The name of a named property value (e.g. Header)
+  /// @return value of requested property, empty on failure / non-existance
   ///
-  //@{
-  class CFile
+  const std::string GetPropertyValue(FilePropertyTypes type, const std::string& name) const
   {
-  public:
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Construct a new, unopened file
-    ///
-    CFile() = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Close() is called from the destructor, so explicitly closing the
-    /// file isn't required
-    ///
-    virtual ~CFile() { Close(); }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Open the file with filename via Kodi's \ref cpp_kodi_vfs_CFile
-    /// "CFile". Needs to be closed by calling Close() when done.
-    ///
-    /// @param[in] filename     The filename to open.
-    /// @param[in] flags        [opt] The flags to pass, see \ref OpenFileFlags
-    /// @return                 True on success or false on failure
-    ///
-    bool OpenFile(const std::string& filename, unsigned int flags = 0)
-    {
-      Close();
-      m_file = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->open_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), flags);
-      return m_file != nullptr;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Open the file with filename via Kodi's \ref cpp_kodi_vfs_CFile
-    /// "CFile" in write mode. Needs to be closed by calling Close() when
-    /// done.
-    ///
-    /// @note Related folders becomes created if not present.
-    ///
-    /// @param[in] filename     The filename to open.
-    /// @param[in] overwrite    True to overwrite, false otherwise.
-    /// @return                 True on success or false on failure
-    ///
-    bool OpenFileForWrite(const std::string& filename, bool overwrite = false)
-    {
-      Close();
+    using namespace kodi::addon;
 
-      // Try to open the file. If it fails, check if we need to create the directory first
-      // This way we avoid checking if the directory exists every time
-      m_file = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->open_file_for_write(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), overwrite);
-      if (!m_file)
-      {
-        std::string cacheDirectory = kodi::vfs::GetDirectoryName(filename);
-        if (::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->directory_exists(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, cacheDirectory.c_str()) ||
-            ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->create_directory(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, cacheDirectory.c_str()))
-          m_file = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->open_file_for_write(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), overwrite);
-      }
-      return m_file != nullptr;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Create a Curl representation
-    ///
-    /// @param[in] url          the URL of the Type.
-    /// @return                 True on success or false on failure
-    ///
-    bool CURLCreate(const std::string& url)
-    {
-      m_file = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->curl_create(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, url.c_str());
-      return m_file != nullptr;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Add options to the curl file created with CURLCreate
-    ///
-    /// @param[in] type         option type to set, see \ref CURLOptiontype
-    /// @param[in] name         name of the option
-    /// @param[in] value        value of the option
-    /// @return                 True on success or false on failure
-    ///
-    bool CURLAddOption(CURLOptiontype type, const std::string& name, const std::string& value)
-    {
-      if (!m_file)
-      {
-        kodi::Log(ADDON_LOG_ERROR, "kodi::vfs::CURLCreate(...) needed to call before!");
-        return false;
-      }
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->curl_add_option(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, type, name.c_str(), value.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Open the curl file created with CURLCreate
-    ///
-    /// @param[in] flags        [opt] The flags to pass, see \ref OpenFileFlags
-    /// @return                 True on success or false on failure
-    ///
-    bool CURLOpen(unsigned int flags = 0)
-    {
-      if (!m_file)
-      {
-        kodi::Log(ADDON_LOG_ERROR, "kodi::vfs::CURLCreate(...) needed to call before!");
-        return false;
-      }
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->curl_open(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, flags);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Read from an open file.
-    ///
-    /// @param[in] ptr          The buffer to store the data in.
-    /// @param[in] size         The size of the buffer.
-    /// @return                 number of successfully read bytes if any bytes
-    ///                         were read and stored in buffer, zero if no bytes
-    ///                         are available to read (end of file was reached)
-    ///                         or undetectable error occur, -1 in case of any
-    ///                         explicit error
-    ///
-    ssize_t Read(void* ptr, size_t size)
-    {
-      if (!m_file)
-        return -1;
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->read_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, ptr, size);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Read a string from an open file.
-    ///
-    /// @param[out] line        The buffer to store the data in.
-    /// @return                 True when a line was read, false otherwise.
-    ///
-    bool ReadLine(std::string &line)
-    {
-      line.clear();
-      if (!m_file)
-        return false;
-      // TODO: Read 1024 chars into buffer. If file position advanced that many
-      // chars, we didn't hit a newline. Otherwise, if file position is 1 or 2
-      // past the number of bytes read, we read (and skipped) a newline sequence.
-      char buffer[1025];
-      if (::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->read_file_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, buffer, sizeof(buffer)))
-      {
-        line = buffer;
-        return !line.empty();
-      }
-      return false;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Write to a file opened in write mode.
-    ///
-    /// @param[in] ptr          Pointer to the data to write, converted to a
-    ///                         const void*.
-    /// @param[in] size         Size of the data to write.
-    /// @return                 number of successfully written bytes if any
-    ///                         bytes were written, zero if no bytes were
-    ///                         written and no detectable error occur,-1 in case
-    ///                         of any explicit error
-    ///
-    ssize_t Write(const void* ptr, size_t size)
-    {
-      if (!m_file)
-        return -1;
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->write_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, ptr, size);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Flush buffered data.
-    ///
-    /// If the given stream was open for writing (or if it was open for updating
-    /// and the last i/o operation was an output operation) any unwritten data
-    /// in its output buffer is written to the file.
-    ///
-    /// The stream remains open after this call.
-    ///
-    /// When a file is closed, either because of a call to close or because the
-    /// class is destructed, all the buffers associated with it are
-    /// automatically flushed.
-    ///
-    void Flush()
-    {
-      if (!m_file)
-        return;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->flush_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Set the file's current position.
-    ///
-    /// The whence argument is optional and defaults to SEEK_SET (0)
-    ///
-    /// @param[in] position             the position that you want 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                         Returns the resulting offset location as
-    ///                                 measured in bytes from the beginning of
-    ///                                 the file. On error, the value -1 is
-    ///                                 returned.
-    ///
-    int64_t Seek(int64_t position, int whence = SEEK_SET)
-    {
-      if (!m_file)
-        return -1;
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->seek_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, position, whence);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Truncate a file to the requested size.
-    ///
-    /// @param[in] size                 The new max size.
-    /// @return                         New size? On error, the value -1 is
-    ///                                 returned.
-    ///
-    int Truncate(int64_t size)
-    {
-      if (!m_file)
-        return -1;
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->truncate_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, size);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief The current offset in an open file.
-    ///
-    /// @return                 The requested offset. On error, the value -1 is
-    ///                         returned.
-    ///
-    int64_t GetPosition()
+    if (!m_file)
     {
-      if (!m_file)
-        return -1;
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_position(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+      kodi::Log(ADDON_LOG_ERROR,
+                "kodi::vfs::CURLCreate(...) needed to call before GetPropertyValue!");
+      return "";
     }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Get the file size of an open file.
-    ///
-    /// @return                 The requested size. On error, the value -1 is
-    ///                         returned.
-    ///
-    int64_t GetLength()
+    std::vector<std::string> values = GetPropertyValues(type, name);
+    if (values.empty())
     {
-      if (!m_file)
-        return -1;
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_length(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+      return "";
     }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Checks the file access is on end position.
-    ///
-    /// @return                 If you've reached the end of the file, AtEnd() returns true.
-    ///
-    bool AtEnd()
-    {
-      if (!m_file)
-        return true;
-      int64_t length = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_length(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
-      int64_t position = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_position(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
-      return position >= length;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Close an open file.
-    ///
-    void Close()
-    {
-      if (!m_file)
-        return;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->close_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
-      m_file = nullptr;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Get the chunk size for an open file.
-    ///
-    /// @return                 The requested size. On error, the value -1 is
-    ///                         returned.
-    ///
-    int GetChunkSize()
-    {
-      if (!m_file)
-        return -1;
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_chunk_size(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief retrieve a file property
-    ///
-    /// @param[in] type         The type of the file property to retrieve the value for
-    /// @param[in] name         The name of a named property value (e.g. Header)
-    /// @return                 value of requested property, empty on failure / non-existance
-    ///
-    const std::string GetPropertyValue(FilePropertyTypes type, const std::string &name) const
+    return values[0];
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Retrieve file property values.
+  ///
+  /// @param[in] type The type of the file property values to retrieve the value for
+  /// @param[in] name The name of the named property (e.g. Header)
+  /// @return values of requested property, empty vector on failure / non-existance
+  ///
+  const std::vector<std::string> GetPropertyValues(FilePropertyTypes type,
+                                                   const std::string& name) const
+  {
+    using namespace kodi::addon;
+
+    if (!m_file)
     {
-      if (!m_file)
-      {
-        kodi::Log(ADDON_LOG_ERROR, "kodi::vfs::CURLCreate(...) needed to call before GetPropertyValue!");
-        return "";
-      }
-      std::vector<std::string> values = GetPropertyValues(type, name);
-      if (values.empty()) {
-        return "";
-      }
-      return values[0];
+      kodi::Log(ADDON_LOG_ERROR,
+                "kodi::vfs::CURLCreate(...) needed to call before GetPropertyValues!");
+      return std::vector<std::string>();
     }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief retrieve file property values
-    ///
-    /// @param[in] type         The type of the file property values to retrieve the value for
-    /// @param[in] name         The name of the named property (e.g. Header)
-    /// @return                 values of requested property, empty vector on failure / non-existance
-    ///
-    const std::vector<std::string> GetPropertyValues(FilePropertyTypes type, const std::string &name) const
+    int numValues = 0;
+    char** res(CAddonBase::m_interface->toKodi->kodi_filesystem->get_property_values(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file, type, name.c_str(), &numValues));
+    if (res)
     {
-      if (!m_file)
-      {
-        kodi::Log(ADDON_LOG_ERROR, "kodi::vfs::CURLCreate(...) needed to call before GetPropertyValues!");
-        return std::vector<std::string>();
-      }
-      int numValues;
-      char **res(::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_property_values(
-        ::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file, type, name.c_str(), &numValues));
-      if (res)
+      std::vector<std::string> vecReturn;
+      for (int i = 0; i < numValues; ++i)
       {
-        std::vector<std::string> vecReturn;
-        for (int i = 0; i < numValues; ++i)
-        {
-          vecReturn.emplace_back(res[i]);
-        }
-        ::kodi::addon::CAddonBase::m_interface->toKodi->free_string_array(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, res, numValues);
-        return vecReturn;
+        vecReturn.emplace_back(res[i]);
       }
-      return std::vector<std::string>();
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_vfs_CFile
-    /// @brief Get the current download speed of file if loaded from web.
-    ///
-    /// @return                 The current download speed.
-    ///
-    double GetFileDownloadSpeed()
-    {
-      if (!m_file)
-        return 0.0;
-      return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_download_speed(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, m_file);
+      CAddonBase::m_interface->toKodi->free_string_array(CAddonBase::m_interface->toKodi->kodiBase,
+                                                         res, numValues);
+      return vecReturn;
     }
-    //--------------------------------------------------------------------------
+    return std::vector<std::string>();
+  }
+  //--------------------------------------------------------------------------
 
-  private:
-    void* m_file = nullptr;
-  };
-  //@}
-  //----------------------------------------------------------------------------
+  //==========================================================================
+  /// @ingroup cpp_kodi_vfs_CFile
+  /// @brief Get the current download speed of file if loaded from web.
+  ///
+  /// @return The current download speed.
+  ///
+  double GetFileDownloadSpeed() const
+  {
+    using namespace kodi::addon;
+
+    if (!m_file)
+      return 0.0;
+    return CAddonBase::m_interface->toKodi->kodi_filesystem->get_file_download_speed(
+        CAddonBase::m_interface->toKodi->kodiBase, m_file);
+  }
+  //--------------------------------------------------------------------------
+
+private:
+  void* m_file = nullptr;
+};
+//@}
+//------------------------------------------------------------------------------
+
+//}}}
 
 } /* namespace vfs */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
index 999ff6a..878eaa4 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
@@ -9,68 +9,9 @@
 #pragma once
 
 #include "AddonBase.h"
+#include "c-api/general.h"
 
-/*
- * For interface between add-on and kodi.
- *
- * This structure defines the addresses of functions stored inside Kodi which
- * are then available for the add-on to call
- *
- * All function pointers there are used by the C++ interface functions below.
- * You find the set of them on xbmc/addons/interfaces/General.cpp
- *
- * Note: For add-on development itself this is not needed
- */
-typedef struct AddonToKodiFuncTable_kodi
-{
-  char* (*get_addon_info)(void* kodiBase, const char* id);
-  bool (*open_settings_dialog)(void* kodiBase);
-  char* (*unknown_to_utf8)(void* kodiBase, const char* source, bool* ret, bool failOnBadChar);
-  char* (*get_localized_string)(void* kodiBase, long label_id);
-  char* (*get_language)(void* kodiBase, int format, bool region);
-  bool (*queue_notification)(void* kodiBase, int type, const char* header, const char* message, const char* imageFile, unsigned int displayTime, bool withSound, unsigned int messageTime);
-  void (*get_md5)(void* kodiBase, const char* text, char* md5);
-  char* (*get_temp_path)(void* kodiBase);
-  char* (*get_region)(void* kodiBase, const char* id);
-  void (*get_free_mem)(void* kodiBase, long* free, long* total, bool as_bytes);
-  int  (*get_global_idle_time)(void* kodiBase);
-  void (*kodi_version)(void* kodiBase, char** compile_name, int* major, int* minor, char** revision, char** tag, char** tagversion);
-  char* (*get_current_skin_id)(void* kodiBase);
-} AddonToKodiFuncTable_kodi;
-
-//==============================================================================
-/// \ingroup cpp_kodi_Defs
-/// @brief For kodi::QueueNotification() used message types
-///
-typedef enum QueueMsg
-{
-  /// Show info notification message
-  QUEUE_INFO,
-  /// Show warning notification message
-  QUEUE_WARNING,
-  /// Show error notification message
-  QUEUE_ERROR,
-  /// Show with own given image and parts if set on values
-  QUEUE_OWN_STYLE
-} QueueMsg;
-//------------------------------------------------------------------------------
-
-//==============================================================================
-/// \ingroup cpp_kodi_Defs
-/// @brief Format codes to get string from them.
-///
-/// Used on kodi::GetLanguage().
-///
-typedef enum LangFormats
-{
-  /// two letter code as defined in ISO 639-1
-  LANG_FMT_ISO_639_1,
-  /// three letter code as defined in ISO 639-2/T or ISO 639-2/B
-  LANG_FMT_ISO_639_2,
-  /// full language name in English
-  LANG_FMT_ENGLISH_NAME
-} LangFormats;
-//------------------------------------------------------------------------------
+#ifdef __cplusplus
 
 //==============================================================================
 /// \ingroup cpp_kodi_Defs
@@ -93,9 +34,10 @@ typedef struct kodi_version_t
 } kodi_version_t;
 //------------------------------------------------------------------------------
 
+namespace kodi
+{
+
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Returns the value of an addon property as a string
 ///
@@ -121,9 +63,11 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline std::string GetAddonInfo(const std::string& id)
+inline std::string ATTRIBUTE_HIDDEN GetAddonInfo(const std::string& id)
 {
-  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+  using namespace kodi::addon;
+
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
 
   std::string strReturn;
   char* strMsg = toKodi->kodi->get_addon_info(toKodi->kodiBase, id.c_str());
@@ -135,12 +79,9 @@ inline std::string GetAddonInfo(const std::string& id)
   }
   return strReturn;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Opens this Add-Ons settings dialog.
 ///
@@ -157,16 +98,15 @@ namespace kodi {
 /// ..
 /// ~~~~~~~~~~~~~
 ///
-inline bool OpenSettings()
+inline bool ATTRIBUTE_HIDDEN OpenSettings()
 {
-  return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->open_settings_dialog(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
+  using namespace kodi::addon;
+  return CAddonBase::m_interface->toKodi->kodi->open_settings_dialog(
+      CAddonBase::m_interface->toKodi->kodiBase);
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Returns an addon's localized 'unicode string'.
 ///
@@ -193,24 +133,25 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline std::string GetLocalizedString(uint32_t labelId, const std::string& defaultStr = "")
+inline std::string ATTRIBUTE_HIDDEN GetLocalizedString(uint32_t labelId,
+                                                       const std::string& defaultStr = "")
 {
+  using namespace kodi::addon;
+
   std::string retString = defaultStr;
-  char* strMsg = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->get_localized_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, labelId);
+  char* strMsg = CAddonBase::m_interface->toKodi->kodi->get_localized_string(
+      CAddonBase::m_interface->toKodi->kodiBase, labelId);
   if (strMsg != nullptr)
   {
     if (std::strlen(strMsg))
       retString = strMsg;
-    ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, strMsg);
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, strMsg);
   }
   return retString;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Translate a string with an unknown encoding to UTF8.
 ///
@@ -232,25 +173,27 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline bool UnknownToUTF8(const std::string& stringSrc, std::string& utf8StringDst, bool failOnBadChar = false)
+inline bool ATTRIBUTE_HIDDEN UnknownToUTF8(const std::string& stringSrc,
+                                           std::string& utf8StringDst,
+                                           bool failOnBadChar = false)
 {
+  using namespace kodi::addon;
+
   bool ret = false;
-  char* retString = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->unknown_to_utf8(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                          stringSrc.c_str(), &ret, failOnBadChar);
+  char* retString = CAddonBase::m_interface->toKodi->kodi->unknown_to_utf8(
+      CAddonBase::m_interface->toKodi->kodiBase, stringSrc.c_str(), &ret, failOnBadChar);
   if (retString != nullptr)
   {
     if (ret)
       utf8StringDst = retString;
-    ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, retString);
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
   }
   return ret;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Returns the active language as a string.
 ///
@@ -274,24 +217,26 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline std::string GetLanguage(LangFormats format = LANG_FMT_ENGLISH_NAME, bool region = false)
+inline std::string ATTRIBUTE_HIDDEN GetLanguage(LangFormats format = LANG_FMT_ENGLISH_NAME,
+                                                bool region = false)
 {
+  using namespace kodi::addon;
+
   std::string language;
-  char* retString = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->get_language(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, format, region);
+  char* retString = CAddonBase::m_interface->toKodi->kodi->get_language(
+      CAddonBase::m_interface->toKodi->kodiBase, format, region);
   if (retString != nullptr)
   {
     if (std::strlen(retString))
       language = retString;
-    ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, retString);
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 retString);
   }
   return language;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Writes the C string pointed by format in the GUI. If format includes
 /// format specifiers (subsequences beginning with %), the additional arguments
@@ -367,22 +312,21 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline void QueueFormattedNotification(QueueMsg type, const char* format, ... )
+inline void ATTRIBUTE_HIDDEN QueueFormattedNotification(QueueMsg type, const char* format, ...)
 {
+  using namespace kodi::addon;
+
   va_list args;
   char buffer[16384];
   va_start(args, format);
   vsprintf(buffer, format, args);
   va_end(args);
-  ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->queue_notification(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase,
-                                                                           type, "", buffer, "", 5000, false, 1000);
+  CAddonBase::m_interface->toKodi->kodi->queue_notification(
+      CAddonBase::m_interface->toKodi->kodiBase, type, "", buffer, "", 5000, false, 1000);
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Queue a notification in the GUI.
 ///
@@ -427,21 +371,23 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline void QueueNotification(QueueMsg type, const std::string& header,
-                              const std::string& message, const std::string& imageFile = "",
-                              unsigned int displayTime = 5000, bool withSound = true,
-                              unsigned int messageTime = 1000)
+inline void ATTRIBUTE_HIDDEN QueueNotification(QueueMsg type,
+                                               const std::string& header,
+                                               const std::string& message,
+                                               const std::string& imageFile = "",
+                                               unsigned int displayTime = 5000,
+                                               bool withSound = true,
+                                               unsigned int messageTime = 1000)
 {
-  ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->queue_notification(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase,
-                                                                           type, header.c_str(), message.c_str(), imageFile.c_str(), displayTime,
-                                                                           withSound, messageTime);
+  using namespace kodi::addon;
+
+  CAddonBase::m_interface->toKodi->kodi->queue_notification(
+      CAddonBase::m_interface->toKodi->kodiBase, type, header.c_str(), message.c_str(),
+      imageFile.c_str(), displayTime, withSound, messageTime);
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Get the MD5 digest of the given text
 ///
@@ -460,20 +406,20 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline std::string GetMD5(const std::string& text)
+inline std::string ATTRIBUTE_HIDDEN GetMD5(const std::string& text)
 {
-  char* md5ret = static_cast<char*>(malloc(40*sizeof(char))); // md5 size normally 32 bytes
-  ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->get_md5(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, text.c_str(), md5ret);
+  using namespace kodi::addon;
+
+  char* md5ret = static_cast<char*>(malloc(40 * sizeof(char))); // md5 size normally 32 bytes
+  CAddonBase::m_interface->toKodi->kodi->get_md5(CAddonBase::m_interface->toKodi->kodiBase,
+                                                 text.c_str(), md5ret);
   std::string md5 = md5ret;
   free(md5ret);
   return md5;
 }
-} /* namespace kodi */
 //----------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief To get a temporary path for the addon
 ///
@@ -484,15 +430,17 @@ namespace kodi {
 /// @param[in] append A string to append to returned temporary path
 /// @return Individual path for the addon
 ///
-inline std::string GetTempAddonPath(const std::string& append = "")
+inline std::string ATTRIBUTE_HIDDEN GetTempAddonPath(const std::string& append = "")
 {
-  char* str = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->get_temp_path(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
+  using namespace kodi::addon;
+
+  char* str = CAddonBase::m_interface->toKodi->kodi->get_temp_path(
+      CAddonBase::m_interface->toKodi->kodiBase);
   std::string ret = str;
-  ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, str);
+  CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, str);
   if (!append.empty())
   {
-    if (append.at(0) != '\\' &&
-        append.at(0) != '/')
+    if (append.at(0) != '\\' && append.at(0) != '/')
 #ifdef TARGET_WINDOWS
       ret.append("\\");
 #else
@@ -502,12 +450,9 @@ inline std::string GetTempAddonPath(const std::string& append = "")
   }
   return ret;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Returns your regions setting as a string for the specified id
 ///
@@ -530,9 +475,11 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline std::string GetRegion(const std::string& id)
+inline std::string ATTRIBUTE_HIDDEN GetRegion(const std::string& id)
 {
-  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+  using namespace kodi::addon;
+
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
 
   std::string strReturn;
   char* strMsg = toKodi->kodi->get_region(toKodi->kodiBase, id.c_str());
@@ -544,12 +491,9 @@ inline std::string GetRegion(const std::string& id)
   }
   return strReturn;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Returns the amount of free memory in MByte (or as bytes) as an long
 /// integer
@@ -572,19 +516,18 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline void GetFreeMem(long& free, long& total, bool asBytes = false)
+inline void ATTRIBUTE_HIDDEN GetFreeMem(long& free, long& total, bool asBytes = false)
 {
+  using namespace kodi::addon;
+
   free = -1;
   total = -1;
-  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
   toKodi->kodi->get_free_mem(toKodi->kodiBase, &free, &total, asBytes);
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Returns the elapsed idle time in seconds as an integer
 ///
@@ -601,20 +544,18 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline int GetGlobalIdleTime()
+inline int ATTRIBUTE_HIDDEN GetGlobalIdleTime()
 {
-  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+  using namespace kodi::addon;
+
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
   return toKodi->kodi->get_global_idle_time(toKodi->kodiBase);
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
-///
 /// \ingroup cpp_kodi
 /// @brief Get the currently used skin identification name from Kodi
-///-----------------------------------------------------------------------
 ///
 /// @return The active skin id name as a string
 ///
@@ -633,9 +574,11 @@ namespace kodi {
 /// ..
 /// ~~~~~~~~~~~~~
 ///
-inline std::string GetCurrentSkinId()
+inline std::string ATTRIBUTE_HIDDEN GetCurrentSkinId()
 {
-  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+  using namespace kodi::addon;
+
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
 
   std::string strReturn;
   char* strMsg = toKodi->kodi->get_current_skin_id(toKodi->kodiBase);
@@ -647,12 +590,50 @@ inline std::string GetCurrentSkinId()
   }
   return strReturn;
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
 
 //==============================================================================
-namespace kodi {
+/// @brief To check another addon is available and usable inside Kodi.
+///
+/// @param[in] id The wanted addon identification string to check
+/// @param[out] version Version string of addon if **installed** inside Kodi
+/// @param[out] enabled Set to true <b>`true* </b> if addon is enabled
+/// @return Returns <b>`true* </b> if addon is installed
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
 ///
+/// bool enabled = false;
+/// std::string version;
+/// bool ret = kodi::IsAddonAvailable("inputstream.adaptive", version, enabled);
+/// fprintf(stderr, "Available inputstream.adaptive version '%s' and enabled '%s'\n",
+///            ret ? version.c_str() : "not installed", enabled ? "yes" : "no");
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN IsAddonAvailable(const std::string& id,
+                                              std::string& version,
+                                              bool& enabled)
+{
+  using namespace kodi::addon;
+
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
+
+  char* cVersion = nullptr;
+  bool ret = toKodi->kodi->is_addon_avilable(toKodi->kodiBase, id.c_str(), &cVersion, &enabled);
+  if (cVersion)
+  {
+    version = cVersion;
+    toKodi->free_string(toKodi->kodiBase, cVersion);
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
 /// \ingroup cpp_kodi
 /// @brief Get current Kodi informations and versions, returned data from the following
 /// <b><tt>kodi_version_t version; kodi::KodiVersion(version);</tt></b>
@@ -691,23 +672,22 @@ namespace kodi {
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-inline void KodiVersion(kodi_version_t& version)
+inline void ATTRIBUTE_HIDDEN KodiVersion(kodi_version_t& version)
 {
+  using namespace kodi::addon;
+
   char* compile_name = nullptr;
   char* revision = nullptr;
   char* tag = nullptr;
   char* tag_revision = nullptr;
 
-  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
-  toKodi->kodi->kodi_version(toKodi->kodiBase, &compile_name, &version.major, &version.minor, &revision, &tag, &tag_revision);
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
+  toKodi->kodi->kodi_version(toKodi->kodiBase, &compile_name, &version.major, &version.minor,
+                             &revision, &tag, &tag_revision);
   if (compile_name != nullptr)
   {
-    version.compile_name  = compile_name;
-    toKodi->free_string
-    (
-      toKodi->kodiBase,
-      compile_name
-    );
+    version.compile_name = compile_name;
+    toKodi->free_string(toKodi->kodiBase, compile_name);
   }
   if (revision != nullptr)
   {
@@ -725,5 +705,130 @@ inline void KodiVersion(kodi_version_t& version)
     toKodi->free_string(toKodi->kodiBase, tag_revision);
   }
 }
-} /* namespace kodi */
 //------------------------------------------------------------------------------
+
+//==============================================================================
+/// \ingroup cpp_kodi
+/// @brief To get keyboard layout characters
+///
+/// This is used to get the keyboard layout currently used from Kodi by the
+/// there set language.
+///
+/// @param[in] modifierKey the key to define the needed layout (uppercase, symbols...)
+/// @param[out] layout_name name of used layout
+/// @param[out] layout list of selected keyboard layout
+/// @return true if request successed
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// std::string layout_name;
+/// std::vector<std::vector<std::string>> layout;
+/// kodi::GetKeyboardLayout(STD_KB_MODIFIER_KEY_SHIFT | STD_KB_MODIFIER_KEY_SYMBOL, layout_name, layout);
+/// fprintf(stderr, "Layout: '%s'\n", layout_name.c_str());
+/// for (unsigned int row = 0; row < STD_KB_BUTTONS_MAX_ROWS; row++)
+/// {
+///   for (unsigned int column = 0; column < STD_KB_BUTTONS_PER_ROW; column++)
+///   {
+///     fprintf(stderr, " - Row: '%02i'; Column: '%02i'; Text: '%s'\n", row, column, layout[row][column].c_str());
+///   }
+/// }
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN GetKeyboardLayout(int modifierKey,
+                                               std::string& layout_name,
+                                               std::vector<std::vector<std::string>>& layout)
+{
+  using namespace kodi::addon;
+
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
+  AddonKeyboardKeyTable c_layout;
+  char* c_layout_name = nullptr;
+  bool ret =
+      toKodi->kodi->get_keyboard_layout(toKodi->kodiBase, &c_layout_name, modifierKey, &c_layout);
+  if (ret)
+  {
+    if (c_layout_name)
+    {
+      layout_name = c_layout_name;
+      toKodi->free_string(toKodi->kodiBase, c_layout_name);
+    }
+
+    layout.resize(STD_KB_BUTTONS_MAX_ROWS);
+    for (unsigned int row = 0; row < STD_KB_BUTTONS_MAX_ROWS; row++)
+    {
+      layout[row].resize(STD_KB_BUTTONS_PER_ROW);
+      for (unsigned int column = 0; column < STD_KB_BUTTONS_PER_ROW; column++)
+      {
+        char* button = c_layout.keys[row][column];
+        if (button)
+        {
+          layout[row][column] = button;
+          toKodi->free_string(toKodi->kodiBase, button);
+        }
+      }
+    }
+  }
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+//==============================================================================
+/// \ingroup cpp_kodi
+/// @brief To change keyboard layout characters
+///
+/// This is used to change the keyboard layout currently used from Kodi
+///
+/// @param[out] layout_name new name of used layout (input string not used!)
+/// @return true if request successed
+///
+/// @note \ref GetKeyboardLayout must be called afterwards.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// std::string layout_name;
+/// kodi::ChangeKeyboardLayout(layout_name);
+///
+/// std::vector<std::vector<std::string>> layout;
+/// kodi::GetKeyboardLayout(STD_KB_MODIFIER_KEY_SHIFT | STD_KB_MODIFIER_KEY_SYMBOL, layout_name, layout);
+/// fprintf(stderr, "Layout: '%s'\n", layout_name.c_str());
+/// for (unsigned int row = 0; row < STD_KB_BUTTONS_MAX_ROWS; row++)
+/// {
+///   for (unsigned int column = 0; column < STD_KB_BUTTONS_PER_ROW; column++)
+///   {
+///     fprintf(stderr, " - Row: '%02i'; Column: '%02i'; Text: '%s'\n", row, column, layout[row][column].c_str());
+///   }
+/// }
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN ChangeKeyboardLayout(std::string& layout_name)
+{
+  using namespace kodi::addon;
+
+  AddonToKodiFuncTable_Addon* toKodi = CAddonBase::m_interface->toKodi;
+  char* c_layout_name = nullptr;
+  bool ret = toKodi->kodi->change_keyboard_layout(toKodi->kodiBase, &c_layout_name);
+  if (c_layout_name)
+  {
+    layout_name = c_layout_name;
+    toKodi->free_string(toKodi->kodiBase, c_layout_name);
+  }
+
+  return ret;
+}
+//------------------------------------------------------------------------------
+
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h
index 73390c4..910385f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Network.h
@@ -9,35 +9,17 @@
 #pragma once
 
 #include "AddonBase.h"
+#include "c-api/network.h"
 
-/*
- * For interface between add-on and kodi.
- *
- * This structure defines the addresses of functions stored inside Kodi which
- * are then available for the add-on to call
- *
- * All function pointers there are used by the C++ interface functions below.
- * You find the set of them on xbmc/addons/interfaces/General.cpp
- *
- * Note: For add-on development itself this is not needed
- */
-typedef struct AddonToKodiFuncTable_kodi_network
-{
-  bool (*wake_on_lan)(void* kodiBase, const char *mac);
-  char* (*get_ip_address)(void* kodiBase);
-  char* (*dns_lookup)(void* kodiBase, const char* url, bool* ret);
-  char* (*url_encode)(void* kodiBase, const char* url);
-} AddonToKodiFuncTable_kodi_network;
+#ifdef __cplusplus
 
 //==============================================================================
-///
-/// \defgroup cpp_kodi_network  Interface - kodi::network
-/// \ingroup cpp
-/// @brief **Network functions**
-///
+/// @defgroup cpp_kodi_network  Interface - kodi::network
+/// @ingroup cpp
+/// @brief **Network functions**\n
 /// The network module offers functions that allow you to control it.
 ///
-/// It has the header \ref Network.h "#include <kodi/Network.h>" be included
+/// It has the header @ref Network.h "#include <kodi/Network.h>" be included
 /// to enjoy it.
 ///
 //------------------------------------------------------------------------------
@@ -47,130 +29,254 @@ namespace kodi
 namespace network
 {
 
-  //============================================================================
-  ///
-  /// \ingroup cpp_kodi_network
-  /// @brief Send WakeOnLan magic packet.
-  ///
-  /// @param[in] mac Network address of the host to wake.
-  /// @return True if the magic packet was successfully sent, false otherwise.
-  ///
-  inline bool WakeOnLan(const std::string& mac)
+//============================================================================
+/// @ingroup cpp_kodi_network
+/// @brief Send WakeOnLan magic packet.
+///
+/// @param[in] mac Network address of the host to wake.
+/// @return True if the magic packet was successfully sent, false otherwise.
+///
+inline bool ATTRIBUTE_HIDDEN WakeOnLan(const std::string& mac)
+{
+  using namespace ::kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_network->wake_on_lan(
+      CAddonBase::m_interface->toKodi->kodiBase, mac.c_str());
+}
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_network
+/// @brief To the current own ip address as a string.
+///
+/// @return Own system ip.
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Network.h>
+/// ...
+/// std::string ipAddress = kodi::network::GetIPAddress();
+/// fprintf(stderr, "My IP is '%s'\n", ipAddress.c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN GetIPAddress()
+{
+  using namespace ::kodi::addon;
+
+  std::string ip;
+  char* string = CAddonBase::m_interface->toKodi->kodi_network->get_ip_address(
+      CAddonBase::m_interface->toKodi->kodiBase);
+  if (string != nullptr)
   {
-    return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_network->wake_on_lan(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, mac.c_str());
+    ip = string;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, string);
   }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// \ingroup cpp_kodi_network
-  /// @brief To the current own ip address as a string.
-  ///
-  /// @return Own system ip.
-  ///
-  ///
-  /// ------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Network.h>
-  /// ...
-  /// std::string ipAddress = kodi::network::GetIPAddress();
-  /// fprintf(stderr, "My IP is '%s'\n", ipAddress.c_str());
-  /// ...
-  /// ~~~~~~~~~~~~~
-  ///
-  inline std::string GetIPAddress()
+  return ip;
+}
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_network
+/// @brief Return our hostname.
+///
+/// @return String about hostname, empty in case of error
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Network.h>
+/// ...
+/// std::string hostname = kodi::network::GetHostname();
+/// fprintf(stderr, "My hostname is '%s'\n", hostname.c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline std::string ATTRIBUTE_HIDDEN GetHostname()
+{
+  using namespace ::kodi::addon;
+
+  std::string ip;
+  char* string = CAddonBase::m_interface->toKodi->kodi_network->get_hostname(
+      CAddonBase::m_interface->toKodi->kodiBase);
+  if (string != nullptr)
   {
-    std::string ip;
-    char* string = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_network->get_ip_address(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase);
-    if (string != nullptr)
-    {
-      ip = string;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, string);
-    }
-    return ip;
+    ip = string;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, string);
   }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// \ingroup cpp_kodi_network
-  /// @brief URL encodes the given string
-  ///
-  /// This function converts the given input string to a URL encoded string and
-  /// returns that as a new allocated string. All input characters that are
-  /// not a-z, A-Z, 0-9, '-', '.', '_' or '~' are converted to their "URL escaped"
-  /// version (%NN where NN is a two-digit hexadecimal number).
-  ///
-  /// @param[in] url The code of the message to get.
-  /// @return Encoded URL string
-  ///
-  ///
-  /// ------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Network.h>
-  /// ...
-  /// std::string encodedUrl = kodi::network::URLEncode("François");
-  /// fprintf(stderr, "Encoded URL is '%s'\n", encodedUrl.c_str());
-  /// ...
-  /// ~~~~~~~~~~~~~
-  /// For example, the string: François ,would be encoded as: Fran%C3%A7ois
-  ///
-  inline std::string URLEncode(const std::string& url)
+  return ip;
+}
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_network
+/// @brief Returns Kodi's HTTP UserAgent string.
+///
+/// @return HTTP user agent
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.py}
+/// ..
+/// std::string agent = kodi::network::GetUserAgent()
+/// ..
+/// ~~~~~~~~~~~~~
+///
+/// example output:
+///   Kodi/19.0-ALPHA1 (X11; Linux x86_64) Ubuntu/20.04 App_Bitness/64 Version/19.0-ALPHA1-Git:20200522-0076d136d3-dirty
+///
+inline std::string ATTRIBUTE_HIDDEN GetUserAgent()
+{
+  using namespace ::kodi::addon;
+
+  std::string agent;
+  char* string = CAddonBase::m_interface->toKodi->kodi_network->get_user_agent(
+      CAddonBase::m_interface->toKodi->kodiBase);
+  if (string != nullptr)
   {
-    std::string retString;
-    char* string = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_network->url_encode(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, url.c_str());
-    if (string != nullptr)
-    {
-      retString = string;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, string);
-    }
-    return retString;
+    agent = string;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, string);
   }
-  //----------------------------------------------------------------------------
-
-  //============================================================================
-  ///
-  /// \ingroup cpp_kodi_network
-  /// @brief Lookup URL in DNS cache
-  ///
-  /// This test will get DNS record for a domain. The DNS lookup is done directly
-  /// against the domain's authoritative name server, so changes to DNS Records
-  /// should show up instantly. By default, the DNS lookup tool will return an
-  /// IP address if you give it a name (e.g. www.example.com)
-  ///
-  /// @param[in] hostName   The code of the message to get.
-  /// @param[out] ipAddress Returned address
-  /// @return true if successfull
-  ///
-  ///
-  /// ------------------------------------------------------------------------
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/Network.h>
-  /// ...
-  /// std::string ipAddress;
-  /// bool ret = kodi::network::DNSLookup("www.google.com", ipAddress);
-  /// fprintf(stderr, "DNSLookup returned for www.google.com the IP '%s', call was %s\n", ipAddress.c_str(), ret ? "ok" : "failed");
-  /// ...
-  /// ~~~~~~~~~~~~~
-  ///
-  inline bool DNSLookup(const std::string& hostName, std::string& ipAddress)
+  return agent;
+}
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_network
+/// @brief Check given name or ip address corresponds to localhost.
+///
+/// @param[in] hostname Hostname to check
+/// @return Return true if given name or ip address corresponds to localhost
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Network.h>
+/// ...
+/// if (kodi::network::IsLocalHost("127.0.0.1"))
+///   fprintf(stderr, "Is localhost\n");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN IsLocalHost(const std::string& hostname)
+{
+  using namespace ::kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_network->is_local_host(
+      CAddonBase::m_interface->toKodi->kodiBase, hostname.c_str());
+}
+//----------------------------------------------------------------------------
+
+//==============================================================================
+/// @ingroup cpp_kodi_network
+/// @brief Checks whether the specified path refers to a local network.
+///
+/// @param[in] hostname Hostname to check
+/// @param[in] offLineCheck Check if in private range, see https://en.wikipedia.org/wiki/Private_network
+/// @return True if host is on a LAN, false otherwise
+///
+inline bool ATTRIBUTE_HIDDEN IsHostOnLAN(const std::string& hostname, bool offLineCheck = false)
+{
+  using namespace kodi::addon;
+
+  return CAddonBase::m_interface->toKodi->kodi_network->is_host_on_lan(
+      CAddonBase::m_interface->toKodi->kodiBase, hostname.c_str(), offLineCheck);
+}
+//------------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_network
+/// @brief URL encodes the given string
+///
+/// This function converts the given input string to a URL encoded string and
+/// returns that as a new allocated string. All input characters that are
+/// not a-z, A-Z, 0-9, '-', '.', '_' or '~' are converted to their "URL escaped"
+/// version (%NN where NN is a two-digit hexadecimal number).
+///
+/// @param[in] url The code of the message to get.
+/// @return Encoded URL string
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Network.h>
+/// ...
+/// std::string encodedUrl = kodi::network::URLEncode("François");
+/// fprintf(stderr, "Encoded URL is '%s'\n", encodedUrl.c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+/// For example, the string: François ,would be encoded as: Fran%C3%A7ois
+///
+inline std::string ATTRIBUTE_HIDDEN URLEncode(const std::string& url)
+{
+  using namespace ::kodi::addon;
+
+  std::string retString;
+  char* string = CAddonBase::m_interface->toKodi->kodi_network->url_encode(
+      CAddonBase::m_interface->toKodi->kodiBase, url.c_str());
+  if (string != nullptr)
+  {
+    retString = string;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, string);
+  }
+  return retString;
+}
+//----------------------------------------------------------------------------
+
+//============================================================================
+/// @ingroup cpp_kodi_network
+/// @brief Lookup URL in DNS cache
+///
+/// This test will get DNS record for a domain. The DNS lookup is done directly
+/// against the domain's authoritative name server, so changes to DNS Records
+/// should show up instantly. By default, the DNS lookup tool will return an
+/// IP address if you give it a name (e.g. www.example.com)
+///
+/// @param[in] hostName   The code of the message to get.
+/// @param[out] ipAddress Returned address
+/// @return true if successfull
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/Network.h>
+/// ...
+/// std::string ipAddress;
+/// bool ret = kodi::network::DNSLookup("www.google.com", ipAddress);
+/// fprintf(stderr, "DNSLookup returned for www.google.com the IP '%s', call was %s\n", ipAddress.c_str(), ret ? "ok" : "failed");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline bool ATTRIBUTE_HIDDEN DNSLookup(const std::string& hostName, std::string& ipAddress)
+{
+  using namespace ::kodi::addon;
+
+  bool ret = false;
+  char* string = CAddonBase::m_interface->toKodi->kodi_network->dns_lookup(
+      CAddonBase::m_interface->toKodi->kodiBase, hostName.c_str(), &ret);
+  if (string != nullptr)
   {
-    bool ret = false;
-    char* string = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_network->dns_lookup(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, hostName.c_str(), &ret);
-    if (string != nullptr)
-    {
-      ipAddress = string;
-      ::kodi::addon::CAddonBase::m_interface->toKodi->free_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, string);
-    }
-    return ret;
+    ipAddress = string;
+    CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, string);
   }
-  //----------------------------------------------------------------------------
+  return ret;
+}
+//----------------------------------------------------------------------------
 
 } /* namespace network */
 } /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h
index 729cdc0..e030371 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h
@@ -8,15 +8,119 @@
 
 #pragma once
 
-enum STREAMCODEC_PROFILE
+#ifdef __cplusplus
+extern "C"
 {
-  CodecProfileUnknown = 0,
-  CodecProfileNotNeeded,
-  H264CodecProfileBaseline,
-  H264CodecProfileMain,
-  H264CodecProfileExtended,
-  H264CodecProfileHigh,
-  H264CodecProfileHigh10,
-  H264CodecProfileHigh422,
-  H264CodecProfileHigh444Predictive
-};
+#endif /* __cplusplus */
+
+  //==============================================================================
+  /// @ingroup cpp_kodi_addon_videocodec_Defs_VIDEOCODEC_INITDATA
+  /// @brief The standard defines several sets of capabilities, which are referred
+  /// to as profiles, targeting specific classes of applications.
+  //@{
+  enum STREAMCODEC_PROFILE
+  {
+    /// @brief Unknown codec profile
+    CodecProfileUnknown = 0,
+
+    /// @brief If a codec profile is not required
+    CodecProfileNotNeeded,
+
+    /// @brief **H264** Baseline Profile (BP, 66)
+    ///
+    /// Primarily for low-cost applications that require additional data loss
+    /// robustness, this profile is used in some videoconferencing and mobile
+    /// applications. This profile includes all features that are supported
+    /// in the Constrained Baseline Profile, plus three additional features
+    /// that can be used for loss robustness (or for other purposes such as
+    /// low-delay multi-point video stream compositing). The importance of
+    /// this profile has faded somewhat since the definition of the Constrained
+    /// Baseline Profile in 2009. All Constrained Baseline Profile bitstreams
+    /// are also considered to be Baseline Profile bitstreams, as these two
+    /// profiles share the same profile identifier code value.
+    H264CodecProfileBaseline,
+
+    /// @brief **H264** Main Profile (MP, 77)
+    ///
+    /// This profile is used for standard-definition digital TV broadcasts that
+    /// use the MPEG-4 format as defined in the
+    /// [DVB standard](http://www.etsi.org/deliver/etsi_ts/101100_101199/101154/01.09.01_60/ts_101154v010901p.pdf).
+    /// It is not, however, used for high-definition television broadcasts, as the
+    /// importance of this profile faded when the High Profile was developed
+    /// in 2004 for that application.
+    H264CodecProfileMain,
+
+    /// @brief **H264** Extended Profile (XP, 88)
+    ///
+    /// Intended as the streaming video profile, this profile has relatively high
+    /// compression capability and some extra tricks for robustness to data losses
+    /// and server stream switching.
+    H264CodecProfileExtended,
+
+    /// @brief **H264** High Profile (HiP, 100)
+    ///
+    /// The primary profile for broadcast and disc storage applications,
+    /// particularly for high-definition television applications (for example,
+    /// this is the profile adopted by the [Blu-ray Disc](https://en.wikipedia.org/wiki/Blu-ray_Disc)
+    /// storage format and the [DVB](https://en.wikipedia.org/wiki/Digital_Video_Broadcasting)
+    /// HDTV broadcast service).
+    H264CodecProfileHigh,
+
+    /// @brief **H264** High 10 Profile (Hi10P, 110)
+    ///
+    /// Going beyond typical mainstream consumer product capabilities, this
+    /// profile builds on top of the High Profile, adding support for up to 10
+    /// bits per sample of decoded picture precision.
+    H264CodecProfileHigh10,
+
+    /// @brief **H264** High 4:2:2 Profile (Hi422P, 122)
+    ///
+    /// Primarily targeting professional applications that use interlaced video,
+    /// this profile builds on top of the High 10 Profile, adding support for the
+    /// 4:2:2 chroma sampling format while using up to 10 bits per sample of
+    /// decoded picture precision.
+    H264CodecProfileHigh422,
+
+    /// @brief **H264** High 4:4:4 Predictive Profile (Hi444PP, 244)
+    ///
+    /// This profile builds on top of the High 4:2:2 Profile, supporting up to
+    /// 4:4:4 chroma sampling, up to 14 bits per sample, and additionally
+    /// supporting efficient lossless region coding and the coding of each
+    /// picture as three separate color planes.
+    H264CodecProfileHigh444Predictive,
+
+    /// @brief **VP9** profile 0
+    ///
+    /// There are several variants of the VP9 format (known as "coding profiles"),
+    /// which successively allow more features; profile 0 is the basic variant,
+    /// requiring the least from a hardware implementation.
+    ///
+    /// [Color depth](https://en.wikipedia.org/wiki/Color_depth): 8 bit/sample,
+    /// [chroma subsampling](https://en.wikipedia.org/wiki/Chroma_subsampling): 4:2:0
+    VP9CodecProfile0 = 20,
+
+    /// @brief **VP9** profile 1
+    ///
+    /// [Color depth](https://en.wikipedia.org/wiki/Color_depth): 8 bit,
+    /// [chroma subsampling](https://en.wikipedia.org/wiki/Chroma_subsampling): 4:2:0, 4:2:2, 4:4:4
+    VP9CodecProfile1,
+
+    /// @brief **VP9** profile 2
+    ///
+    /// [Color depth](https://en.wikipedia.org/wiki/Color_depth): 10–12 bit,
+    /// [chroma subsampling](https://en.wikipedia.org/wiki/Chroma_subsampling): 4:2:0
+    VP9CodecProfile2,
+
+    /// @brief **VP9** profile 3
+    ///
+    /// [Color depth](https://en.wikipedia.org/wiki/Color_depth): 10–12 bit,
+    /// [chroma subsampling](https://en.wikipedia.org/wiki/Chroma_subsampling): 4:2:0, 4:2:2, 4:4:4,
+    /// see [VP9 Bitstream & Decoding Process Specification](https://storage.googleapis.com/downloads.webmproject.org/docs/vp9/vp9-bitstream-specification-v0.6-20160331-draft.pdf)
+    VP9CodecProfile3,
+  };
+  //@}
+  //------------------------------------------------------------------------------
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h
index dcb7896..8008aa1 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h
@@ -8,19 +8,35 @@
 
 #pragma once
 
-typedef struct CRYPTO_INFO
+#include <inttypes.h>
+#include <string.h>
+
+#define STREAMCRYPTO_VERSION_LEVEL 1
+
+#ifdef __cplusplus
+extern "C"
 {
-  enum CRYPTO_KEY_SYSTEM : uint8_t
+#endif /* __cplusplus */
+
+  typedef struct CRYPTO_INFO
   {
-    CRYPTO_KEY_SYSTEM_NONE = 0,
-    CRYPTO_KEY_SYSTEM_WIDEVINE,
-    CRYPTO_KEY_SYSTEM_PLAYREADY,
-    CRYPTO_KEY_SYSTEM_COUNT
-  } m_CryptoKeySystem;                 /*!< @brief keysystem for encrypted media, KEY_SYSTEM_NONE for unencrypted media */
-
-  static const uint8_t FLAG_SECURE_DECODER = 1; /*!< @brief is set in flags if decoding has to be done in TEE environment */
-
-  uint8_t flags;
-  uint16_t m_CryptoSessionIdSize;      /*!< @brief The size of the crypto session key id */
-  const char *m_CryptoSessionId;       /*!< @brief The crypto session key id */
-} CRYPTO_INFO;
+    enum CRYPTO_KEY_SYSTEM : uint8_t
+    {
+      CRYPTO_KEY_SYSTEM_NONE = 0,
+      CRYPTO_KEY_SYSTEM_WIDEVINE,
+      CRYPTO_KEY_SYSTEM_PLAYREADY,
+      CRYPTO_KEY_SYSTEM_WISEPLAY,
+      CRYPTO_KEY_SYSTEM_COUNT
+    } m_CryptoKeySystem; /*!< @brief keysystem for encrypted media, KEY_SYSTEM_NONE for unencrypted media */
+
+    static const uint8_t FLAG_SECURE_DECODER =
+        1; /*!< @brief is set in flags if decoding has to be done in TEE environment */
+
+    uint8_t flags;
+    uint16_t m_CryptoSessionIdSize; /*!< @brief The size of the crypto session key id */
+    const char* m_CryptoSessionId; /*!< @brief The crypto session key id */
+  } CRYPTO_INFO;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
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 */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/CMakeLists.txt
new file mode 100644
index 0000000..d7b2269
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(HEADERS addon_base.h
+            audio_engine.h
+            filesystem.h
+            general.h
+            network.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-addon-dev-kit_include_kodi_c-api)
+endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
new file mode 100644
index 0000000..dfcfe66
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(HEADERS image_decoder.h
+            pvr.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-addon-dev-kit_include_kodi_c-api_addon-instance)
+endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h
new file mode 100644
index 0000000..595a5dc
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/image_decoder.h
@@ -0,0 +1,78 @@
+/*
+ *  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 "../addon_base.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_imagedecoder_Defs
+  /// @brief **Image format types**\n
+  /// Used to define wanted target format where image decoder should give to
+  /// Kodi.
+  ///
+  typedef enum ImageFormat
+  {
+    /// @brief A 32-bit ARGB pixel format, with alpha, that uses 8 bits per
+    /// channel, ARGBARGB...
+    ADDON_IMG_FMT_A8R8G8B8 = 1,
+
+    /// @brief A 8, alpha only, 8bpp, AAA...
+    ADDON_IMG_FMT_A8 = 2,
+
+    /// @brief RGBA 8:8:8:8, with alpha, 32bpp, RGBARGBA...
+    ADDON_IMG_FMT_RGBA8 = 3,
+
+    /// @brief RGB 8:8:8, with alpha, 24bpp, RGBRGB...
+    ADDON_IMG_FMT_RGB8 = 4
+  } ImageFormat;
+  //----------------------------------------------------------------------------
+
+  typedef struct AddonProps_ImageDecoder
+  {
+    const char* mimetype;
+  } AddonProps_ImageDecoder;
+
+  typedef struct AddonToKodiFuncTable_ImageDecoder
+  {
+    KODI_HANDLE kodi_instance;
+  } AddonToKodiFuncTable_ImageDecoder;
+
+  struct AddonInstance_ImageDecoder;
+  typedef struct KodiToAddonFuncTable_ImageDecoder
+  {
+    KODI_HANDLE addonInstance;
+    bool(__cdecl* load_image_from_memory)(const struct AddonInstance_ImageDecoder* instance,
+                                          unsigned char* buffer,
+                                          unsigned int buf_size,
+                                          unsigned int* width,
+                                          unsigned int* height);
+
+    bool(__cdecl* decode)(const struct AddonInstance_ImageDecoder* instance,
+                          unsigned char* pixels,
+                          unsigned int width,
+                          unsigned int height,
+                          unsigned int pitch,
+                          enum ImageFormat format);
+  } KodiToAddonFuncTable_ImageDecoder;
+
+  typedef struct AddonInstance_ImageDecoder
+  {
+    struct AddonProps_ImageDecoder* props;
+    struct AddonToKodiFuncTable_ImageDecoder* toKodi;
+    struct KodiToAddonFuncTable_ImageDecoder* toAddon;
+  } AddonInstance_ImageDecoder;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr.h
new file mode 100644
index 0000000..2d255ad
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr.h
@@ -0,0 +1,327 @@
+/*
+ *  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 "pvr/pvr_channel_groups.h"
+#include "pvr/pvr_channels.h"
+#include "pvr/pvr_defines.h"
+#include "pvr/pvr_edl.h"
+#include "pvr/pvr_epg.h"
+#include "pvr/pvr_general.h"
+#include "pvr/pvr_menu_hook.h"
+#include "pvr/pvr_recordings.h"
+#include "pvr/pvr_stream.h"
+#include "pvr/pvr_timers.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" main interface function tables between Kodi and addon
+//
+// Values related to all parts and not used direct on addon, are to define here.
+//
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  /*!
+   * @internal
+   * @brief PVR "C" basis API interface
+   *
+   * This field contains things that are exchanged between Kodi and Addon
+   * and is the basis of the PVR-side "C" API.
+   *
+   * @warning Care should be taken when making changes in this fields!\n
+   * Changes can destroy API in addons that have already been created. If a
+   * necessary change or new feature is added, the version of the PVR
+   * at @ref ADDON_INSTANCE_VERSION_PVR_MIN must be increased too.\n
+   * \n
+   * Conditional changes can be made in some places, without min PVR version
+   * increase. The add-on should then use CreateInstanceEx and add partial tests
+   * for this in the C++ header.
+   *
+   * 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
+   */
+
+  struct AddonInstance_PVR;
+
+  /*!
+   * @brief Structure to define typical standard values
+   */
+  typedef struct AddonProperties_PVR
+  {
+    const char* strUserPath;
+    const char* strClientPath;
+    int iEpgMaxDays;
+  } AddonProperties_PVR;
+
+  /*!
+   * @brief Structure to transfer the methods from Kodi to addon
+   */
+  typedef struct AddonToKodiFuncTable_PVR
+  {
+    // Pointer inside Kodi where used from him to find his class
+    KODI_HANDLE kodiInstance;
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // General callback functions
+    void (*AddMenuHook)(void* kodiInstance, const struct PVR_MENUHOOK* hook);
+    void (*RecordingNotification)(void* kodiInstance,
+                                  const char* name,
+                                  const char* fileName,
+                                  bool on);
+    void (*ConnectionStateChange)(void* kodiInstance,
+                                  const char* strConnectionString,
+                                  enum PVR_CONNECTION_STATE newState,
+                                  const char* strMessage);
+    void (*EpgEventStateChange)(void* kodiInstance,
+                                struct EPG_TAG* tag,
+                                enum EPG_EVENT_STATE newState);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Transfer functions where give data back to Kodi, e.g. GetChannels calls TransferChannelEntry
+    void (*TransferChannelEntry)(void* kodiInstance,
+                                 const ADDON_HANDLE handle,
+                                 const struct PVR_CHANNEL* chan);
+    void (*TransferChannelGroup)(void* kodiInstance,
+                                 const ADDON_HANDLE handle,
+                                 const struct PVR_CHANNEL_GROUP* group);
+    void (*TransferChannelGroupMember)(void* kodiInstance,
+                                       const ADDON_HANDLE handle,
+                                       const struct PVR_CHANNEL_GROUP_MEMBER* member);
+    void (*TransferEpgEntry)(void* kodiInstance,
+                             const ADDON_HANDLE handle,
+                             const struct EPG_TAG* epgentry);
+    void (*TransferRecordingEntry)(void* kodiInstance,
+                                   const ADDON_HANDLE handle,
+                                   const struct PVR_RECORDING* recording);
+    void (*TransferTimerEntry)(void* kodiInstance,
+                               const ADDON_HANDLE handle,
+                               const struct PVR_TIMER* timer);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Kodi inform interface functions
+    void (*TriggerChannelUpdate)(void* kodiInstance);
+    void (*TriggerChannelGroupsUpdate)(void* kodiInstance);
+    void (*TriggerEpgUpdate)(void* kodiInstance, unsigned int iChannelUid);
+    void (*TriggerRecordingUpdate)(void* kodiInstance);
+    void (*TriggerTimerUpdate)(void* kodiInstance);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Stream demux interface functions
+    void (*FreeDemuxPacket)(void* kodiInstance, struct DemuxPacket* pPacket);
+    struct DemuxPacket* (*AllocateDemuxPacket)(void* kodiInstance, int iDataSize);
+    struct PVR_CODEC (*GetCodecByName)(const void* kodiInstance, const char* strCodecName);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // New functions becomes added below and can be on another API change (where
+    // breaks min API version) moved up.
+  } AddonToKodiFuncTable_PVR;
+
+  /*!
+   * @brief Structure to transfer the methods from addon to Kodi
+   */
+  typedef struct KodiToAddonFuncTable_PVR
+  {
+    // Pointer inside addon where used on them to find his instance class (currently unused!)
+    KODI_HANDLE addonInstance;
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // General interface functions
+    enum PVR_ERROR(__cdecl* GetCapabilities)(const struct AddonInstance_PVR*,
+                                             struct PVR_ADDON_CAPABILITIES*);
+    enum PVR_ERROR(__cdecl* GetBackendName)(const struct AddonInstance_PVR*, char*, int);
+    enum PVR_ERROR(__cdecl* GetBackendVersion)(const struct AddonInstance_PVR*, char*, int);
+    enum PVR_ERROR(__cdecl* GetBackendHostname)(const struct AddonInstance_PVR*, char*, int);
+    enum PVR_ERROR(__cdecl* GetConnectionString)(const struct AddonInstance_PVR*, char*, int);
+    enum PVR_ERROR(__cdecl* GetDriveSpace)(const struct AddonInstance_PVR*, uint64_t*, uint64_t*);
+    enum PVR_ERROR(__cdecl* CallSettingsMenuHook)(const struct AddonInstance_PVR*,
+                                                  const struct PVR_MENUHOOK*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Channel interface functions
+
+    enum PVR_ERROR(__cdecl* GetChannelsAmount)(const struct AddonInstance_PVR*, int*);
+    enum PVR_ERROR(__cdecl* GetChannels)(const struct AddonInstance_PVR*, ADDON_HANDLE, bool);
+    enum PVR_ERROR(__cdecl* GetChannelStreamProperties)(const struct AddonInstance_PVR*,
+                                                        const struct PVR_CHANNEL*,
+                                                        struct PVR_NAMED_VALUE*,
+                                                        unsigned int*);
+    enum PVR_ERROR(__cdecl* GetSignalStatus)(const struct AddonInstance_PVR*,
+                                             int,
+                                             struct PVR_SIGNAL_STATUS*);
+    enum PVR_ERROR(__cdecl* GetDescrambleInfo)(const struct AddonInstance_PVR*,
+                                               int,
+                                               struct PVR_DESCRAMBLE_INFO*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Channel group interface functions
+    enum PVR_ERROR(__cdecl* GetChannelGroupsAmount)(const struct AddonInstance_PVR*, int*);
+    enum PVR_ERROR(__cdecl* GetChannelGroups)(const struct AddonInstance_PVR*, ADDON_HANDLE, bool);
+    enum PVR_ERROR(__cdecl* GetChannelGroupMembers)(const struct AddonInstance_PVR*,
+                                                    ADDON_HANDLE,
+                                                    const struct PVR_CHANNEL_GROUP*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Channel edit interface functions
+    enum PVR_ERROR(__cdecl* DeleteChannel)(const struct AddonInstance_PVR*,
+                                           const struct PVR_CHANNEL*);
+    enum PVR_ERROR(__cdecl* RenameChannel)(const struct AddonInstance_PVR*,
+                                           const struct PVR_CHANNEL*);
+    enum PVR_ERROR(__cdecl* OpenDialogChannelSettings)(const struct AddonInstance_PVR*,
+                                                       const struct PVR_CHANNEL*);
+    enum PVR_ERROR(__cdecl* OpenDialogChannelAdd)(const struct AddonInstance_PVR*,
+                                                  const struct PVR_CHANNEL*);
+    enum PVR_ERROR(__cdecl* OpenDialogChannelScan)(const struct AddonInstance_PVR*);
+    enum PVR_ERROR(__cdecl* CallChannelMenuHook)(const struct AddonInstance_PVR*,
+                                                 const PVR_MENUHOOK*,
+                                                 const PVR_CHANNEL*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // EPG interface functions
+    enum PVR_ERROR(__cdecl* GetEPGForChannel)(
+        const struct AddonInstance_PVR*, ADDON_HANDLE, int, time_t, time_t);
+    enum PVR_ERROR(__cdecl* IsEPGTagRecordable)(const struct AddonInstance_PVR*,
+                                                const struct EPG_TAG*,
+                                                bool*);
+    enum PVR_ERROR(__cdecl* IsEPGTagPlayable)(const struct AddonInstance_PVR*,
+                                              const struct EPG_TAG*,
+                                              bool*);
+    enum PVR_ERROR(__cdecl* GetEPGTagEdl)(const struct AddonInstance_PVR*,
+                                          const struct EPG_TAG*,
+                                          struct PVR_EDL_ENTRY[],
+                                          int*);
+    enum PVR_ERROR(__cdecl* GetEPGTagStreamProperties)(const struct AddonInstance_PVR*,
+                                                       const struct EPG_TAG*,
+                                                       struct PVR_NAMED_VALUE*,
+                                                       unsigned int*);
+    enum PVR_ERROR(__cdecl* SetEPGTimeFrame)(const struct AddonInstance_PVR*, int);
+    enum PVR_ERROR(__cdecl* CallEPGMenuHook)(const struct AddonInstance_PVR*,
+                                             const struct PVR_MENUHOOK*,
+                                             const struct EPG_TAG*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Recording interface functions
+    enum PVR_ERROR(__cdecl* GetRecordingsAmount)(const struct AddonInstance_PVR*, bool, int*);
+    enum PVR_ERROR(__cdecl* GetRecordings)(const struct AddonInstance_PVR*, ADDON_HANDLE, bool);
+    enum PVR_ERROR(__cdecl* DeleteRecording)(const struct AddonInstance_PVR*,
+                                             const struct PVR_RECORDING*);
+    enum PVR_ERROR(__cdecl* UndeleteRecording)(const struct AddonInstance_PVR*,
+                                               const struct PVR_RECORDING*);
+    enum PVR_ERROR(__cdecl* DeleteAllRecordingsFromTrash)(const struct AddonInstance_PVR*);
+    enum PVR_ERROR(__cdecl* RenameRecording)(const struct AddonInstance_PVR*,
+                                             const struct PVR_RECORDING*);
+    enum PVR_ERROR(__cdecl* SetRecordingLifetime)(const struct AddonInstance_PVR*,
+                                                  const struct PVR_RECORDING*);
+    enum PVR_ERROR(__cdecl* SetRecordingPlayCount)(const struct AddonInstance_PVR*,
+                                                   const struct PVR_RECORDING*,
+                                                   int);
+    enum PVR_ERROR(__cdecl* SetRecordingLastPlayedPosition)(const struct AddonInstance_PVR*,
+                                                            const struct PVR_RECORDING*,
+                                                            int);
+    enum PVR_ERROR(__cdecl* GetRecordingLastPlayedPosition)(const struct AddonInstance_PVR*,
+                                                            const struct PVR_RECORDING*,
+                                                            int*);
+    enum PVR_ERROR(__cdecl* GetRecordingEdl)(const struct AddonInstance_PVR*,
+                                             const struct PVR_RECORDING*,
+                                             struct PVR_EDL_ENTRY[],
+                                             int*);
+    enum PVR_ERROR(__cdecl* GetRecordingSize)(const struct AddonInstance_PVR*,
+                                              const PVR_RECORDING*,
+                                              int64_t*);
+    enum PVR_ERROR(__cdecl* GetRecordingStreamProperties)(const struct AddonInstance_PVR*,
+                                                          const struct PVR_RECORDING*,
+                                                          struct PVR_NAMED_VALUE*,
+                                                          unsigned int*);
+    enum PVR_ERROR(__cdecl* CallRecordingMenuHook)(const struct AddonInstance_PVR*,
+                                                   const struct PVR_MENUHOOK*,
+                                                   const struct PVR_RECORDING*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Timer interface functions
+    enum PVR_ERROR(__cdecl* GetTimerTypes)(const struct AddonInstance_PVR*,
+                                           struct PVR_TIMER_TYPE[],
+                                           int*);
+    enum PVR_ERROR(__cdecl* GetTimersAmount)(const struct AddonInstance_PVR*, int*);
+    enum PVR_ERROR(__cdecl* GetTimers)(const struct AddonInstance_PVR*, ADDON_HANDLE);
+    enum PVR_ERROR(__cdecl* AddTimer)(const struct AddonInstance_PVR*, const struct PVR_TIMER*);
+    enum PVR_ERROR(__cdecl* DeleteTimer)(const struct AddonInstance_PVR*,
+                                         const struct PVR_TIMER*,
+                                         bool);
+    enum PVR_ERROR(__cdecl* UpdateTimer)(const struct AddonInstance_PVR*, const struct PVR_TIMER*);
+    enum PVR_ERROR(__cdecl* CallTimerMenuHook)(const struct AddonInstance_PVR*,
+                                               const struct PVR_MENUHOOK*,
+                                               const struct PVR_TIMER*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Powersaving interface functions
+    enum PVR_ERROR(__cdecl* OnSystemSleep)(const struct AddonInstance_PVR*);
+    enum PVR_ERROR(__cdecl* OnSystemWake)(const struct AddonInstance_PVR*);
+    enum PVR_ERROR(__cdecl* OnPowerSavingActivated)(const struct AddonInstance_PVR*);
+    enum PVR_ERROR(__cdecl* OnPowerSavingDeactivated)(const struct AddonInstance_PVR*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Live stream read interface functions
+    bool(__cdecl* OpenLiveStream)(const struct AddonInstance_PVR*, const struct PVR_CHANNEL*);
+    void(__cdecl* CloseLiveStream)(const struct AddonInstance_PVR*);
+    int(__cdecl* ReadLiveStream)(const struct AddonInstance_PVR*, unsigned char*, unsigned int);
+    int64_t(__cdecl* SeekLiveStream)(const struct AddonInstance_PVR*, int64_t, int);
+    int64_t(__cdecl* LengthLiveStream)(const struct AddonInstance_PVR*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Recording stream read interface functions
+    bool(__cdecl* OpenRecordedStream)(const struct AddonInstance_PVR*, const struct PVR_RECORDING*);
+    void(__cdecl* CloseRecordedStream)(const struct AddonInstance_PVR*);
+    int(__cdecl* ReadRecordedStream)(const struct AddonInstance_PVR*, unsigned char*, unsigned int);
+    int64_t(__cdecl* SeekRecordedStream)(const struct AddonInstance_PVR*, int64_t, int);
+    int64_t(__cdecl* LengthRecordedStream)(const struct AddonInstance_PVR*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // Stream demux interface functions
+    enum PVR_ERROR(__cdecl* GetStreamProperties)(const struct AddonInstance_PVR*,
+                                                 struct PVR_STREAM_PROPERTIES*);
+    struct DemuxPacket*(__cdecl* DemuxRead)(const struct AddonInstance_PVR*);
+    void(__cdecl* DemuxReset)(const struct AddonInstance_PVR*);
+    void(__cdecl* DemuxAbort)(const struct AddonInstance_PVR*);
+    void(__cdecl* DemuxFlush)(const struct AddonInstance_PVR*);
+    void(__cdecl* SetSpeed)(const struct AddonInstance_PVR*, int);
+    void(__cdecl* FillBuffer)(const struct AddonInstance_PVR*, bool);
+    bool(__cdecl* SeekTime)(const struct AddonInstance_PVR*, double, bool, double*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // General stream interface functions
+    bool(__cdecl* CanPauseStream)(const struct AddonInstance_PVR*);
+    void(__cdecl* PauseStream)(const struct AddonInstance_PVR*, bool);
+    bool(__cdecl* CanSeekStream)(const struct AddonInstance_PVR*);
+    bool(__cdecl* IsRealTimeStream)(const struct AddonInstance_PVR*);
+    enum PVR_ERROR(__cdecl* GetStreamTimes)(const struct AddonInstance_PVR*,
+                                            struct PVR_STREAM_TIMES*);
+    enum PVR_ERROR(__cdecl* GetStreamReadChunkSize)(const struct AddonInstance_PVR*, int*);
+
+    //--==----==----==----==----==----==----==----==----==----==----==----==----==
+    // New functions becomes added below and can be on another API change (where
+    // breaks min API version) moved up.
+  } KodiToAddonFuncTable_PVR;
+
+  typedef struct AddonInstance_PVR
+  {
+    struct AddonProperties_PVR* props;
+    struct AddonToKodiFuncTable_PVR* toKodi;
+    struct KodiToAddonFuncTable_PVR* toAddon;
+  } AddonInstance_PVR;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/CMakeLists.txt
new file mode 100644
index 0000000..6617084
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(HEADERS pvr_channel_groups.h
+            pvr_channels.h
+            pvr_defines.h
+            pvr_edl.h
+            pvr_epg.h
+            pvr_general.h
+            pvr_menu_hook.h
+            pvr_recordings.h
+            pvr_stream.h
+            pvr_timers.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-addon-dev-kit_include_kodi_c-api_addon-instance_pvr)
+endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
new file mode 100644
index 0000000..36f9ed6
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h
@@ -0,0 +1,54 @@
+/*
+ *  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 "pvr_defines.h"
+
+#include <stdbool.h>
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 3 - PVR channel group
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  /*!
+   * @brief "C" PVR add-on channel group.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVRChannelGroup for description of values.
+   */
+  typedef struct PVR_CHANNEL_GROUP
+  {
+    char strGroupName[PVR_ADDON_NAME_STRING_LENGTH];
+    bool bIsRadio;
+    unsigned int iPosition;
+  } PVR_CHANNEL_GROUP;
+
+  /*!
+   * @brief "C" PVR add-on channel group member.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVRChannelGroupMember for description of values.
+   */
+  typedef struct PVR_CHANNEL_GROUP_MEMBER
+  {
+    char strGroupName[PVR_ADDON_NAME_STRING_LENGTH];
+    unsigned int iChannelUniqueId;
+    unsigned int iChannelNumber;
+    unsigned int iSubChannelNumber;
+    int iOrder;
+  } PVR_CHANNEL_GROUP_MEMBER;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h
new file mode 100644
index 0000000..a2ce591
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h
@@ -0,0 +1,104 @@
+/*
+ *  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 "pvr_defines.h"
+
+#include <stdbool.h>
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 2 - PVR channel
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Channel
+  /// @brief Denotes that no channel uid is available.
+  ///
+  /// Special @ref kodi::addon::PVRTimer::SetClientChannelUid() and
+  /// @ref kodi::addon::PVRRecording::SetChannelUid() value to indicate that no
+  /// channel uid is available.
+  #define PVR_CHANNEL_INVALID_UID -1
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" PVR add-on channel.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVRChannel for description of values.
+   */
+  typedef struct PVR_CHANNEL
+  {
+    unsigned int iUniqueId;
+    bool bIsRadio;
+    unsigned int iChannelNumber;
+    unsigned int iSubChannelNumber;
+    char strChannelName[PVR_ADDON_NAME_STRING_LENGTH];
+    char strMimeType[PVR_ADDON_INPUT_FORMAT_STRING_LENGTH];
+    unsigned int iEncryptionSystem;
+    char strIconPath[PVR_ADDON_URL_STRING_LENGTH];
+    bool bIsHidden;
+    bool bHasArchive;
+    int iOrder;
+  } PVR_CHANNEL;
+
+  /*!
+   * @brief "C" PVR add-on signal status information.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVRSignalStatus for description of values.
+   */
+  typedef struct PVR_SIGNAL_STATUS
+  {
+    char strAdapterName[PVR_ADDON_NAME_STRING_LENGTH];
+    char strAdapterStatus[PVR_ADDON_NAME_STRING_LENGTH];
+    char strServiceName[PVR_ADDON_NAME_STRING_LENGTH];
+    char strProviderName[PVR_ADDON_NAME_STRING_LENGTH];
+    char strMuxName[PVR_ADDON_NAME_STRING_LENGTH];
+    int iSNR;
+    int iSignal;
+    long iBER;
+    long iUNC;
+  } PVR_SIGNAL_STATUS;
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo
+  /// @brief Special @ref cpp_kodi_addon_pvr_Defs_Channel_PVRDescrambleInfo
+  /// value to indicate that a struct member's value is not available
+  ///
+  #define PVR_DESCRAMBLE_INFO_NOT_AVAILABLE -1
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" PVR add-on descramble information.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVRDescrambleInfo for description of values.
+   */
+  typedef struct PVR_DESCRAMBLE_INFO
+  {
+    int iPid;
+    int iCaid;
+    int iProvid;
+    int iEcmTime;
+    int iHops;
+    char strCardSystem[PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH];
+    char strReader[PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH];
+    char strFrom[PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH];
+    char strProtocol[PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH];
+  } PVR_DESCRAMBLE_INFO;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h
new file mode 100644
index 0000000..af1daae
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h
@@ -0,0 +1,61 @@
+/*
+ *  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
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Standard PVR definitions
+//
+// Values related to all parts and not used direct on addon, are to define here.
+//
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  /*!
+   * @brief API array sizes which are used for data exchange between
+   * Kodi and addon.
+   */
+  ///@{
+  #define PVR_ADDON_NAME_STRING_LENGTH 1024
+  #define PVR_ADDON_URL_STRING_LENGTH 1024
+  #define PVR_ADDON_DESC_STRING_LENGTH 1024
+  #define PVR_ADDON_INPUT_FORMAT_STRING_LENGTH 32
+  #define PVR_ADDON_EDL_LENGTH 32
+  #define PVR_ADDON_TIMERTYPE_ARRAY_SIZE 32
+  #define PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE 512
+  #define PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE_SMALL 128
+  #define PVR_ADDON_TIMERTYPE_STRING_LENGTH 128
+  #define PVR_ADDON_ATTRIBUTE_DESC_LENGTH 128
+  #define PVR_ADDON_ATTRIBUTE_VALUES_ARRAY_SIZE 512
+  #define PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH 64
+  #define PVR_ADDON_DATE_STRING_LENGTH 32
+  ///@}
+
+  /*!
+   * @brief "C" Representation of a general attribute integer value.
+   */
+  typedef struct PVR_ATTRIBUTE_INT_VALUE
+  {
+    int iValue;
+    char strDescription[PVR_ADDON_ATTRIBUTE_DESC_LENGTH];
+  } PVR_ATTRIBUTE_INT_VALUE;
+
+  /*!
+   * @brief "C" Representation of a named value.
+   */
+  typedef struct PVR_NAMED_VALUE
+  {
+    char strName[PVR_ADDON_NAME_STRING_LENGTH];
+    char strValue[PVR_ADDON_NAME_STRING_LENGTH];
+  } PVR_NAMED_VALUE;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h
new file mode 100644
index 0000000..8378eaf
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h
@@ -0,0 +1,62 @@
+/*
+ *  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 "pvr_defines.h"
+
+#include <stdint.h>
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 8 - PVR Edit definition list (EDL)
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_EDLEntry_PVR_EDL_TYPE enum PVR_EDL_TYPE
+  /// @ingroup cpp_kodi_addon_pvr_Defs_EDLEntry
+  /// @brief **Edit definition list types**\n
+  /// Possible type values for @ref cpp_kodi_addon_pvr_Defs_EDLEntry_PVREDLEntry.
+  ///
+  ///@{
+  typedef enum PVR_EDL_TYPE
+  {
+    /// @brief __0__  : cut (completely remove content)
+    PVR_EDL_TYPE_CUT = 0,
+
+    /// @brief __1__  : mute audio
+    PVR_EDL_TYPE_MUTE = 1,
+
+    /// @brief __2__  : scene markers (chapter seeking)
+    PVR_EDL_TYPE_SCENE = 2,
+
+    /// @brief __3__  : commercial breaks
+    PVR_EDL_TYPE_COMBREAK = 3
+  } PVR_EDL_TYPE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" Edit definition list entry.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVREDLEntry for description of values.
+   */
+  typedef struct PVR_EDL_ENTRY
+  {
+    int64_t start;
+    int64_t end;
+    enum PVR_EDL_TYPE type;
+  } PVR_EDL_ENTRY;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h
new file mode 100644
index 0000000..57c603f
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h
@@ -0,0 +1,653 @@
+/*
+ *  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 "pvr_defines.h"
+
+#include <time.h>
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 4 - PVR EPG
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT enum EPG_EVENT_CONTENTMASK (and sub types)
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg
+  /// @brief **EPG entry content event types.**\n
+  /// These ID's come from the DVB-SI EIT table "content descriptor"
+  /// Also known under the name "E-book genre assignments".
+  ///
+  /// See [ETSI EN 300 468 V1.14.1 (2014-05)](https://www.etsi.org/deliver/etsi_en/300400_300499/300468/01.14.01_60/en_300468v011401p.pdf)
+  /// about.
+  ///
+  /// Values used by this functions:
+  /// - @ref kodi::addon::PVREPGTag::SetGenreType()
+  /// - @ref kodi::addon::PVREPGTag::SetGenreSubType()
+  /// - @ref kodi::addon::PVRRecording::SetGenreType()
+  /// - @ref kodi::addon::PVRRecording::SetGenreSubType()
+  ///
+  /// Following types are listed here:
+  /// | emum Type | Description
+  /// |-----------|--------------------
+  /// | @ref EPG_EVENT_CONTENTMASK | EPG entry main content to use.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_MOVIEDRAMA event types for sub type of <b>"Movie/Drama"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS event types for sub type of <b>"News/Current affairs"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_SHOW | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_SHOW event types for sub type of <b>"Show/Game show"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_SPORTS | @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_SPORTS event types for sub type of <b>"Sports"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_CHILDRENYOUTH event types for sub type of <b>"Children's/Youth programmes"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE event types for sub type of <b>"Music/Ballet/Dance"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_ARTSCULTURE event types for sub type of <b>"Arts/Culture (without music)"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS event types for sub type of <b>"Social/Political issues/Economics"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE event types for sub type of <b>"Education/Science/Factual topics"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_LEISUREHOBBIES event types for sub type of <b>"Leisure hobbies"</b>.
+  /// | @ref EPG_EVENT_CONTENTSUBMASK_SPECIAL | EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_SPECIAL event types for sub type of <b>"Special characteristics"</b>.
+  ///@{
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry main content to use.
+  ///
+  ///@{
+  typedef enum EPG_EVENT_CONTENTMASK
+  {
+    /// @brief __0x00__ : Undefined content mask entry.
+    EPG_EVENT_CONTENTMASK_UNDEFINED = 0x00,
+
+    /// @brief __0x10__ : Movie/Drama.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA about related sub types.
+    EPG_EVENT_CONTENTMASK_MOVIEDRAMA = 0x10,
+
+    /// @brief __0x20__ : News/Current affairs.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS about related sub types.
+    EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS = 0x20,
+
+    /// @brief __0x30__ : Show/Game show.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_SHOW about related sub types.
+    EPG_EVENT_CONTENTMASK_SHOW = 0x30,
+
+    /// @brief __0x40__ : Sports.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_SPORTS about related sub types.
+    EPG_EVENT_CONTENTMASK_SPORTS = 0x40,
+
+    /// @brief __0x50__ : Children's/Youth programmes.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH about related sub types.
+    EPG_EVENT_CONTENTMASK_CHILDRENYOUTH = 0x50,
+
+    /// @brief __0x60__ : Music/Ballet/Dance.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE about related sub types.
+    EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE = 0x60,
+
+    /// @brief __0x70__ : Arts/Culture (without music).\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE about related sub types.
+    EPG_EVENT_CONTENTMASK_ARTSCULTURE = 0x70,
+
+    /// @brief __0x80__ : Social/Political issues/Economics.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS about related sub types.
+    EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS = 0x80,
+
+    /// @brief __0x90__ : Education/Science/Factual topics.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE about related sub types.
+    EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE = 0x90,
+
+    /// @brief __0xA0__ : Leisure hobbies.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES about related sub types.
+    EPG_EVENT_CONTENTMASK_LEISUREHOBBIES = 0xA0,
+
+    /// @brief __0xB0__ : Special characteristics.\n
+    /// \n
+    /// See @ref EPG_EVENT_CONTENTSUBMASK_SPECIAL about related sub types.
+    EPG_EVENT_CONTENTMASK_SPECIAL = 0xB0,
+
+    /// @brief __0xF0__ User defined.
+    EPG_EVENT_CONTENTMASK_USERDEFINED = 0xF0,
+
+    /// @brief Used to override standard genre types with a own name about.\n
+    /// \n
+    /// Set to this value @ref EPG_GENRE_USE_STRING on following places:
+    /// - @ref kodi::addon::PVREPGTag::SetGenreType()
+    /// - @ref kodi::addon::PVREPGTag::SetGenreSubType()
+    /// - @ref kodi::addon::PVRRecording::SetGenreType()
+    /// - @ref kodi::addon::PVRRecording::SetGenreSubType()
+    ///
+    /// @warning Value here is not a [ETSI EN 300 468 V1.14.1 (2014-05)](https://www.etsi.org/deliver/etsi_en/300400_300499/300468/01.14.01_60/en_300468v011401p.pdf)
+    /// conform.
+    ///
+    /// @note This is a own Kodi definition to set that genre is given by own
+    /// string. Used on @ref kodi::addon::PVREPGTag::SetGenreDescription() and
+    /// @ref kodi::addon::PVRRecording::SetGenreDescription()
+    EPG_GENRE_USE_STRING = 0x100
+  } EPG_EVENT_CONTENTMASK;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_MOVIEDRAMA event
+  /// types for sub type of <b>"Movie/Drama"</b>.
+  ///
+  ///@{
+  typedef enum EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA
+  {
+    /// @brief __0x0__ : Movie/drama (general).
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Detective/thriller.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_DETECTIVE_THRILLER = 0x1,
+
+    /// @brief __0x2__ : Adventure/western/war.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_ADVENTURE_WESTERN_WAR = 0x2,
+
+    /// @brief __0x3__ : Science fiction/fantasy/horror.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_SCIENCEFICTION_FANTASY_HORROR = 0x3,
+
+    /// @brief __0x4__ : Comedy.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_COMEDY = 0x4,
+
+    /// @brief __0x5__ : Soap/melodrama/folkloric.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_SOAP_MELODRAMA_FOLKLORIC = 0x5,
+
+    /// @brief __0x6__ : Romance.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_ROMANCE = 0x6,
+
+    /// @brief __0x7__ : Serious/classical/religious/historical movie/drama.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_SERIOUS_CLASSICAL_RELIGIOUS_HISTORICAL = 0x7,
+
+    /// @brief __0x8__ : Adult movie/drama.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_ADULT = 0x8,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_MOVIEDRAMA;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS event
+  /// types for sub type of <b>"News/Current affairs"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS
+  {
+    /// @brief __0x0__ : News/current affairs (general).
+    EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS_GENERAL = 0x0,
+
+    /// @brief __0x1__ : News/weather report.
+    EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS_WEATHER = 0x1,
+
+    /// @brief __0x2__ : News magazine.
+    EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS_MAGAZINE = 0x2,
+
+    /// @brief __0x3__ : Documentary.
+    EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS_DOCUMENTARY = 0x3,
+
+    /// @brief __0x4__ : Discussion/interview/debate
+    EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS_DISCUSSION_INTERVIEW_DEBATE = 0x4,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_NEWSCURRENTAFFAIRS;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_SHOW event
+  /// types for sub type of <b>"Show/Game show"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_SHOW
+  {
+    /// @brief __0x0__ : Show/game show (general).
+    EPG_EVENT_CONTENTSUBMASK_SHOW_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Game show/quiz/contest.
+    EPG_EVENT_CONTENTSUBMASK_SHOW_GAMESHOW_QUIZ_CONTEST = 0x1,
+
+    /// @brief __0x2__ : Variety show.
+    EPG_EVENT_CONTENTSUBMASK_SHOW_VARIETY_SHOW = 0x2,
+
+    /// @brief __0x3__ : Talk show.
+    EPG_EVENT_CONTENTSUBMASK_SHOW_TALK_SHOW = 0x3,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_SHOW_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_SHOW;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_SPORTS event
+  /// types for sub type of <b>"Sports"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_SPORTS
+  {
+    /// @brief __0x0__ : Sports (general).
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Special events (Olympic Games, World Cup, etc.).
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_OLYMPICGAMES_WORLDCUP = 0x1,
+
+    /// @brief __0x2__ : Sports magazines.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_SPORTS_MAGAZINES = 0x2,
+
+    /// @brief __0x3__ : Football/soccer.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_FOOTBALL_SOCCER = 0x3,
+
+    /// @brief __0x4__ : Tennis/squash.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_TENNIS_SQUASH = 0x4,
+
+    /// @brief __0x5__ : Team sports (excluding football).
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_TEAMSPORTS = 0x5,
+
+    /// @brief __0x6__ : Athletics.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_ATHLETICS = 0x6,
+
+    /// @brief __0x7__ : Motor sport.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_MOTORSPORT = 0x7,
+
+    /// @brief __0x8__ : Water sport.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_WATERSPORT = 0x8,
+
+    /// @brief __0x9__ : Winter sports.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_WINTERSPORTS = 0x9,
+
+    /// @brief __0xA__ : Equestrian.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_EQUESTRIAN = 0xA,
+
+    /// @brief __0xB__ : Martial sports.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_MARTIALSPORTS = 0xB,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_SPORTS_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_SPORTS;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_CHILDRENYOUTH event
+  /// types for sub type of <b>"Children's/Youth programmes"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH
+  {
+    /// @brief __0x0__ : Children's/youth programmes (general).
+    EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Pre-school children's programmes.
+    EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH_PRESCHOOL_CHILDREN = 0x1,
+
+    /// @brief __0x2__ : Entertainment programmes for 6 to 14.
+    EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH_ENTERTAIN_6TO14 = 0x2,
+
+    /// @brief __0x3__ : Entertainment programmes for 10 to 16.
+    EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH_ENTERTAIN_10TO16 = 0x3,
+
+    /// @brief __0x4__ : Informational/educational/school programmes.
+    EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH_INFORMATIONAL_EDUCATIONAL_SCHOOL = 0x4,
+
+    /// @brief __0x5__ : Cartoons/puppets.
+    EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH_CARTOONS_PUPPETS = 0x5,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_CHILDRENYOUTH;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE event
+  /// types for sub type of <b>"Music/Ballet/Dance"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE
+  {
+    /// @brief __0x0__ : Music/ballet/dance (general).
+    EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Rock/pop.
+    EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_ROCKPOP = 0x1,
+
+    /// @brief __0x2__ : Serious music/classical music.
+    EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_SERIOUSMUSIC_CLASSICALMUSIC = 0x2,
+
+    /// @brief __0x3__ : Folk/traditional music.
+    EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_FOLK_TRADITIONAL_MUSIC = 0x3,
+
+    /// @brief __0x4__ : Jazz.
+    EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_JAZZ = 0x4,
+
+    /// @brief __0x5__ : Musical/opera.
+    EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_MUSICAL_OPERA = 0x5,
+
+    /// @brief __0x6__ : Ballet.
+    EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_BALLET = 0x6,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_MUSICBALLETDANCE;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_ARTSCULTURE event
+  /// types for sub type of <b>"Arts/Culture (without music)"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE
+  {
+    /// @brief __0x0__ : Arts/culture (without music, general).
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Performing arts.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_PERFORMINGARTS = 0x1,
+
+    /// @brief __0x2__ : Fine arts.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_FINEARTS = 0x2,
+
+    /// @brief __0x3__ : Religion.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_RELIGION = 0x3,
+
+    /// @brief __0x4__ : Popular culture/traditional arts.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_POPULARCULTURE_TRADITIONALARTS = 0x4,
+
+    /// @brief __0x5__ : Literature.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_LITERATURE = 0x5,
+
+    /// @brief __0x6__ : Film/cinema.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_FILM_CINEMA = 0x6,
+
+    /// @brief __0x7__ : Experimental film/video.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_EXPERIMENTALFILM_VIDEO = 0x7,
+
+    /// @brief __0x8__ : Broadcasting/press.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_BROADCASTING_PRESS = 0x8,
+
+    /// @brief __0x9__ : New media.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_NEWMEDIA = 0x9,
+
+    /// @brief __0xA__ : Arts/culture magazines.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_ARTS_CULTUREMAGAZINES = 0xA,
+
+    /// @brief __0xB__ : Fashion.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_FASHION = 0xB,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_ARTSCULTURE;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS event
+  /// types for sub type of <b>"Social/Political issues/Economics"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS
+  {
+    /// @brief __0x0__ : Social/political issues/economics (general).
+    EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Magazines/reports/documentary.
+    EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS_MAGAZINES_REPORTS_DOCUMENTARY = 0x1,
+
+    /// @brief __0x2__ : Economics/social advisory.
+    EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS_ECONOMICS_SOCIALADVISORY = 0x2,
+
+    /// @brief __0x3__ : Remarkable people.
+    EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS_REMARKABLEPEOPLE = 0x3,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_SOCIALPOLITICALECONOMICS;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE event
+  /// types for sub type of <b>"Education/Science/Factual topics"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE
+  {
+    /// @brief __0x0__ : Education/science/factual topics (general).
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Nature/animals/environment.
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_NATURE_ANIMALS_ENVIRONMENT = 0x1,
+
+    /// @brief __0x2__ : Technology/natural sciences.
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_TECHNOLOGY_NATURALSCIENCES = 0x2,
+
+    /// @brief __0x3__ : Medicine/physiology/psychology.
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_MEDICINE_PHYSIOLOGY_PSYCHOLOGY = 0x3,
+
+    /// @brief __0x4__ : Foreign countries/expeditions.
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_FOREIGNCOUNTRIES_EXPEDITIONS = 0x4,
+
+    /// @brief __0x5__ : Social/spiritual sciences.
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_SOCIAL_SPIRITUALSCIENCES = 0x5,
+
+    /// @brief __0x6__ : Further education.
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_FURTHEREDUCATION = 0x6,
+
+    /// @brief __0x7__ : Languages.
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_LANGUAGES = 0x7,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_EDUCATIONALSCIENCE;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_LEISUREHOBBIES event
+  /// types for sub type of <b>"Leisure hobbies"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES
+  {
+    /// @brief __0x0__ : Leisure hobbies (general) .
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Tourism/travel.
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_TOURISM_TRAVEL = 0x1,
+
+    /// @brief __0x2__ : Handicraft.
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_HANDICRAFT = 0x2,
+
+    /// @brief __0x3__ : Motoring.
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_MOTORING = 0x3,
+
+    /// @brief __0x4__ : Fitness and health.
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_FITNESSANDHEALTH = 0x4,
+
+    /// @brief __0x5__ : Cooking.
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_COOKING = 0x5,
+
+    /// @brief __0x6__ : Advertisement/shopping.
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_ADVERTISEMENT_SHOPPING = 0x6,
+
+    /// @brief __0x7__ : Gardening.
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_GARDENING = 0x7,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_LEISUREHOBBIES;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT
+  /// @brief EPG entry sub content to @ref EPG_EVENT_CONTENTMASK_SPECIAL event
+  /// types for sub type of <b>"Special characteristics"</b>.
+  ///
+  typedef enum EPG_EVENT_CONTENTSUBMASK_SPECIAL
+  {
+    /// @brief __0x0__ : Special characteristics / Original language (general).
+    EPG_EVENT_CONTENTSUBMASK_SPECIAL_GENERAL = 0x0,
+
+    /// @brief __0x1__ : Black and white.
+    EPG_EVENT_CONTENTSUBMASK_SPECIAL_BLACKANDWHITE = 0x1,
+
+    /// @brief __0x2__ : Unpublished.
+    EPG_EVENT_CONTENTSUBMASK_SPECIAL_UNPUBLISHED = 0x2,
+
+    /// @brief __0x3__ : Live broadcast.
+    EPG_EVENT_CONTENTSUBMASK_SPECIAL_LIVEBROADCAST = 0x3,
+
+    /// @brief __0x4__ : Plano-stereoscopic.
+    EPG_EVENT_CONTENTSUBMASK_SPECIAL_PLANOSTEREOSCOPIC = 0x4,
+
+    /// @brief __0x5__ : Local or regional.
+    EPG_EVENT_CONTENTSUBMASK_SPECIAL_LOCALORREGIONAL = 0x5,
+
+    /// @brief __0xF__ : User defined.
+    EPG_EVENT_CONTENTSUBMASK_SPECIAL_USERDEFINED = 0xF
+  } EPG_EVENT_CONTENTSUBMASK_SPECIAL;
+  //----------------------------------------------------------------------------
+
+  ///@}
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg
+  /// @brief Separator to use in strings containing different tokens, for example
+  /// writers, directors, actors of an event.
+  ///
+  #define EPG_STRING_TOKEN_SEPARATOR ","
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_epg_EPG_TAG_FLAG enum EPG_TAG_FLAG
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg
+  /// @brief <b>Bit field of independent flags associated with the EPG entry.</b>\n
+  /// Values used by @ref kodi::addon::PVREPGTag::SetFlags().
+  ///
+  /// Here's example about the use of this:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVREPGTag tag;
+  /// tag.SetFlags(EPG_TAG_FLAG_IS_SERIES | EPG_TAG_FLAG_IS_NEW);
+  /// ~~~~~~~~~~~~~
+  ///
+  ///@{
+  typedef enum EPG_TAG_FLAG
+  {
+    /// @brief __0000 0000__ : Nothing special to say about this entry.
+    EPG_TAG_FLAG_UNDEFINED = 0,
+
+    /// @brief __0000 0001__ : This EPG entry is part of a series.
+    EPG_TAG_FLAG_IS_SERIES = (1 << 0),
+
+    /// @brief __0000 0010__ : This EPG entry will be flagged as new.
+    EPG_TAG_FLAG_IS_NEW = (1 << 1),
+
+    /// @brief __0000 0100__ : This EPG entry will be flagged as a premiere.
+    EPG_TAG_FLAG_IS_PREMIERE = (1 << 2),
+
+    /// @brief __0000 1000__ : This EPG entry will be flagged as a finale.
+    EPG_TAG_FLAG_IS_FINALE = (1 << 3),
+
+    /// @brief __0001 0000__ : This EPG entry will be flagged as live.
+    EPG_TAG_FLAG_IS_LIVE = (1 << 4),
+  } EPG_TAG_FLAG;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg
+  /// @brief Special PVREPGTag::SetUniqueBroadcastId value
+  ///
+  /// Special @ref kodi::addon::PVREPGTag::SetUniqueBroadcastId() value to
+  /// indicate that a tag has not a valid EPG event uid.
+  ///
+  #define EPG_TAG_INVALID_UID 0
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg
+  /// @brief Special @ref kodi::addon::PVREPGTag::SetSeriesNumber(), @ref kodi::addon::PVREPGTag::SetEpisodeNumber()
+  /// and @ref kodi::addon::PVREPGTag::SetEpisodePartNumber() value to indicate
+  /// it is not to be used.
+  ///
+  #define EPG_TAG_INVALID_SERIES_EPISODE -1
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg
+  /// @brief Timeframe value for use with @ref kodi::addon::CInstancePVRClient::SetEPGTimeFrame()
+  /// function to indicate "no timeframe".
+  ///
+  #define EPG_TIMEFRAME_UNLIMITED -1
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_epg_EPG_EVENT_STATE enum EPG_EVENT_STATE
+  /// @ingroup cpp_kodi_addon_pvr_Defs_epg
+  /// @brief **EPG event states.**\n
+  /// Used with @ref kodi::addon::CInstancePVRClient::EpgEventStateChange()
+  /// callback.
+  ///
+  ///@{
+  typedef enum EPG_EVENT_STATE
+  {
+    /// @brief __0__ : Event created.
+    EPG_EVENT_CREATED = 0,
+
+    /// @brief __1__ : Event updated.
+    EPG_EVENT_UPDATED = 1,
+
+    /// @brief __2__ : Event deleted.
+    EPG_EVENT_DELETED = 2,
+  } EPG_EVENT_STATE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" PVR add-on channel group member.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVREPGTag for description of values.
+   */
+  typedef struct EPG_TAG
+  {
+    unsigned int iUniqueBroadcastId;
+    unsigned int iUniqueChannelId;
+    const char* strTitle;
+    time_t startTime;
+    time_t endTime;
+    const char* strPlotOutline;
+    const char* strPlot;
+    const char* strOriginalTitle;
+    const char* strCast;
+    const char* strDirector;
+    const char* strWriter;
+    int iYear;
+    const char* strIMDBNumber;
+    const char* strIconPath;
+    int iGenreType;
+    int iGenreSubType;
+    const char* strGenreDescription;
+    const char* strFirstAired;
+    int iParentalRating;
+    int iStarRating;
+    int iSeriesNumber;
+    int iEpisodeNumber;
+    int iEpisodePartNumber;
+    const char* strEpisodeName;
+    unsigned int iFlags;
+    const char* strSeriesLink;
+  } EPG_TAG;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h
new file mode 100644
index 0000000..52787b0
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h
@@ -0,0 +1,288 @@
+/*
+ *  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 "pvr_defines.h"
+
+#ifdef BUILD_KODI_ADDON
+#include "../../../InputStreamConstants.h"
+#else
+#include "cores/VideoPlayer/Interface/Addon/InputStreamConstants.h"
+#endif
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 1 - General PVR
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_General_PVR_ERROR enum PVR_ERROR
+  /// @ingroup cpp_kodi_addon_pvr_Defs_General
+  /// @brief **PVR add-on error codes**\n
+  /// Used as return values on most PVR related functions.
+  ///
+  /// In this way, a PVR instance signals errors in its processing and, under
+  /// certain conditions, allows Kodi to make corrections.
+  ///
+  ///@{
+  typedef enum PVR_ERROR
+  {
+    /// @brief __0__ : No error occurred.
+    PVR_ERROR_NO_ERROR = 0,
+
+    /// @brief __-1__ : An unknown error occurred.
+    PVR_ERROR_UNKNOWN = -1,
+
+    /// @brief __-2__ : The method that Kodi called is not implemented by the add-on.
+    PVR_ERROR_NOT_IMPLEMENTED = -2,
+
+    /// @brief __-3__ : The backend reported an error, or the add-on isn't connected.
+    PVR_ERROR_SERVER_ERROR = -3,
+
+    /// @brief __-4__ : The command was sent to the backend, but the response timed out.
+    PVR_ERROR_SERVER_TIMEOUT = -4,
+
+    /// @brief __-5__ : The command was rejected by the backend.
+    PVR_ERROR_REJECTED = -5,
+
+    /// @brief __-6__ : The requested item can not be added, because it's already present.
+    PVR_ERROR_ALREADY_PRESENT = -6,
+
+    /// @brief __-7__ : The parameters of the method that was called are invalid for this
+    /// operation.
+    PVR_ERROR_INVALID_PARAMETERS = -7,
+
+    /// @brief __-8__ : A recording is running, so the timer can't be deleted without
+    /// doing a forced delete.
+    PVR_ERROR_RECORDING_RUNNING = -8,
+
+    /// @brief __-9__ : The command failed.
+    PVR_ERROR_FAILED = -9,
+  } PVR_ERROR;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_General_PVR_CONNECTION_STATE enum PVR_CONNECTION_STATE
+  /// @ingroup cpp_kodi_addon_pvr_Defs_General
+  /// @brief **PVR backend connection states**\n
+  /// Used with @ref kodi::addon::CInstancePVRClient::ConnectionStateChange() callback.
+  ///
+  /// With this, a PVR instance signals that Kodi should perform special
+  /// operations.
+  ///
+  ///@{
+  typedef enum PVR_CONNECTION_STATE
+  {
+    /// @brief __0__ : Unknown state (e.g. not yet tried to connect).
+    PVR_CONNECTION_STATE_UNKNOWN = 0,
+
+    /// @brief __1__ : Backend server is not reachable (e.g. server not existing or
+    /// network down).
+    PVR_CONNECTION_STATE_SERVER_UNREACHABLE = 1,
+
+    /// @brief __2__ : Backend server is reachable, but there is not the expected type of
+    /// server running (e.g. HTSP required, but FTP running at given server:port).
+    PVR_CONNECTION_STATE_SERVER_MISMATCH = 2,
+
+    /// @brief __3__ : Backend server is reachable, but server version does not match
+    /// client requirements.
+    PVR_CONNECTION_STATE_VERSION_MISMATCH = 3,
+
+    /// @brief __4__ : Backend server is reachable, but denies client access (e.g. due
+    /// to wrong credentials).
+    PVR_CONNECTION_STATE_ACCESS_DENIED = 4,
+
+    /// @brief __5__ : Connection to backend server is established.
+    PVR_CONNECTION_STATE_CONNECTED = 5,
+
+    /// @brief __6__ : No connection to backend server (e.g. due to network errors or
+    /// client initiated disconnect).
+    PVR_CONNECTION_STATE_DISCONNECTED = 6,
+
+    /// @brief __7__ : Connecting to backend.
+    PVR_CONNECTION_STATE_CONNECTING = 7,
+  } PVR_CONNECTION_STATE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_General_PVR_STREAM_PROPERTY definition PVR_STREAM_PROPERTY
+  /// @ingroup cpp_kodi_addon_pvr_Defs_General_Inputstream
+  /// @brief **PVR related stream property values**\n
+  /// This is used to pass additional data to Kodi on a given PVR stream.
+  ///
+  /// Then transferred to livestream, recordings or EPG Tag stream using the
+  /// properties.
+  ///
+  /// This defines are used by:
+  /// - @ref kodi::addon::CInstancePVRClient::GetChannelStreamProperties()
+  /// - @ref kodi::addon::CInstancePVRClient::GetEPGTagStreamProperties()
+  /// - @ref kodi::addon::CInstancePVRClient::GetRecordingStreamProperties()
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  ///
+  /// PVR_ERROR CMyPVRInstance::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel,
+  ///                                                      std::vector<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;
+  /// }
+  ///
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  ///@{
+
+  /// @brief the URL of the stream that should be played.
+  ///
+  #define PVR_STREAM_PROPERTY_STREAMURL "streamurl"
+
+  /// @brief To define in stream properties the name of the inputstream add-on
+  /// that should be used.
+  ///
+  /// Leave blank to use Kodi's built-in playing capabilities or to allow ffmpeg
+  /// to handle directly set to @ref PVR_STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG.
+  ///
+  #define PVR_STREAM_PROPERTY_INPUTSTREAM STREAM_PROPERTY_INPUTSTREAM
+
+  /// @brief Identification string for an input stream.
+  ///
+  /// This value can be used in addition to @ref PVR_STREAM_PROPERTY_INPUTSTREAM.
+  /// It is used to provide the respective inpustream addon with additional
+  /// identification.
+  ///
+  /// The difference between this and other stream properties is that it is also
+  /// passed in the associated @ref kodi::addon::CAddonBase::CreateInstance()
+  /// call.
+  ///
+  /// This makes it possible to select different processing classes within the
+  /// associated add-on.
+  ///
+  ///
+  ///---------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  ///
+  /// // On PVR instance of addon
+  /// PVR_ERROR CMyPVRInstance::GetChannelStreamProperties(const kodi::addon::PVRChannel& channel,
+  ///                                                      std::vector<PVRStreamProperty>& properties)
+  /// {
+  ///   ...
+  ///   // For here on example the inpustream is also inside the PVR addon
+  ///   properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM, "pvr.my_one");
+  ///   properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM_INSTANCE_ID, "my_special_id_1");
+  ///   return PVR_ERROR_NO_ERROR;
+  /// }
+  ///
+  /// ...
+  ///
+  /// // On CAddonBase part of addon
+  /// ADDON_STATUS CMyAddon::CreateInstanceEx(int instanceType,
+  ///                                         std::string instanceID,
+  ///                                         KODI_HANDLE instance,
+  ///                                         KODI_HANDLE& addonInstance
+  ///                                         const std::string& version)
+  /// {
+  ///   if (instanceType == ADDON_INSTANCE_INPUTSTREAM)
+  ///   {
+  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my special inputstream");
+  ///     if (instanceID == "my_special_id_1")
+  ///       addonInstance = new CMyPVRClientInstance_Type1(instance, version);
+  ///     else if (instanceID == "my_special_id_2")
+  ///       addonInstance = new CMyPVRClientInstance_Type2(instance, version);
+  ///     return ADDON_STATUS_OK;
+  ///   }
+  ///   else if (...)
+  ///   {
+  ///     ...
+  ///   }
+  ///   return ADDON_STATUS_UNKNOWN;
+  /// }
+  ///
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  #define PVR_STREAM_PROPERTY_INPUTSTREAM_INSTANCE_ID STREAM_PROPERTY_INPUTSTREAM_INSTANCE_ID
+
+  /// @brief the MIME type of the stream that should be played.
+  ///
+  #define PVR_STREAM_PROPERTY_MIMETYPE "mimetype"
+
+  /// @brief <b>"true"</b> to denote that the stream that should be played is a
+  /// realtime stream.
+  ///
+  /// Any other value indicates that this is no realtime stream.
+  ///
+  #define PVR_STREAM_PROPERTY_ISREALTIMESTREAM STREAM_PROPERTY_ISREALTIMESTREAM
+
+  /// @brief <b>"true"</b> to denote that if the stream is from an EPG tag.
+  ///
+  /// It should be played is a live stream. Otherwise if it's a EPG tag it will
+  /// play as normal video.
+  ///
+  #define PVR_STREAM_PROPERTY_EPGPLAYBACKASLIVE "epgplaybackaslive"
+
+  /// @brief Special value for @ref PVR_STREAM_PROPERTY_INPUTSTREAM to use
+  /// ffmpeg to directly play a stream URL.
+  #define PVR_STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG
+
+  ///@}
+  //-----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" PVR add-on capabilities.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVRCapabilities for description of values.
+   */
+  typedef struct PVR_ADDON_CAPABILITIES
+  {
+    bool bSupportsEPG;
+    bool bSupportsEPGEdl;
+    bool bSupportsTV;
+    bool bSupportsRadio;
+    bool bSupportsRecordings;
+    bool bSupportsRecordingsUndelete;
+    bool bSupportsTimers;
+    bool bSupportsChannelGroups;
+    bool bSupportsChannelScan;
+    bool bSupportsChannelSettings;
+    bool bHandlesInputStream;
+    bool bHandlesDemuxing;
+    bool bSupportsRecordingPlayCount;
+    bool bSupportsLastPlayedPosition;
+    bool bSupportsRecordingEdl;
+    bool bSupportsRecordingsRename;
+    bool bSupportsRecordingsLifetimeChange;
+    bool bSupportsDescrambleInfo;
+    bool bSupportsAsyncEPGTransfer;
+    bool bSupportsRecordingSize;
+
+    unsigned int iRecordingsLifetimesSize;
+    struct PVR_ATTRIBUTE_INT_VALUE recordingsLifetimeValues[PVR_ADDON_ATTRIBUTE_VALUES_ARRAY_SIZE];
+  } PVR_ADDON_CAPABILITIES;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
new file mode 100644
index 0000000..df2216f
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h
@@ -0,0 +1,72 @@
+/*
+ *  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 "pvr_defines.h"
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 7 - Menu hook
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Menuhook_PVR_MENUHOOK_CAT enum PVR_MENUHOOK_CAT
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Menuhook
+  /// @brief **PVR context menu hook categories**\n
+  /// Possible menu types given to Kodi with @ref kodi::addon::CInstancePVRClient::AddMenuHook().
+  ///
+  ///@{
+  typedef enum PVR_MENUHOOK_CAT
+  {
+    /// @brief __-1__ : Unknown menu hook.
+    PVR_MENUHOOK_UNKNOWN = -1,
+
+    /// @brief __0__ : All categories.
+    PVR_MENUHOOK_ALL = 0,
+
+    /// @brief __1__ : For channels.
+    PVR_MENUHOOK_CHANNEL = 1,
+
+    /// @brief __2__ : For timers.
+    PVR_MENUHOOK_TIMER = 2,
+
+    /// @brief __3__ : For EPG.
+    PVR_MENUHOOK_EPG = 3,
+
+    /// @brief __4__ : For recordings.
+    PVR_MENUHOOK_RECORDING = 4,
+
+    /// @brief __5__ : For deleted recordings.
+    PVR_MENUHOOK_DELETED_RECORDING = 5,
+
+    /// @brief __6__ : For settings.
+    PVR_MENUHOOK_SETTING = 6,
+  } PVR_MENUHOOK_CAT;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" PVR add-on menu hook.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVRMenuhook for description of values.
+   */
+  typedef struct PVR_MENUHOOK
+  {
+    unsigned int iHookId;
+    unsigned int iLocalizedStringId;
+    enum PVR_MENUHOOK_CAT category;
+  } PVR_MENUHOOK;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
new file mode 100644
index 0000000..1a7fc66
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h
@@ -0,0 +1,143 @@
+/*
+ *  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 "pvr_defines.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <time.h>
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 5 - PVR recordings
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Recording_PVR_RECORDING_FLAG enum PVR_RECORDING_FLAG
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Recording
+  /// @brief **Bit field of independent flags associated with the EPG entry.**\n
+  /// Values used by @ref kodi::addon::PVRRecording::SetFlags().
+  ///
+  /// Here's example about the use of this:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::addon::PVRRecording tag;
+  /// tag.SetFlags(PVR_RECORDING_FLAG_IS_SERIES | PVR_RECORDING_FLAG_IS_PREMIERE);
+  /// ~~~~~~~~~~~~~
+  ///
+  ///@{
+  typedef enum PVR_RECORDING_FLAG
+  {
+    /// @brief __0000 0000__ : Nothing special to say about this recording.
+    PVR_RECORDING_FLAG_UNDEFINED = 0,
+
+    /// @brief __0000 0001__ : This recording is part of a series.
+    PVR_RECORDING_FLAG_IS_SERIES = (1 << 0),
+
+    /// @brief __0000 0010__ : This recording will be flagged as new.
+    PVR_RECORDING_FLAG_IS_NEW = (1 << 1),
+
+    /// @brief __0000 0100__ : This recording will be flagged as a premiere.
+    PVR_RECORDING_FLAG_IS_PREMIERE = (1 << 2),
+
+    /// @brief __0000 1000__ : This recording will be flagged as a finale.
+    PVR_RECORDING_FLAG_IS_FINALE = (1 << 3),
+
+    /// @brief __0001 0000__ : This recording will be flagged as live.
+    PVR_RECORDING_FLAG_IS_LIVE = (1 << 4),
+  } PVR_RECORDING_FLAG;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  /// @brief Special @ref kodi::addon::PVRRecording::SetSeriesNumber() and
+  /// @ref kodi::addon::PVRRecording::SetEpisodeNumber() value to indicate it is
+  /// not to be used.
+  ///
+  /// Used if recording has no valid season and/or episode info.
+  ///
+  #define PVR_RECORDING_INVALID_SERIES_EPISODE EPG_TAG_INVALID_SERIES_EPISODE
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Recording_PVRRecording
+  /// @brief Value where set in background to inform that related part not used.
+  ///
+  /// Normally this related parts need not to set by this as it is default.
+  #define PVR_RECORDING_VALUE_NOT_AVAILABLE -1
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Recording_PVR_RECORDING_CHANNEL_TYPE enum PVR_RECORDING_CHANNEL_TYPE
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Recording
+  /// @brief **PVR recording channel types**\n
+  /// Used on @ref kodi::addon::PVRRecording::SetChannelType() value to set related
+  /// type.
+  ///
+  ///@{
+  typedef enum PVR_RECORDING_CHANNEL_TYPE
+  {
+    /// @brief __0__ : Unknown type.
+    PVR_RECORDING_CHANNEL_TYPE_UNKNOWN = 0,
+
+    /// @brief __1__ : TV channel.
+    PVR_RECORDING_CHANNEL_TYPE_TV = 1,
+
+    /// @brief __2__ : Radio channel.
+    PVR_RECORDING_CHANNEL_TYPE_RADIO = 2,
+  } PVR_RECORDING_CHANNEL_TYPE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" PVR add-on recording.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref kodi::addon::PVRRecording for description of values.
+   */
+  typedef struct PVR_RECORDING
+  {
+    char strRecordingId[PVR_ADDON_NAME_STRING_LENGTH];
+    char strTitle[PVR_ADDON_NAME_STRING_LENGTH];
+    char strEpisodeName[PVR_ADDON_NAME_STRING_LENGTH];
+    int iSeriesNumber;
+    int iEpisodeNumber;
+    int iYear;
+    char strDirectory[PVR_ADDON_URL_STRING_LENGTH];
+    char strPlotOutline[PVR_ADDON_DESC_STRING_LENGTH];
+    char strPlot[PVR_ADDON_DESC_STRING_LENGTH];
+    char strGenreDescription[PVR_ADDON_DESC_STRING_LENGTH];
+    char strChannelName[PVR_ADDON_NAME_STRING_LENGTH];
+    char strIconPath[PVR_ADDON_URL_STRING_LENGTH];
+    char strThumbnailPath[PVR_ADDON_URL_STRING_LENGTH];
+    char strFanartPath[PVR_ADDON_URL_STRING_LENGTH];
+    time_t recordingTime;
+    int iDuration;
+    int iPriority;
+    int iLifetime;
+    int iGenreType;
+    int iGenreSubType;
+    int iPlayCount;
+    int iLastPlayedPosition;
+    bool bIsDeleted;
+    unsigned int iEpgEventId;
+    int iChannelUid;
+    enum PVR_RECORDING_CHANNEL_TYPE channelType;
+    char strFirstAired[PVR_ADDON_DATE_STRING_LENGTH];
+    unsigned int iFlags;
+    int64_t sizeInBytes;
+  } PVR_RECORDING;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h
new file mode 100644
index 0000000..04b4059
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h
@@ -0,0 +1,155 @@
+/*
+ *  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 "pvr_defines.h"
+
+#ifdef BUILD_KODI_ADDON
+#include "../../../DemuxPacket.h"
+#else
+#include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
+#endif
+
+#include <stdint.h>
+#include <time.h>
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 9 - PVR stream definitions (NOTE: Becomes replaced
+// in future by inputstream addon instance way)
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Stream
+  /// @brief Maximum of allowed streams
+  ///
+  #define PVR_STREAM_MAX_STREAMS 20
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Stream
+  /// @brief Invalid codec identifier
+  ///
+  #define PVR_INVALID_CODEC_ID 0
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Stream
+  /// @brief Invalid codec
+  ///
+  #define PVR_INVALID_CODEC \
+    { \
+      PVR_CODEC_TYPE_UNKNOWN, PVR_INVALID_CODEC_ID \
+    }
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Stream_PVR_CODEC_TYPE enum PVR_CODEC_TYPE
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Stream
+  /// @brief **Inputstream types**\n
+  /// To identify type on stream.
+  ///
+  /// Used on @ref kodi::addon::PVRStreamProperties::SetCodecType and @ref kodi::addon::PVRStreamProperties::SetCodecType.
+  ///
+  ///@{
+  typedef enum PVR_CODEC_TYPE
+  {
+    /// @brief To set nothing defined.
+    PVR_CODEC_TYPE_UNKNOWN = -1,
+
+    /// @brief To identify @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties as Video.
+    PVR_CODEC_TYPE_VIDEO,
+
+    /// @brief To identify @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties as Audio.
+    PVR_CODEC_TYPE_AUDIO,
+
+    /// @brief To identify @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties as Data.
+    ///
+    /// With codec id related source identified.
+    PVR_CODEC_TYPE_DATA,
+
+    /// @brief To identify @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties as Subtitle.
+    PVR_CODEC_TYPE_SUBTITLE,
+
+    /// @brief To identify @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties as Radio RDS.
+    PVR_CODEC_TYPE_RDS,
+
+    PVR_CODEC_TYPE_NB
+  } PVR_CODEC_TYPE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Stream_PVR_CODEC struct PVR_CODEC
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Stream
+  /// @brief **Codec identification structure**\n
+  /// Identifier about stream between Kodi and addon.
+  ///
+  ///@{
+  typedef struct PVR_CODEC
+  {
+    /// @brief Used codec type for stream.
+    enum PVR_CODEC_TYPE codec_type;
+
+    /// @brief Related codec identifier, normally match the ffmpeg id's.
+    unsigned int codec_id;
+  } PVR_CODEC;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" Stream properties
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamProperties for description of values.
+   */
+  typedef struct PVR_STREAM_PROPERTIES
+  {
+    unsigned int iStreamCount;
+    struct PVR_STREAM
+    {
+      unsigned int iPID;
+      enum PVR_CODEC_TYPE iCodecType;
+      unsigned int iCodecId;
+      char strLanguage[4];
+      int iSubtitleInfo;
+      int iFPSScale;
+      int iFPSRate;
+      int iHeight;
+      int iWidth;
+      float fAspect;
+      int iChannels;
+      int iSampleRate;
+      int iBlockAlign;
+      int iBitRate;
+      int iBitsPerSample;
+    } stream[PVR_STREAM_MAX_STREAMS];
+  } PVR_STREAM_PROPERTIES;
+
+  /*!
+   * @brief "C" Times of playing stream (Live TV and recordings)
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref cpp_kodi_addon_pvr_Defs_Stream_PVRStreamTimes for description of values.
+   */
+  typedef struct PVR_STREAM_TIMES
+  {
+    time_t startTime;
+    int64_t ptsStart;
+    int64_t ptsBegin;
+    int64_t ptsEnd;
+  } PVR_STREAM_TIMES;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h
new file mode 100644
index 0000000..bc16adb
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h
@@ -0,0 +1,407 @@
+/*
+ *  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 "pvr_defines.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <time.h>
+
+//¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+// "C" Definitions group 6 - PVR timers
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVR_TIMER_ definition PVR_TIMER (various)
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Timer
+  /// @brief **PVR timer various different definitions**\n
+  /// This mostly used on @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimer "kodi::addon::PVRTimer"
+  /// to define default or not available.
+  ///
+  ///@{
+
+  //============================================================================
+  /// @brief Numeric PVR timer type definitions (@ref kodi::addon::PVRTimer::SetTimerType()
+  /// values).
+  ///
+  /// "Null" value for a numeric timer type.
+  #define PVR_TIMER_TYPE_NONE 0
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Special @ref kodi::addon::PVRTimer::SetClientIndex() value to indicate
+  /// that a timer has not (yet) a valid client index.
+  ///
+  /// Timer has not (yet) a valid client index.
+  #define PVR_TIMER_NO_CLIENT_INDEX 0
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Special @ref kodi::addon::PVRTimer::SetParentClientIndex() value to
+  /// indicate that a timer has no parent.
+  ///
+  /// Timer has no parent; it was not scheduled by a repeating timer.
+  #define PVR_TIMER_NO_PARENT PVR_TIMER_NO_CLIENT_INDEX
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Special @ref kodi::addon::PVRTimer::SetEPGUid() value to indicate
+  /// that a timer has no EPG event uid.
+  ///
+  /// Timer has no EPG event unique identifier.
+  #define PVR_TIMER_NO_EPG_UID EPG_TAG_INVALID_UID
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Special @ref kodi::addon::PVRTimer::SetClientChannelUid() value to
+  /// indicate "any channel". Useful for some repeating timer types.
+  ///
+  /// denotes "any channel", not a specific one.
+  ///
+  #define PVR_TIMER_ANY_CHANNEL -1
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @brief Value where set in background to inform that related part not used.
+  ///
+  /// Normally this related parts need not to set by this as it is default.
+  #define PVR_TIMER_VALUE_NOT_AVAILABLE -1
+  //----------------------------------------------------------------------------
+
+  ///@}
+  //----------------------------------------------------------------------------
+
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVR_TIMER_TYPES enum PVR_TIMER_TYPES
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Timer
+  /// @brief **PVR timer type attributes (@ref kodi::addon::PVRTimerType::SetAttributes() values).**\n
+  /// 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);
+  /// ~~~~~~~~~~~~~
+  ///
+  ///@{
+  typedef enum PVR_TIMER_TYPES
+  {
+    /// @brief __0000 0000 0000 0000 0000 0000 0000 0000__ :\n Empty attribute value.
+    PVR_TIMER_TYPE_ATTRIBUTE_NONE = 0,
+
+    /// @brief __0000 0000 0000 0000 0000 0000 0000 0001__ :\n Defines whether this is a type for
+    /// manual (time-based) or epg-based timers.
+    PVR_TIMER_TYPE_IS_MANUAL = (1 << 0),
+
+    /// @brief __0000 0000 0000 0000 0000 0000 0000 0010__ :\n Defines whether this is a type for
+    /// repeating or one-shot timers.
+    PVR_TIMER_TYPE_IS_REPEATING = (1 << 1),
+
+    /// @brief __0000 0000 0000 0000 0000 0000 0000 0100__ :\n Timers of this type must not be edited
+    /// by Kodi.
+    PVR_TIMER_TYPE_IS_READONLY = (1 << 2),
+
+    /// @brief __0000 0000 0000 0000 0000 0000 0000 1000__ :\n Timers of this type must not be created
+    /// by Kodi. All other operations are allowed, though.
+    PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES = (1 << 3),
+
+    /// @brief __0000 0000 0000 0000 0000 0000 0001 0000__ :\n This type supports enabling/disabling
+    /// of the timer (@ref kodi::addon::PVRTimer::SetState() with
+    /// @ref PVR_TIMER_STATE_SCHEDULED | @ref PVR_TIMER_STATE_DISABLED).
+    PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE = (1 << 4),
+
+    /// @brief __0000 0000 0000 0000 0000 0000 0010 0000__ :\n This type supports channels
+    /// (@ref kodi::addon::PVRTimer::SetClientChannelUid()).
+    PVR_TIMER_TYPE_SUPPORTS_CHANNELS = (1 << 5),
+
+    /// @brief __0000 0000 0000 0000 0000 0000 0100 0000__ :\n This type supports a recording start
+    /// time (@ref kodi::addon::PVRTimer::SetStartTime()).
+    PVR_TIMER_TYPE_SUPPORTS_START_TIME = (1 << 6),
+
+    /// @brief __0000 0000 0000 0000 0000 0000 1000 0000__ :\n This type supports matching epg episode
+    ///  title using@ref kodi::addon::PVRTimer::SetEPGSearchString().
+    PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH = (1 << 7),
+
+    /// @brief __0000 0000 0000 0000 0000 0001 0000 0000__ :\n This type supports matching "more" epg
+    /// data (not just episode title) using @ref kodi::addon::PVRTimer::SetEPGSearchString().
+    /// Setting @ref PVR_TIMER_TYPE_SUPPORTS_FULLTEXT_EPG_MATCH implies
+    /// @ref PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH.
+    PVR_TIMER_TYPE_SUPPORTS_FULLTEXT_EPG_MATCH = (1 << 8),
+
+    /// @brief __0000 0000 0000 0000 0000 0010 0000 0000__ :\n This type supports a first day the
+    /// timer gets active (@ref kodi::addon::PVRTimer::SetFirstDay()).
+    PVR_TIMER_TYPE_SUPPORTS_FIRST_DAY = (1 << 9),
+
+    /// @brief __0000 0000 0000 0000 0000 0100 0000 0000__ :\n This type supports weekdays for
+    /// defining the recording schedule (@ref kodi::addon::PVRTimer::SetWeekdays()).
+    PVR_TIMER_TYPE_SUPPORTS_WEEKDAYS = (1 << 10),
+
+    /// @brief __0000 0000 0000 0000 0000 1000 0000 0000__ :\n This type supports the <b>"record only new episodes"</b> feature
+    /// (@ref kodi::addon::PVRTimer::SetPreventDuplicateEpisodes()).
+    PVR_TIMER_TYPE_SUPPORTS_RECORD_ONLY_NEW_EPISODES = (1 << 11),
+
+    /// @brief __0000 0000 0000 0000 0001 0000 0000 0000__ :\n This type supports pre and post record time (@ref kodi::addon::PVRTimer::SetMarginStart(),
+    /// @ref kodi::addon::PVRTimer::SetMarginEnd()).
+    PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN = (1 << 12),
+
+    /// @brief __0000 0000 0000 0000 0010 0000 0000 0000__ :\n This type supports recording priority (@ref kodi::addon::PVRTimer::SetPriority()).
+    PVR_TIMER_TYPE_SUPPORTS_PRIORITY = (1 << 13),
+
+    /// @brief __0000 0000 0000 0000 0100 0000 0000 0000__ :\n This type supports recording lifetime (@ref kodi::addon::PVRTimer::SetLifetime()).
+    PVR_TIMER_TYPE_SUPPORTS_LIFETIME = (1 << 14),
+
+    /// @brief __0000 0000 0000 0000 1000 0000 0000 0000__ :\n This type supports placing recordings in user defined folders
+    /// (@ref kodi::addon::PVRTimer::SetDirectory()).
+    PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS = (1 << 15),
+
+    /// @brief __0000 0000 0000 0001 0000 0000 0000 0000__ :\n This type supports a list of recording groups
+    /// (@ref kodi::addon::PVRTimer::SetRecordingGroup()).
+    PVR_TIMER_TYPE_SUPPORTS_RECORDING_GROUP = (1 << 16),
+
+    /// @brief __0000 0000 0000 0010 0000 0000 0000 0000__ :\n This type supports a recording end time (@ref kodi::addon::PVRTimer::SetEndTime()).
+    PVR_TIMER_TYPE_SUPPORTS_END_TIME = (1 << 17),
+
+    /// @brief __0000 0000 0000 0100 0000 0000 0000 0000__ :\n Enables an 'Any Time' over-ride option for start time
+    /// (using @ref kodi::addon::PVRTimer::SetStartAnyTime()).
+    PVR_TIMER_TYPE_SUPPORTS_START_ANYTIME = (1 << 18),
+
+    /// @brief __0000 0000 0000 1000 0000 0000 0000 0000__ :\n Enables a separate <b>'Any Time'</b> over-ride for end time
+    /// (using @ref kodi::addon::PVRTimer::SetEndAnyTime()).
+    PVR_TIMER_TYPE_SUPPORTS_END_ANYTIME = (1 << 19),
+
+    /// @brief __0000 0000 0001 0000 0000 0000 0000 0000__ :\n This type supports specifying a maximum recordings setting'
+    /// (@ref kodi::addon::PVRTimer::SetMaxRecordings()).
+    PVR_TIMER_TYPE_SUPPORTS_MAX_RECORDINGS = (1 << 20),
+
+    /// @brief __0000 0000 0010 0000 0000 0000 0000 0000__ :\n This type should not appear on any create menus which don't
+    /// provide an associated @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "EPG tag".
+    PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE = (1 << 21),
+
+    /// @brief __0000 0000 0100 0000 0000 0000 0000 0000__ :\n This type should not appear on any create menus which provide an
+    /// associated @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "EPG tag".
+    PVR_TIMER_TYPE_FORBIDS_EPG_TAG_ON_CREATE = (1 << 22),
+
+    /// @brief __0000 0000 1000 0000 0000 0000 0000 0000__ :\n This type should not appear on any create menus unless associated
+    /// with an @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "EPG tag" with
+    /// 'series' attributes.
+    ///
+    /// Following conditions allow this:
+    /// - @ref kodi::addon::PVREPGTag::SetFlags() have flag @ref EPG_TAG_FLAG_IS_SERIES
+    /// - @ref kodi::addon::PVREPGTag::SetSeriesNumber() > 0
+    /// - @ref kodi::addon::PVREPGTag::SetEpisodeNumber() > 0
+    /// - @ref kodi::addon::PVREPGTag::SetEpisodePartNumber() > 0
+    ///
+    /// Implies @ref PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE.
+    PVR_TIMER_TYPE_REQUIRES_EPG_SERIES_ON_CREATE = (1 << 23),
+
+    /// @brief __0000 0001 0000 0000 0000 0000 0000 0000__ :\n This type supports 'any channel', for example when defining a timer
+    /// rule that should match any channel instaed of a particular channel.
+    PVR_TIMER_TYPE_SUPPORTS_ANY_CHANNEL = (1 << 24),
+
+    /// @brief __0000 0010 0000 0000 0000 0000 0000 0000__ :\n This type should not appear on any create menus which don't provide
+    /// an associated @ref cpp_kodi_addon_pvr_Defs_epg_PVREPGTag "EPG tag" with
+    /// a series link.
+    PVR_TIMER_TYPE_REQUIRES_EPG_SERIESLINK_ON_CREATE = (1 << 25),
+
+    /// @brief __0000 0100 0000 0000 0000 0000 0000 0000__ :\n This type allows deletion of an otherwise read-only timer.
+    PVR_TIMER_TYPE_SUPPORTS_READONLY_DELETE = (1 << 26),
+
+    /// @brief __0000 1000 0000 0000 0000 0000 0000 0000__ :\n Timers of this type do trigger a reminder if time is up.
+    PVR_TIMER_TYPE_IS_REMINDER = (1 << 27),
+
+    /// @brief __0001 0000 0000 0000 0000 0000 0000 0000__ :\n This type supports pre record time (@ref kodi::addon::PVRTimer::SetMarginStart()).
+    PVR_TIMER_TYPE_SUPPORTS_START_MARGIN = (1 << 28),
+
+    /// @brief __0010 0000 0000 0000 0000 0000 0000 0000__ :\n This type supports post record time (@ref kodi::addon::PVRTimer::SetMarginEnd()).
+    PVR_TIMER_TYPE_SUPPORTS_END_MARGIN = (1 << 29),
+  } PVR_TIMER_TYPES;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVR_WEEKDAY enum PVR_WEEKDAY
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Timer
+  /// @brief **PVR timer weekdays** (@ref kodi::addon::PVRTimer::SetWeekdays() **values**)\n
+  /// Used to select the days of a week you want.
+  ///
+  /// It can be also used to select several days e.g.:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// ...
+  /// unsigned int day = PVR_WEEKDAY_MONDAY | PVR_WEEKDAY_SATURDAY;
+  /// ...
+  /// ~~~~~~~~~~~~~
+  ///
+  ///@{
+  typedef enum PVR_WEEKDAYS
+  {
+    /// @brief __0000 0000__ : Nothing selected.
+    PVR_WEEKDAY_NONE = 0,
+
+    /// @brief __0000 0001__ : To select Monday.
+    PVR_WEEKDAY_MONDAY = (1 << 0),
+
+    /// @brief __0000 0010__ : To select Tuesday.
+    PVR_WEEKDAY_TUESDAY = (1 << 1),
+
+    /// @brief __0000 0100__ : To select Wednesday.
+    PVR_WEEKDAY_WEDNESDAY = (1 << 2),
+
+    /// @brief __0000 1000__ : To select Thursday.
+    PVR_WEEKDAY_THURSDAY = (1 << 3),
+
+    /// @brief __0001 0000__ : To select Friday.
+    PVR_WEEKDAY_FRIDAY = (1 << 4),
+
+    /// @brief __0010 0000__ : To select Saturday.
+    PVR_WEEKDAY_SATURDAY = (1 << 5),
+
+    /// @brief __0100 0000__ : To select Sunday.
+    PVR_WEEKDAY_SUNDAY = (1 << 6),
+
+    /// @brief __0111 1111__ : To select all days of week.
+    PVR_WEEKDAY_ALLDAYS = PVR_WEEKDAY_MONDAY | PVR_WEEKDAY_TUESDAY | PVR_WEEKDAY_WEDNESDAY |
+                          PVR_WEEKDAY_THURSDAY | PVR_WEEKDAY_FRIDAY | PVR_WEEKDAY_SATURDAY |
+                          PVR_WEEKDAY_SUNDAY
+  } PVR_WEEKDAY;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_addon_pvr_Defs_Timer_PVR_TIMER_STATE enum PVR_TIMER_STATE
+  /// @ingroup cpp_kodi_addon_pvr_Defs_Timer
+  /// @brief **PVR timer states**\n
+  /// To set within @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimer "kodi::addon::PVRTimer"
+  /// the needed state about.
+  ///
+  ///@{
+  typedef enum PVR_TIMER_STATE
+  {
+    /// @brief __0__ : The timer was just created on the backend and is not yet active.
+    ///
+    /// This state must not be used for timers just created on the client side.
+    PVR_TIMER_STATE_NEW = 0,
+
+    /// @brief __1__ : The timer is scheduled for recording.
+    PVR_TIMER_STATE_SCHEDULED = 1,
+
+    /// @brief __2__ : The timer is currently recordings.
+    PVR_TIMER_STATE_RECORDING = 2,
+
+    /// @brief __3__ : The recording completed successfully.
+    PVR_TIMER_STATE_COMPLETED = 3,
+
+    /// @brief __4__ : Recording started, but was aborted.
+    PVR_TIMER_STATE_ABORTED = 4,
+
+    /// @brief __5__ : The timer was scheduled, but was canceled.
+    PVR_TIMER_STATE_CANCELLED = 5,
+
+    /// @brief __6__ : The scheduled timer conflicts with another one, but will be
+    /// recorded.
+    PVR_TIMER_STATE_CONFLICT_OK = 6,
+
+    /// @brief __7__ : The scheduled timer conflicts with another one and won't be
+    /// recorded.
+    PVR_TIMER_STATE_CONFLICT_NOK = 7,
+
+    /// @brief __8__ : The timer is scheduled, but can't be recorded for some reason.
+    PVR_TIMER_STATE_ERROR = 8,
+
+    /// @brief __9__ : The timer was disabled by the user, can be enabled via setting
+    /// the state to @ref PVR_TIMER_STATE_SCHEDULED.
+    PVR_TIMER_STATE_DISABLED = 9,
+  } PVR_TIMER_STATE;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief "C" PVR add-on timer event.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimer "kodi::addon::PVRTimer" for
+   * description of values.
+   */
+  typedef struct PVR_TIMER
+  {
+    unsigned int iClientIndex;
+    unsigned int iParentClientIndex;
+    int iClientChannelUid;
+    time_t startTime;
+    time_t endTime;
+    bool bStartAnyTime;
+    bool bEndAnyTime;
+    enum PVR_TIMER_STATE state;
+    unsigned int iTimerType;
+    char strTitle[PVR_ADDON_NAME_STRING_LENGTH];
+    char strEpgSearchString[PVR_ADDON_NAME_STRING_LENGTH];
+    bool bFullTextEpgSearch;
+    char strDirectory[PVR_ADDON_URL_STRING_LENGTH];
+    char strSummary[PVR_ADDON_DESC_STRING_LENGTH];
+    int iPriority;
+    int iLifetime;
+    int iMaxRecordings;
+    unsigned int iRecordingGroup;
+    time_t firstDay;
+    unsigned int iWeekdays;
+    unsigned int iPreventDuplicateEpisodes;
+    unsigned int iEpgUid;
+    unsigned int iMarginStart;
+    unsigned int iMarginEnd;
+    int iGenreType;
+    int iGenreSubType;
+    char strSeriesLink[PVR_ADDON_URL_STRING_LENGTH];
+  } PVR_TIMER;
+
+  /*!
+   * @brief "C" PVR add-on timer event type.
+   *
+   * Structure used to interface in "C" between Kodi and Addon.
+   *
+   * See @ref cpp_kodi_addon_pvr_Defs_Timer_PVRTimerType "kodi::addon::PVRTimerType" for
+   * description of values.
+   */
+  typedef struct PVR_TIMER_TYPE
+  {
+    unsigned int iId;
+    uint64_t iAttributes;
+    char strDescription[PVR_ADDON_TIMERTYPE_STRING_LENGTH];
+
+    unsigned int iPrioritiesSize;
+    struct PVR_ATTRIBUTE_INT_VALUE priorities[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE];
+    int iPrioritiesDefault;
+
+    unsigned int iLifetimesSize;
+    struct PVR_ATTRIBUTE_INT_VALUE lifetimes[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE];
+    int iLifetimesDefault;
+
+    unsigned int iPreventDuplicateEpisodesSize;
+    struct PVR_ATTRIBUTE_INT_VALUE preventDuplicateEpisodes[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE];
+    unsigned int iPreventDuplicateEpisodesDefault;
+
+    unsigned int iRecordingGroupSize;
+    struct PVR_ATTRIBUTE_INT_VALUE recordingGroup[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE];
+    unsigned int iRecordingGroupDefault;
+
+    unsigned int iMaxRecordingsSize;
+    struct PVR_ATTRIBUTE_INT_VALUE maxRecordings[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE_SMALL];
+    int iMaxRecordingsDefault;
+  } PVR_TIMER_TYPE;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon_base.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon_base.h
new file mode 100644
index 0000000..1924d77
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/addon_base.h
@@ -0,0 +1,252 @@
+/*
+ *  Copyright (C) 2005-2019 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 "stdbool.h"
+#include "stdint.h"
+
+#ifndef TARGET_WINDOWS
+#ifndef __cdecl
+#define __cdecl
+#endif
+#ifndef __declspec
+#define __declspec(X)
+#endif
+#endif
+
+#undef ATTRIBUTE_PACKED
+#undef PRAGMA_PACK_BEGIN
+#undef PRAGMA_PACK_END
+
+#if defined(__GNUC__)
+#define ATTRIBUTE_PACKED __attribute__((packed))
+#define PRAGMA_PACK 0
+#define ATTRIBUTE_HIDDEN __attribute__((visibility("hidden")))
+#endif
+
+#if !defined(ATTRIBUTE_PACKED)
+#define ATTRIBUTE_PACKED
+#define PRAGMA_PACK 1
+#endif
+
+#if !defined(ATTRIBUTE_HIDDEN)
+#define ATTRIBUTE_HIDDEN
+#endif
+
+#ifdef _MSC_VER
+#define ATTRIBUTE_FORCEINLINE __forceinline
+#elif defined(__GNUC__)
+#define ATTRIBUTE_FORCEINLINE inline __attribute__((__always_inline__))
+#elif defined(__CLANG__)
+#if __has_attribute(__always_inline__)
+#define ATTRIBUTE_FORCEINLINE inline __attribute__((__always_inline__))
+#else
+#define ATTRIBUTE_FORCEINLINE inline
+#endif
+#else
+#define ATTRIBUTE_FORCEINLINE inline
+#endif
+
+/*
+ * To have a on add-on and kodi itself handled string always on known size!
+ */
+#define ADDON_STANDARD_STRING_LENGTH 1024
+#define ADDON_STANDARD_STRING_LENGTH_SMALL 256
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// @ingroup cpp_kodi_addon_addonbase
+  /// @brief Return value of functions in @ref cpp_kodi_addon_addonbase "kodi::addon::CAddonBase"
+  /// and associated classes.
+  ///
+  ///@{
+  typedef enum ADDON_STATUS
+  {
+    /// @brief For everything OK and no error
+    ADDON_STATUS_OK,
+
+    /// @brief A needed connection was lost
+    ADDON_STATUS_LOST_CONNECTION,
+
+    /// @brief Addon needs a restart inside Kodi
+    ADDON_STATUS_NEED_RESTART,
+
+    /// @brief Necessary settings are not yet set
+    ADDON_STATUS_NEED_SETTINGS,
+
+    /// @brief Unknown and incomprehensible error
+    ADDON_STATUS_UNKNOWN,
+
+    /// @brief Permanent failure, like failing to resolve methods
+    ADDON_STATUS_PERMANENT_FAILURE,
+
+    /* internal used return error if function becomes not used from child on
+    * addon */
+    ADDON_STATUS_NOT_IMPLEMENTED
+  } ADDON_STATUS;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_Defs_AddonLog enum AddonLog
+  /// @ingroup cpp_kodi_Defs
+  /// @brief **Log file type definitions**\n
+  /// These define the types of log entries given with @ref kodi::Log() to Kodi.
+  ///
+  /// -------------------------------------------------------------------------
+  ///
+  /// **Example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/General.h>
+  ///
+  /// kodi::Log(ADDON_LOG_ERROR, "%s: There is an error occurred!", __func__);
+  ///
+  /// ~~~~~~~~~~~~~
+  ///
+  ///@{
+  typedef enum AddonLog
+  {
+    /// @brief **0** : To include debug information in the log file.
+    ADDON_LOG_DEBUG = 0,
+
+    /// @brief **1** : To include information messages in the log file.
+    ADDON_LOG_INFO = 1,
+
+    /// @brief **2** : To write warnings in the log file.
+    ADDON_LOG_WARNING = 2,
+
+    /// @brief **3** : To report error messages in the log file.
+    ADDON_LOG_ERROR = 3,
+
+    /// @brief **4** : To notify fatal unrecoverable errors, which can may also indicate
+    /// upcoming crashes.
+    ADDON_LOG_FATAL = 4
+  } AddonLog;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  /*! @brief Standard undefined pointer handle */
+  typedef void* KODI_HANDLE;
+
+  /*!
+   * @brief Handle used to return data from the PVR add-on to CPVRClient
+   */
+  struct ADDON_HANDLE_STRUCT
+  {
+    void* callerAddress; /*!< address of the caller */
+    void* dataAddress; /*!< address to store data in */
+    int dataIdentifier; /*!< parameter to pass back when calling the callback */
+  };
+  typedef struct ADDON_HANDLE_STRUCT* ADDON_HANDLE;
+
+  /*!
+   * @brief Callback function tables from addon to Kodi
+   * Set complete from Kodi!
+   */
+  struct AddonToKodiFuncTable_kodi;
+  struct AddonToKodiFuncTable_kodi_audioengine;
+  struct AddonToKodiFuncTable_kodi_filesystem;
+  struct AddonToKodiFuncTable_kodi_network;
+  struct AddonToKodiFuncTable_kodi_gui;
+  typedef struct AddonToKodiFuncTable_Addon
+  {
+    // Pointer inside Kodi, used on callback functions to give related handle
+    // class, for this ADDON::CAddonDll inside Kodi.
+    KODI_HANDLE kodiBase;
+
+    // Function addresses used for callbacks from addon to Kodi
+    char* (*get_type_version)(void* kodiBase, int type);
+
+    void (*free_string)(void* kodiBase, char* str);
+    void (*free_string_array)(void* kodiBase, char** arr, int numElements);
+    char* (*get_addon_path)(void* kodiBase);
+    char* (*get_base_user_path)(void* kodiBase);
+    void (*addon_log_msg)(void* kodiBase, const int loglevel, const char* msg);
+
+    bool (*get_setting_bool)(void* kodiBase, const char* id, bool* value);
+    bool (*get_setting_int)(void* kodiBase, const char* id, int* value);
+    bool (*get_setting_float)(void* kodiBase, const char* id, float* value);
+    bool (*get_setting_string)(void* kodiBase, const char* id, char** value);
+
+    bool (*set_setting_bool)(void* kodiBase, const char* id, bool value);
+    bool (*set_setting_int)(void* kodiBase, const char* id, int value);
+    bool (*set_setting_float)(void* kodiBase, const char* id, float value);
+    bool (*set_setting_string)(void* kodiBase, const char* id, const char* value);
+
+    void* (*get_interface)(void* kodiBase, const char* name, const char* version);
+
+    struct AddonToKodiFuncTable_kodi* kodi;
+    struct AddonToKodiFuncTable_kodi_audioengine* kodi_audioengine;
+    struct AddonToKodiFuncTable_kodi_filesystem* kodi_filesystem;
+    struct AddonToKodiFuncTable_kodi_gui* kodi_gui;
+    struct AddonToKodiFuncTable_kodi_network* kodi_network;
+
+    // Move up by min version change about
+    bool (*is_setting_using_default)(void* kodiBase, const char* id);
+  } AddonToKodiFuncTable_Addon;
+
+  /*!
+   * @brief Function tables from Kodi to addon
+   */
+  typedef struct KodiToAddonFuncTable_Addon
+  {
+    void (*destroy)();
+    ADDON_STATUS (*get_status)();
+    ADDON_STATUS(*create_instance)
+    (int instanceType,
+     const char* instanceID,
+     KODI_HANDLE instance,
+     const char* version,
+     KODI_HANDLE* addonInstance,
+     KODI_HANDLE parent);
+    void (*destroy_instance)(int instanceType, KODI_HANDLE instance);
+    ADDON_STATUS (*set_setting)(const char* settingName, const void* settingValue);
+  } KodiToAddonFuncTable_Addon;
+
+  /*!
+   * @brief Main structure passed from kodi to addon with basic information needed to
+   * create add-on.
+   */
+  typedef struct AddonGlobalInterface
+  {
+    // String with full path where add-on is installed (without his name on end)
+    // Set from Kodi!
+    const char* libBasePath;
+
+    // Master API version of Kodi itself (ADDON_GLOBAL_VERSION_MAIN)
+    const char* kodi_base_api_version;
+
+    // Pointer of first created instance, used in case this add-on goes with single way
+    // Set from Kodi!
+    KODI_HANDLE firstKodiInstance;
+
+    // Pointer to master base class inside add-on
+    // Set from addon header (kodi::addon::CAddonBase)!
+    KODI_HANDLE addonBase;
+
+    // Pointer to a instance used on single way (together with this class)
+    // Set from addon header (kodi::addon::IAddonInstance)!
+    KODI_HANDLE globalSingleInstance;
+
+    // Callback function tables from addon to Kodi
+    // Set from Kodi!
+    AddonToKodiFuncTable_Addon* toKodi;
+
+    // Function tables from Kodi to addon
+    // Set from addon header!
+    KodiToAddonFuncTable_Addon* toAddon;
+  } AddonGlobalInterface;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/audio_engine.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/audio_engine.h
new file mode 100644
index 0000000..02e96ac
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/audio_engine.h
@@ -0,0 +1,308 @@
+/*
+ *  Copyright (C) 2005-2019 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 "stdint.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+  // "C" Definitions, structures and enumerators of audio engine
+  //{{{
+
+  //============================================================================
+  /// @defgroup cpp_kodi_audioengine_Defs_AudioEngineStreamOptions enum AudioEngineStreamOptions
+  /// @ingroup cpp_kodi_audioengine_Defs
+  /// @brief **Bit options to pass to CAEStream**\n
+  /// A bit field of stream options.
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Usage example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// // Here only as minimal, "format" must be set to wanted types
+  /// kodi::audioengine::AudioEngineFormat format;
+  /// m_audioengine = new kodi::audioengine::CAEStream(format, AUDIO_STREAM_FORCE_RESAMPLE | AUDIO_STREAM_AUTOSTART);
+  /// ~~~~~~~~~~~~~
+  ///
+  //@{
+  typedef enum AudioEngineStreamOptions
+  {
+    /// force resample even if rates match
+    AUDIO_STREAM_FORCE_RESAMPLE = 1 << 0,
+    /// create the stream paused
+    AUDIO_STREAM_PAUSED = 1 << 1,
+    /// autostart the stream when enough data is buffered
+    AUDIO_STREAM_AUTOSTART = 1 << 2,
+  } AudioEngineStreamOptions;
+  //@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_audioengine_Defs_AudioEngineChannel enum AudioEngineChannel
+  /// @ingroup cpp_kodi_audioengine_Defs
+  /// @brief **The possible channels**\n
+  /// Used to set available or used channels on stream.
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Usage example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::audioengine::AudioEngineFormat format;
+  /// format.SetChannelLayout(std::vector<AudioEngineChannel>(AUDIOENGINE_CH_FL, AUDIOENGINE_CH_FR));
+  /// ~~~~~~~~~~~~~
+  ///
+  //@{
+  enum AudioEngineChannel
+  {
+    /// Used inside to indicate the end of a list and not for addon use directly.
+    AUDIOENGINE_CH_NULL = -1,
+    /// RAW Audio format
+    AUDIOENGINE_CH_RAW,
+    /// Front left
+    AUDIOENGINE_CH_FL,
+    /// Front right
+    AUDIOENGINE_CH_FR,
+    /// Front center
+    AUDIOENGINE_CH_FC,
+    /// LFE / Subwoofer
+    AUDIOENGINE_CH_LFE,
+    /// Back left
+    AUDIOENGINE_CH_BL,
+    /// Back right
+    AUDIOENGINE_CH_BR,
+    /// Front left over center
+    AUDIOENGINE_CH_FLOC,
+    /// Front right over center
+    AUDIOENGINE_CH_FROC,
+    /// Back center
+    AUDIOENGINE_CH_BC,
+    /// Side left
+    AUDIOENGINE_CH_SL,
+    /// Side right
+    AUDIOENGINE_CH_SR,
+    /// Top front left
+    AUDIOENGINE_CH_TFL,
+    /// Top front right
+    AUDIOENGINE_CH_TFR,
+    /// Top front center
+    AUDIOENGINE_CH_TFC,
+    /// Top center
+    AUDIOENGINE_CH_TC,
+    /// Top back left
+    AUDIOENGINE_CH_TBL,
+    /// Top back right
+    AUDIOENGINE_CH_TBR,
+    /// Top back center
+    AUDIOENGINE_CH_TBC,
+    /// Back left over center
+    AUDIOENGINE_CH_BLOC,
+    /// Back right over center
+    AUDIOENGINE_CH_BROC,
+    /// Maximum possible value, to use e.g. as size inside list
+    AUDIOENGINE_CH_MAX
+  };
+  //@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_audioengine_Defs_AudioEngineDataFormat enum AudioEngineDataFormat
+  /// @ingroup cpp_kodi_audioengine_Defs
+  /// @brief **Audio sample formats**\n
+  /// The bit layout of the audio data.
+  ///
+  /// LE = Little Endian, BE = Big Endian, NE = Native Endian
+  ///
+  /// For planar sample formats, each audio channel is in a separate data plane,
+  /// and linesize is the buffer size, in bytes, for a single plane. All data
+  /// planes must be the same size. For packed sample formats, only the first
+  /// data plane is used, and samples for each channel are interleaved. In this
+  /// case, linesize is the buffer size, in bytes, for the 1 plane.
+  ///
+  /// @note This is ordered from the worst to best preferred formats
+  ///
+  ///
+  /// ------------------------------------------------------------------------
+  ///
+  /// **Usage example:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// kodi::audioengine::AudioEngineFormat format;
+  /// format.SetDataFormat(AUDIOENGINE_FMT_FLOATP);
+  /// ~~~~~~~~~~~~~
+  ///
+  //@{
+  enum AudioEngineDataFormat
+  {
+    /// To define format as invalid
+    AUDIOENGINE_FMT_INVALID = -1,
+
+    /// Unsigned integer 8 bit
+    AUDIOENGINE_FMT_U8,
+
+    /// Big Endian signed integer 16 bit
+    AUDIOENGINE_FMT_S16BE,
+    /// Little Endian signed integer 16 bit
+    AUDIOENGINE_FMT_S16LE,
+    /// Native Endian signed integer 16 bit
+    AUDIOENGINE_FMT_S16NE,
+
+    /// Big Endian signed integer 32 bit
+    AUDIOENGINE_FMT_S32BE,
+    /// Little Endian signed integer 32 bit
+    AUDIOENGINE_FMT_S32LE,
+    /// Native Endian signed integer 32 bit
+    AUDIOENGINE_FMT_S32NE,
+
+    /// Big Endian signed integer 24 bit (in 4 bytes)
+    AUDIOENGINE_FMT_S24BE4,
+    /// Little Endian signed integer 24 bit (in 4 bytes)
+    AUDIOENGINE_FMT_S24LE4,
+    /// Native Endian signed integer 24 bit (in 4 bytes)
+    AUDIOENGINE_FMT_S24NE4,
+    /// S32 with bits_per_sample < 32
+    AUDIOENGINE_FMT_S24NE4MSB,
+
+    /// Big Endian signed integer 24 bit (3 bytes)
+    AUDIOENGINE_FMT_S24BE3,
+    /// Little Endian signed integer 24 bit (3 bytes)
+    AUDIOENGINE_FMT_S24LE3,
+     /// Native Endian signed integer 24 bit (3 bytes)
+    AUDIOENGINE_FMT_S24NE3,
+
+    /// Double floating point
+    AUDIOENGINE_FMT_DOUBLE,
+    /// Floating point
+    AUDIOENGINE_FMT_FLOAT,
+
+    /// **Bitstream**\n
+    /// RAW Audio format
+    AUDIOENGINE_FMT_RAW,
+
+    /// **Planar format**\n
+    /// Unsigned byte
+    AUDIOENGINE_FMT_U8P,
+    /// **Planar format**\n
+    /// Native Endian signed 16 bit
+    AUDIOENGINE_FMT_S16NEP,
+    /// **Planar format**\n
+    /// Native Endian signed 32 bit
+    AUDIOENGINE_FMT_S32NEP,
+    /// **Planar format**\n
+    /// Native Endian signed integer 24 bit (in 4 bytes)
+    AUDIOENGINE_FMT_S24NE4P,
+    /// **Planar format**\n
+    /// S32 with bits_per_sample < 32
+    AUDIOENGINE_FMT_S24NE4MSBP,
+    /// **Planar format**\n
+    /// Native Endian signed integer 24 bit (in 3 bytes)
+    AUDIOENGINE_FMT_S24NE3P,
+    /// **Planar format**\n
+    /// Double floating point
+    AUDIOENGINE_FMT_DOUBLEP,
+    /// **Planar format**\n
+    /// Floating point
+    AUDIOENGINE_FMT_FLOATP,
+
+    /// Amount of sample formats.
+    AUDIOENGINE_FMT_MAX
+  };
+  //@}
+  //----------------------------------------------------------------------------
+
+  /*!
+   * @brief Internal API structure which are used for data exchange between
+   * Kodi and addon.
+   */
+  struct AUDIO_ENGINE_FORMAT
+  {
+    /*! The stream's data format (eg, AUDIOENGINE_FMT_S16LE) */
+    enum AudioEngineDataFormat m_dataFormat;
+
+    /*! The stream's sample rate (eg, 48000) */
+    unsigned int m_sampleRate;
+
+    /*! The encoded streams sample rate if a bitstream, otherwise undefined */
+    unsigned int m_encodedRate;
+
+    /*! The amount of used speaker channels */
+    unsigned int m_channelCount;
+
+    /*! The stream's channel layout */
+    enum AudioEngineChannel m_channels[AUDIOENGINE_CH_MAX];
+
+    /*! The number of frames per period */
+    unsigned int m_frames;
+
+    /*! The size of one frame in bytes */
+    unsigned int m_frameSize;
+  };
+
+  /* A stream handle pointer, which is only used internally by the addon stream handle */
+  typedef void AEStreamHandle;
+
+  //}}}
+
+  //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+  // "C" Internal interface tables for intercommunications between addon and kodi
+  //{{{
+
+  /*
+   * Function address structure, not need to visible on dev kit doxygen
+   * documentation
+   */
+  typedef struct AddonToKodiFuncTable_kodi_audioengine
+  {
+    AEStreamHandle* (*make_stream)(void* kodiBase,
+                                   struct AUDIO_ENGINE_FORMAT* format,
+                                   unsigned int options);
+    void (*free_stream)(void* kodiBase, AEStreamHandle* stream);
+    bool (*get_current_sink_format)(void* kodiBase, struct AUDIO_ENGINE_FORMAT* sink_format);
+
+    // Audio Engine Stream definitions
+    unsigned int (*aestream_get_space)(void* kodiBase, AEStreamHandle* handle);
+    unsigned int (*aestream_add_data)(void* kodiBase,
+                                      AEStreamHandle* handle,
+                                      uint8_t* const* data,
+                                      unsigned int offset,
+                                      unsigned int frames,
+                                      double pts,
+                                      bool hasDownmix,
+                                      double centerMixLevel);
+    double (*aestream_get_delay)(void* kodiBase, AEStreamHandle* handle);
+    bool (*aestream_is_buffering)(void* kodiBase, AEStreamHandle* handle);
+    double (*aestream_get_cache_time)(void* kodiBase, AEStreamHandle* handle);
+    double (*aestream_get_cache_total)(void* kodiBase, AEStreamHandle* handle);
+    void (*aestream_pause)(void* kodiBase, AEStreamHandle* handle);
+    void (*aestream_resume)(void* kodiBase, AEStreamHandle* handle);
+    void (*aestream_drain)(void* kodiBase, AEStreamHandle* handle, bool wait);
+    bool (*aestream_is_draining)(void* kodiBase, AEStreamHandle* handle);
+    bool (*aestream_is_drained)(void* kodiBase, AEStreamHandle* handle);
+    void (*aestream_flush)(void* kodiBase, AEStreamHandle* handle);
+    float (*aestream_get_volume)(void* kodiBase, AEStreamHandle* handle);
+    void (*aestream_set_volume)(void* kodiBase, AEStreamHandle* handle, float volume);
+    float (*aestream_get_amplification)(void* kodiBase, AEStreamHandle* handle);
+    void (*aestream_set_amplification)(void* kodiBase, AEStreamHandle* handle, float amplify);
+    unsigned int (*aestream_get_frame_size)(void* kodiBase, AEStreamHandle* handle);
+    unsigned int (*aestream_get_channel_count)(void* kodiBase, AEStreamHandle* handle);
+    unsigned int (*aestream_get_sample_rate)(void* kodiBase, AEStreamHandle* handle);
+    enum AudioEngineDataFormat (*aestream_get_data_format)(void* kodiBase, AEStreamHandle* handle);
+    double (*aestream_get_resample_ratio)(void* kodiBase, AEStreamHandle* handle);
+    void (*aestream_set_resample_ratio)(void* kodiBase, AEStreamHandle* handle, double ratio);
+  } AddonToKodiFuncTable_kodi_audioengine;
+
+  //}}}
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/filesystem.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/filesystem.h
new file mode 100644
index 0000000..b68a24c
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/filesystem.h
@@ -0,0 +1,299 @@
+/*
+ *  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 <stdbool.h>
+#include <stdint.h>
+#include <time.h>
+
+#ifdef _WIN32 // windows
+#ifndef _SSIZE_T_DEFINED
+typedef intptr_t ssize_t;
+#define _SSIZE_T_DEFINED
+#endif // !_SSIZE_T_DEFINED
+
+// Prevent conflicts with Windows macros where have this names.
+#ifdef CreateDirectory
+#undef CreateDirectory
+#endif // CreateDirectory
+#ifdef DeleteFile
+#undef DeleteFile
+#endif // DeleteFile
+#endif // _WIN32
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+  // "C" Definitions, structures and enumerators of filesystem
+  //{{{
+
+  //============================================================================
+  /// @defgroup cpp_kodi_vfs_Defs_OpenFileFlags enum OpenFileFlags
+  /// @ingroup cpp_kodi_vfs_Defs
+  /// @brief **Flags to define way how file becomes opened**\n
+  /// The values can be used together, e.g. <b>`file.Open("myfile", ADDON_READ_TRUNCATED | ADDON_READ_CHUNKED);`</b>
+  ///
+  /// Used on @ref kodi::vfs::CFile::OpenFile().
+  ///
+  ///@{
+  typedef enum OpenFileFlags
+  {
+    /// @brief **0000 0000 0001** :\n
+    /// Indicate that caller can handle truncated reads, where function
+    /// returns before entire buffer has been filled.
+    ADDON_READ_TRUNCATED = 0x01,
+
+    /// @brief **0000 0000 0010** :\n
+    /// Indicate that that caller support read in the minimum defined
+    /// chunk size, this disables internal cache then.
+    ADDON_READ_CHUNKED = 0x02,
+
+    /// @brief **0000 0000 0100** :\n
+    /// Use cache to access this file.
+    ADDON_READ_CACHED = 0x04,
+
+    /// @brief **0000 0000 1000** :\n
+    /// Open without caching. regardless to file type.
+    ADDON_READ_NO_CACHE = 0x08,
+
+    /// @brief **0000 0001 0000** :\n
+    /// Calcuate bitrate for file while reading.
+    ADDON_READ_BITRATE = 0x10,
+
+    /// @brief **0000 0010 0000** :\n
+    /// Indicate to the caller we will seek between multiple streams in
+    /// the file frequently.
+    ADDON_READ_MULTI_STREAM = 0x20,
+
+    /// @brief **0000 0100 0000** :\n
+    /// indicate to the caller file is audio and/or video (and e.g. may
+    /// grow).
+    ADDON_READ_AUDIO_VIDEO = 0x40,
+
+    /// @brief **0000 1000 0000** :\n
+    /// Indicate that caller will do write operations before reading.
+    ADDON_READ_AFTER_WRITE = 0x80,
+
+    /// @brief **0001 0000 0000** :\n
+    /// Indicate that caller want to reopen a file if its already open.
+    ADDON_READ_REOPEN = 0x100
+  } OpenFileFlags;
+  ///@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_vfs_Defs_CURLOptiontype enum CURLOptiontype
+  /// @ingroup cpp_kodi_vfs_Defs
+  /// @brief **CURL message types**\n
+  /// Used on kodi::vfs::CFile::CURLAddOption().
+  ///
+  //@{
+  typedef enum CURLOptiontype
+  {
+    /// @brief Set a general option.
+    ADDON_CURL_OPTION_OPTION,
+
+    /// @brief Set a protocol option.
+    ///
+    /// The following names for *ADDON_CURL_OPTION_PROTOCOL* are possible:
+    ///
+    /// | Option name                         | Description
+    /// |------------------------------------:|:--------------------------------
+    /// | <b>`accept-charset`</b>             | Set the "accept-charset" header
+    /// | <b>`acceptencoding or encoding`</b> | Set the "accept-encoding" header
+    /// | <b>`active-remote`</b>              | Set the "active-remote" header
+    /// | <b>`auth`</b>                       | Set the authentication method. Possible values: any, anysafe, digest, ntlm
+    /// | <b>`connection-timeout`</b>         | Set the connection timeout in seconds
+    /// | <b>`cookie`</b>                     | Set the "cookie" header
+    /// | <b>`customrequest`</b>              | Set a custom HTTP request like DELETE
+    /// | <b>`noshout`</b>                    | Set to true if kodi detects a stream as shoutcast by mistake.
+    /// | <b>`postdata`</b>                   | Set the post body (value needs to be base64 encoded). (Implicitly sets the request to POST)
+    /// | <b>`referer`</b>                    | Set the "referer" header
+    /// | <b>`user-agent`</b>                 | Set the "user-agent" header
+    /// | <b>`seekable`</b>                   | Set the stream seekable. 1: enable, 0: disable
+    /// | <b>`sslcipherlist`</b>              | Set list of accepted SSL ciphers.
+    ///
+    ADDON_CURL_OPTION_PROTOCOL,
+
+    /// @brief Set User and password
+    ADDON_CURL_OPTION_CREDENTIALS,
+
+    /// @brief Add a Header
+    ADDON_CURL_OPTION_HEADER
+  } CURLOptiontype;
+  //@}
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @defgroup cpp_kodi_vfs_Defs_FilePropertyTypes enum FilePropertyTypes
+  /// @ingroup cpp_kodi_vfs_Defs
+  /// @brief **File property types**\n
+  /// Mostly to read internet sources.
+  ///
+  /// Used on kodi::vfs::CFile::GetPropertyValue() and kodi::vfs::CFile::GetPropertyValues().
+  ///
+  //@{
+  typedef enum FilePropertyTypes
+  {
+    /// @brief Get protocol response line.
+    ADDON_FILE_PROPERTY_RESPONSE_PROTOCOL,
+    /// @brief Get a response header.
+    ADDON_FILE_PROPERTY_RESPONSE_HEADER,
+    /// @brief Get file content type.
+    ADDON_FILE_PROPERTY_CONTENT_TYPE,
+    /// @brief Get file content charset.
+    ADDON_FILE_PROPERTY_CONTENT_CHARSET,
+    /// @brief Get file mime type.
+    ADDON_FILE_PROPERTY_MIME_TYPE,
+    /// @brief Get file effective URL (last one if redirected).
+    ADDON_FILE_PROPERTY_EFFECTIVE_URL
+  } FilePropertyTypes;
+  //@}
+  //----------------------------------------------------------------------------
+
+  //}}}
+
+  //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+  // "C" Internal interface tables for intercommunications between addon and kodi
+  //{{{
+
+  struct KODI_HTTP_HEADER
+  {
+    void* handle;
+
+    char* (*get_value)(void* kodiBase, void* handle, const char* param);
+    char** (*get_values)(void* kodiBase, void* handle, const char* param, int* length);
+    char* (*get_header)(void* kodiBase, void* handle);
+    char* (*get_mime_type)(void* kodiBase, void* handle);
+    char* (*get_charset)(void* kodiBase, void* handle);
+    char* (*get_proto_line)(void* kodiBase, void* handle);
+  };
+
+  struct STAT_STRUCTURE
+  {
+    /// ID of device containing file
+    uint32_t deviceId;
+    /// Total size, in bytes
+    uint64_t size;
+    /// Time of last access
+    time_t accessTime;
+    /// Time of last modification
+    time_t modificationTime;
+    /// Time of last status change
+    time_t statusTime;
+    /// The stat url is a directory
+    bool isDirectory;
+    /// The stat url is a symbolic link
+    bool isSymLink;
+  };
+
+  struct VFS_CACHE_STATUS_DATA
+  {
+    uint64_t forward;
+    unsigned int maxrate;
+    unsigned int currate;
+    bool lowspeed;
+  };
+
+  struct VFSProperty
+  {
+    char* name;
+    char* val;
+  };
+
+  struct VFSDirEntry
+  {
+    char* label; //!< item label
+    char* title; //!< item title
+    char* path; //!< item path
+    unsigned int num_props; //!< Number of properties attached to item
+    struct VFSProperty* properties; //!< Properties
+    time_t date_time; //!< file creation date & time
+    bool folder; //!< Item is a folder
+    uint64_t size; //!< Size of file represented by item
+  };
+
+  typedef struct AddonToKodiFuncTable_kodi_filesystem
+  {
+    bool (*can_open_directory)(void* kodiBase, const char* url);
+    bool (*create_directory)(void* kodiBase, const char* path);
+    bool (*remove_directory)(void* kodiBase, const char* path);
+    bool (*directory_exists)(void* kodiBase, const char* path);
+    bool (*get_directory)(void* kodiBase,
+                          const char* path,
+                          const char* mask,
+                          struct VFSDirEntry** items,
+                          unsigned int* num_items);
+    void (*free_directory)(void* kodiBase, struct VFSDirEntry* items, unsigned int num_items);
+
+    bool (*file_exists)(void* kodiBase, const char* filename, bool useCache);
+    bool (*stat_file)(void* kodiBase, const char* filename, struct STAT_STRUCTURE* buffer);
+    bool (*delete_file)(void* kodiBase, const char* filename);
+    bool (*rename_file)(void* kodiBase, const char* filename, const char* newFileName);
+    bool (*copy_file)(void* kodiBase, const char* filename, const char* dest);
+
+    char* (*get_file_md5)(void* kodiBase, const char* filename);
+    char* (*get_cache_thumb_name)(void* kodiBase, const char* filename);
+    char* (*make_legal_filename)(void* kodiBase, const char* filename);
+    char* (*make_legal_path)(void* kodiBase, const char* path);
+    char* (*translate_special_protocol)(void* kodiBase, const char* strSource);
+    bool (*is_internet_stream)(void* kodiBase, const char* path, bool strictCheck);
+    bool (*is_on_lan)(void* kodiBase, const char* path);
+    bool (*is_remote)(void* kodiBase, const char* path);
+    bool (*is_local)(void* kodiBase, const char* path);
+    bool (*is_url)(void* kodiBase, const char* path);
+    bool (*get_http_header)(void* kodiBase, const char* url, struct KODI_HTTP_HEADER* headers);
+    bool (*get_mime_type)(void* kodiBase, const char* url, char** content, const char* useragent);
+    bool (*get_content_type)(void* kodiBase,
+                             const char* url,
+                             char** content,
+                             const char* useragent);
+    bool (*get_cookies)(void* kodiBase, const char* url, char** cookies);
+    bool (*http_header_create)(void* kodiBase, struct KODI_HTTP_HEADER* headers);
+    void (*http_header_free)(void* kodiBase, struct KODI_HTTP_HEADER* headers);
+
+    void* (*open_file)(void* kodiBase, const char* filename, unsigned int flags);
+    void* (*open_file_for_write)(void* kodiBase, const char* filename, bool overwrite);
+    ssize_t (*read_file)(void* kodiBase, void* file, void* ptr, size_t size);
+    bool (*read_file_string)(void* kodiBase, void* file, char* szLine, int iLineLength);
+    ssize_t (*write_file)(void* kodiBase, void* file, const void* ptr, size_t size);
+    void (*flush_file)(void* kodiBase, void* file);
+    int64_t (*seek_file)(void* kodiBase, void* file, int64_t position, int whence);
+    int (*truncate_file)(void* kodiBase, void* file, int64_t size);
+    int64_t (*get_file_position)(void* kodiBase, void* file);
+    int64_t (*get_file_length)(void* kodiBase, void* file);
+    double (*get_file_download_speed)(void* kodiBase, void* file);
+    void (*close_file)(void* kodiBase, void* file);
+    int (*get_file_chunk_size)(void* kodiBase, void* file);
+    bool (*io_control_get_seek_possible)(void* kodiBase, void* file);
+    bool (*io_control_get_cache_status)(void* kodiBase,
+                                        void* file,
+                                        struct VFS_CACHE_STATUS_DATA* status);
+    bool (*io_control_set_cache_rate)(void* kodiBase, void* file, unsigned int rate);
+    bool (*io_control_set_retry)(void* kodiBase, void* file, bool retry);
+    char** (*get_property_values)(
+        void* kodiBase, void* file, int type, const char* name, int* numValues);
+
+    void* (*curl_create)(void* kodiBase, const char* url);
+    bool (*curl_add_option)(
+        void* kodiBase, void* file, int type, const char* name, const char* value);
+    bool (*curl_open)(void* kodiBase, void* file, unsigned int flags);
+
+    bool (*get_disk_space)(
+        void* kodiBase, const char* path, uint64_t* capacity, uint64_t* free, uint64_t* available);
+  } AddonToKodiFuncTable_kodi_filesystem;
+
+  //}}}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/general.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/general.h
new file mode 100644
index 0000000..ede8e94
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/general.h
@@ -0,0 +1,123 @@
+/*
+ *  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
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  //============================================================================
+  /// \ingroup cpp_kodi_Defs
+  /// @brief For kodi::CurrentKeyboardLayout used defines
+  ///
+  typedef enum StdKbButtons
+  {
+    /// The quantity of buttons per row on Kodi's standard keyboard
+    STD_KB_BUTTONS_PER_ROW = 20,
+    /// The quantity of rows on Kodi's standard keyboard
+    STD_KB_BUTTONS_MAX_ROWS = 4,
+    /// Keyboard layout type, this for initial standard
+    STD_KB_MODIFIER_KEY_NONE = 0x00,
+    /// Keyboard layout type, this for shift controled layout (uppercase)
+    STD_KB_MODIFIER_KEY_SHIFT = 0x01,
+    /// Keyboard layout type, this to show symbols
+    STD_KB_MODIFIER_KEY_SYMBOL = 0x02
+  } StdKbButtons;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// \ingroup cpp_kodi_Defs
+  /// @brief For kodi::QueueNotification() used message types
+  ///
+  typedef enum QueueMsg
+  {
+    /// Show info notification message
+    QUEUE_INFO,
+    /// Show warning notification message
+    QUEUE_WARNING,
+    /// Show error notification message
+    QUEUE_ERROR,
+    /// Show with own given image and parts if set on values
+    QUEUE_OWN_STYLE
+  } QueueMsg;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// \ingroup cpp_kodi_Defs
+  /// @brief Format codes to get string from them.
+  ///
+  /// Used on kodi::GetLanguage().
+  ///
+  typedef enum LangFormats
+  {
+    /// two letter code as defined in ISO 639-1
+    LANG_FMT_ISO_639_1,
+    /// three letter code as defined in ISO 639-2/T or ISO 639-2/B
+    LANG_FMT_ISO_639_2,
+    /// full language name in English
+    LANG_FMT_ENGLISH_NAME
+  } LangFormats;
+  //----------------------------------------------------------------------------
+
+  /*
+   * For interface between add-on and kodi.
+   *
+   * This structure defines the addresses of functions stored inside Kodi which
+   * are then available for the add-on to call
+   *
+   * All function pointers there are used by the C++ interface functions below.
+   * You find the set of them on xbmc/addons/interfaces/General.cpp
+   *
+   * Note: For add-on development itself this is not needed
+   */
+  typedef struct AddonKeyboardKeyTable
+  {
+    char* keys[STD_KB_BUTTONS_MAX_ROWS][STD_KB_BUTTONS_PER_ROW];
+  } AddonKeyboardKeyTable;
+  typedef struct AddonToKodiFuncTable_kodi
+  {
+    char* (*get_addon_info)(void* kodiBase, const char* id);
+    bool (*open_settings_dialog)(void* kodiBase);
+    char* (*unknown_to_utf8)(void* kodiBase, const char* source, bool* ret, bool failOnBadChar);
+    char* (*get_localized_string)(void* kodiBase, long label_id);
+    char* (*get_language)(void* kodiBase, int format, bool region);
+    bool (*queue_notification)(void* kodiBase,
+                               int type,
+                               const char* header,
+                               const char* message,
+                               const char* imageFile,
+                               unsigned int displayTime,
+                               bool withSound,
+                               unsigned int messageTime);
+    void (*get_md5)(void* kodiBase, const char* text, char* md5);
+    char* (*get_temp_path)(void* kodiBase);
+    char* (*get_region)(void* kodiBase, const char* id);
+    void (*get_free_mem)(void* kodiBase, long* free, long* total, bool as_bytes);
+    int (*get_global_idle_time)(void* kodiBase);
+    bool (*is_addon_avilable)(void* kodiBase, const char* id, char** version, bool* enabled);
+    void (*kodi_version)(void* kodiBase,
+                         char** compile_name,
+                         int* major,
+                         int* minor,
+                         char** revision,
+                         char** tag,
+                         char** tagversion);
+    char* (*get_current_skin_id)(void* kodiBase);
+    bool (*get_keyboard_layout)(void* kodiBase,
+                                char** layout_name,
+                                int modifier_key,
+                                struct AddonKeyboardKeyTable* layout);
+    bool (*change_keyboard_layout)(void* kodiBase, char** layout_name);
+  } AddonToKodiFuncTable_kodi;
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/network.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/network.h
new file mode 100644
index 0000000..6c0441f
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/c-api/network.h
@@ -0,0 +1,43 @@
+/*
+ *  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 <stddef.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+  /*
+   * For interface between add-on and kodi.
+   *
+   * This structure defines the addresses of functions stored inside Kodi which
+   * are then available for the add-on to call
+   *
+   * All function pointers there are used by the C++ interface functions below.
+   * You find the set of them on xbmc/addons/interfaces/General.cpp
+   *
+   * Note: For add-on development itself this is not needed
+   */
+  typedef struct AddonToKodiFuncTable_kodi_network
+  {
+    bool (*wake_on_lan)(void* kodiBase, const char* mac);
+    char* (*get_ip_address)(void* kodiBase);
+    char* (*dns_lookup)(void* kodiBase, const char* url, bool* ret);
+    char* (*url_encode)(void* kodiBase, const char* url);
+    char* (*get_hostname)(void* kodiBase);
+    bool (*is_local_host)(void* kodiBase, const char* hostname);
+    bool (*is_host_on_lan)(void* kodiBase, const char* hostname, bool offLineCheck);
+    char* (*get_user_agent)(void* kodiBase);
+  } AddonToKodiFuncTable_kodi_network;
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/CMakeLists.txt
index 91cef7f..834ec00 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/CMakeLists.txt
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/CMakeLists.txt
@@ -1,7 +1,8 @@
 set(HEADERS General.h
             ListItem.h
             Window.h
-            definitions.h)
+            definitions.h
+            renderHelper.h)
 
 if(NOT ENABLE_STATIC_LIBS)
   core_add_library(addons_kodi-addon-dev-kit_include_kodi_gui)
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
index a3b8bcb..b5a6393 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/General.h
@@ -37,7 +37,7 @@ namespace gui
   /// \ingroup cpp_kodi_gui
   /// @brief Performs a graphical lock of rendering engine
   ///
-  inline void Lock()
+  inline void ATTRIBUTE_HIDDEN Lock()
   {
     using namespace ::kodi::addon;
     CAddonBase::m_interface->toKodi->kodi_gui->general->lock();
@@ -50,7 +50,7 @@ namespace gui
   /// \ingroup cpp_kodi_gui
   /// @brief Performs a graphical unlock of previous locked rendering engine
   ///
-  inline void Unlock()
+  inline void ATTRIBUTE_HIDDEN Unlock()
   {
     using namespace ::kodi::addon;
     CAddonBase::m_interface->toKodi->kodi_gui->general->unlock();
@@ -62,7 +62,7 @@ namespace gui
   /// \ingroup cpp_kodi_gui
   /// @brief Return the the current screen height with pixel
   ///
-  inline int GetScreenHeight()
+  inline int ATTRIBUTE_HIDDEN GetScreenHeight()
   {
     using namespace ::kodi::addon;
     return CAddonBase::m_interface->toKodi->kodi_gui->general->get_screen_height(CAddonBase::m_interface->toKodi->kodiBase);
@@ -74,7 +74,7 @@ namespace gui
   /// \ingroup cpp_kodi_gui
   /// @brief Return the the current screen width with pixel
   ///
-  inline int GetScreenWidth()
+  inline int ATTRIBUTE_HIDDEN GetScreenWidth()
   {
     using namespace ::kodi::addon;
     return CAddonBase::m_interface->toKodi->kodi_gui->general->get_screen_width(CAddonBase::m_interface->toKodi->kodiBase);
@@ -86,7 +86,7 @@ namespace gui
   /// \ingroup cpp_kodi_gui
   /// @brief Return the the current screen rendering resolution
   ///
-  inline int GetVideoResolution()
+  inline int ATTRIBUTE_HIDDEN GetVideoResolution()
   {
     using namespace ::kodi::addon;
     return CAddonBase::m_interface->toKodi->kodi_gui->general->get_video_resolution(CAddonBase::m_interface->toKodi->kodiBase);
@@ -110,7 +110,7 @@ namespace gui
   /// ..
   /// ~~~~~~~~~~~~~
   ///
-  inline int GetCurrentWindowDialogId()
+  inline int ATTRIBUTE_HIDDEN GetCurrentWindowDialogId()
   {
     using namespace ::kodi::addon;
     return CAddonBase::m_interface->toKodi->kodi_gui->general->get_current_window_dialog_id(CAddonBase::m_interface->toKodi->kodiBase);
@@ -134,7 +134,7 @@ namespace gui
   /// ..
   /// ~~~~~~~~~~~~~
   ///
-  inline int GetCurrentWindowId()
+  inline int ATTRIBUTE_HIDDEN GetCurrentWindowId()
   {
     using namespace ::kodi::addon;
     return CAddonBase::m_interface->toKodi->kodi_gui->general->get_current_window_id(CAddonBase::m_interface->toKodi->kodiBase);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
index f13b96e..1af4863 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/ListItem.h
@@ -20,7 +20,7 @@ namespace gui
 
   class CWindow;
 
-  class CAddonGUIControlBase
+  class ATTRIBUTE_HIDDEN CAddonGUIControlBase
   {
   public:
     GUIHANDLE GetControlHandle() const { return m_controlHandle; }
@@ -69,7 +69,7 @@ namespace gui
   /// @brief **Library definition values**
   ///
 
-  class CListItem : public CAddonGUIControlBase
+  class ATTRIBUTE_HIDDEN CListItem : public CAddonGUIControlBase
   {
   public:
     //==========================================================================
@@ -188,43 +188,6 @@ namespace gui
     //==========================================================================
     ///
     /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief To get current icon image of entry
-    ///
-    /// @return The current icon image path (if present)
-    ///
-    std::string GetIconImage()
-    {
-      std::string image;
-      char* ret = m_interface->kodi_gui->listItem->get_icon_image(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          image = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return image;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
-    /// @brief To set icon image of entry
-    ///
-    /// @param image                    The image to use for.
-    ///
-    /// @note Alternative can be \ref SetArt used
-    ///
-    ///
-    void SetIconImage(const std::string& image)
-    {
-      m_interface->kodi_gui->listItem->set_icon_image(m_interface->kodiBase, m_controlHandle, image.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_CListItem
     /// @brief Sets the listitem's art
     ///
     /// @param[in] type                 Type of Art to set
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
index e7a8a05..5011374 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/Window.h
@@ -60,7 +60,7 @@ namespace gui
   /// @brief <b>Library definition values</b>
   ///
 
-  class CWindow : public CAddonGUIControlBase
+  class ATTRIBUTE_HIDDEN CWindow : public CAddonGUIControlBase
   {
   public:
     //==========================================================================
@@ -205,6 +205,36 @@ namespace gui
     //==========================================================================
     ///
     /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To set the visibility on given control id
+    ///
+    /// @param[in] controlId            Control id where visibility is changed
+    /// @param[in] visible              Boolean value with `true` for visible, `false` for hidden
+    ///
+    ///
+    void SetControlVisible(int controlId, bool visible)
+    {
+      m_interface->kodi_gui->window->set_control_visible(m_interface->kodiBase, m_controlHandle, controlId, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To set the selection on given control id
+    ///
+    /// @param[in] controlId            Control id where selection is changed
+    /// @param[in] selected             Boolean value with `true` for selected, `false` for not
+    ///
+    ///
+    void SetControlSelected(int controlId, bool selected)
+    {
+      m_interface->kodi_gui->window->set_control_selected(m_interface->kodiBase, m_controlHandle, controlId, selected);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
     /// @brief Sets a window property, similar to an infolabel.
     ///
     /// @param[in] key                  string - property name.
@@ -705,7 +735,7 @@ namespace gui
     /// ..
     /// ~~~~~~~~~~~~~
     ///
-    virtual bool OnAction(int actionId)
+    virtual bool OnAction(int actionId, uint32_t buttoncode, wchar_t unicode)
     {
       switch (actionId)
       {
@@ -811,7 +841,7 @@ namespace gui
       bool (*CBOnInit)            (GUIHANDLE cbhdl),
       bool (*CBOnFocus)           (GUIHANDLE cbhdl, int controlId),
       bool (*CBOnClick)           (GUIHANDLE cbhdl, int controlId),
-      bool (*CBOnAction)          (GUIHANDLE cbhdl, int actionId),
+      bool (*CBOnAction)          (GUIHANDLE cbhdl, int actionId, uint32_t buttoncode, wchar_t unicode),
       void (*CBGetContextButtons) (GUIHANDLE cbhdl, int itemNumber, gui_context_menu_pair* buttons, unsigned int* size) = nullptr,
       bool (*CBOnContextButton)   (GUIHANDLE cbhdl, int itemNumber, unsigned int button) = nullptr)
     {
@@ -845,9 +875,9 @@ namespace gui
       return static_cast<CWindow*>(cbhdl)->OnClick(controlId);
     }
 
-    static bool CBOnAction(GUIHANDLE cbhdl, int actionId)
+    static bool CBOnAction(GUIHANDLE cbhdl, int actionId, uint32_t buttoncode, wchar_t unicode)
     {
-      return static_cast<CWindow*>(cbhdl)->OnAction(actionId);
+      return static_cast<CWindow*>(cbhdl)->OnAction(actionId, buttoncode, unicode);
     }
 
     static void CBGetContextButtons(GUIHANDLE cbhdl, int itemNumber, gui_context_menu_pair* buttons, unsigned int* size)
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h
index a38de1a..081ab06 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h
@@ -18,147 +18,153 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CButton Control Button
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CButton }
+/// **Standard push button control for window**
+///
+/// The  button  control  is used for creating push buttons  in Kodi.  You can
+/// choose the position,  size,  and look of the button,  as well as  choosing
+/// what action(s) should be performed when pushed.
+///
+/// It has the header \ref Button.h "#include <kodi/gui/controls/Button.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref skin_Button_control "button control"
+///
+/// @note The call of the control is  only  possible  from  the  corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CButton : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_gui_control_CButton
+  /// @brief Construct a new control
+  ///
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
   ///
-  /// \defgroup cpp_kodi_gui_controls_CButton Control Button
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CButton }
-  /// **Standard push button control for window**
+  CButton(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_button(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CButton can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// The  button  control  is used for creating push buttons  in Kodi.  You can
-  /// choose the position,  size,  and look of the button,  as well as  choosing
-  /// what action(s) should be performed when pushed.
+  /// @ingroup cpp_kodi_gui_control_CButton
+  /// @brief Destructor
   ///
-  /// It has the header \ref Button.h "#include <kodi/gui/controls/Button.h>"
-  /// be included to enjoy it.
+  ~CButton() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref skin_Button_control "button control"
+  /// @ingroup cpp_kodi_gui_control_CButton
+  /// @brief Set the control on window to visible
   ///
-  /// @note The call of the control is  only  possible  from  the  corresponding
-  /// window as its class and identification number is required.
+  /// @param[in] visible              If true visible, otherwise hidden
   ///
-  class CButton : public CAddonGUIControlBase
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_gui_control_CButton
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CButton(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_button(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CButton can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_button->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                       visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_gui_control_CButton
-    /// @brief Destructor
-    ///
-    ~CButton() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_gui_control_CButton
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_button->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_gui_control_CButton
-    /// @brief Set's the control's enabled/disabled state
-    ///
-    /// @param[in] enabled              If true enabled, otherwise disabled
-    ///
-    void SetEnabled(bool enabled)
-    {
-      m_interface->kodi_gui->control_button->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_gui_control_CButton
+  /// @brief Set's the control's enabled/disabled state
+  ///
+  /// @param[in] enabled              If true enabled, otherwise disabled
+  ///
+  void SetEnabled(bool enabled)
+  {
+    m_interface->kodi_gui->control_button->set_enabled(m_interface->kodiBase, m_controlHandle,
+                                                       enabled);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_gui_control_CButton
-    /// @brief To set the text string on button
-    ///
-    /// @param[in] label                Text to show
-    ///
-    void SetLabel(const std::string& label)
-    {
-      m_interface->kodi_gui->control_button->set_label(m_interface->kodiBase, m_controlHandle, label.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_gui_control_CButton
+  /// @brief To set the text string on button
+  ///
+  /// @param[in] label                Text to show
+  ///
+  void SetLabel(const std::string& label)
+  {
+    m_interface->kodi_gui->control_button->set_label(m_interface->kodiBase, m_controlHandle,
+                                                     label.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_gui_control_CButton
-    /// @brief Get the used text from button
-    ///
-    /// @return                         Text shown
-    ///
-    std::string GetLabel() const
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_gui_control_CButton
+  /// @brief Get the used text from button
+  ///
+  /// @return                         Text shown
+  ///
+  std::string GetLabel() const
+  {
+    std::string label;
+    char* ret =
+        m_interface->kodi_gui->control_button->get_label(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string label;
-      char* ret = m_interface->kodi_gui->control_button->get_label(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
+    return label;
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_gui_control_CButton
-    /// @brief If two labels are used for button becomes it set with them
-    ///
-    /// @param[in] label                Text for second label
-    ///
-    void SetLabel2(const std::string& label)
-    {
-      m_interface->kodi_gui->control_button->set_label2(m_interface->kodiBase, m_controlHandle, label.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_gui_control_CButton
+  /// @brief If two labels are used for button becomes it set with them
+  ///
+  /// @param[in] label                Text for second label
+  ///
+  void SetLabel2(const std::string& label)
+  {
+    m_interface->kodi_gui->control_button->set_label2(m_interface->kodiBase, m_controlHandle,
+                                                      label.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// @ingroup cpp_kodi_gui_control_CButton
-    /// @brief Get the second label if present
-    ///
-    /// @return                         Second label
-    ///
-    std::string GetLabel2() const
+  //==========================================================================
+  ///
+  /// @ingroup cpp_kodi_gui_control_CButton
+  /// @brief Get the second label if present
+  ///
+  /// @return                         Second label
+  ///
+  std::string GetLabel2() const
+  {
+    std::string label;
+    char* ret =
+        m_interface->kodi_gui->control_button->get_label2(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string label;
-      char* ret = m_interface->kodi_gui->control_button->get_label2(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
-  };
+    return label;
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h
index 5d30160..99c01de 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h
@@ -95,170 +95,180 @@ namespace gui
 namespace controls
 {
 
-  class CEdit : public CAddonGUIControlBase
+class ATTRIBUTE_HIDDEN CEdit : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief Construct a new control
+  ///
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
+  ///
+  CEdit(CWindow* window, int controlId) : CAddonGUIControlBase(window)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CEdit(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_edit(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::control::CEdit can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
+    m_controlHandle = m_interface->kodi_gui->window->get_control_edit(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::control::CEdit can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief Destructor
-    ///
-    ~CEdit() override = default;
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief Destructor
+  ///
+  ~CEdit() override = default;
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_edit->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief Set the control on window to visible
+  ///
+  /// @param[in] visible              If true visible, otherwise hidden
+  ///
+  void SetVisible(bool visible)
+  {
+    m_interface->kodi_gui->control_edit->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                     visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief Set's the control's enabled/disabled state
-    ///
-    /// @param[in] enabled              If true enabled, otherwise disabled
-    ///
-    void SetEnabled(bool enabled)
-    {
-      m_interface->kodi_gui->control_edit->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief Set's the control's enabled/disabled state
+  ///
+  /// @param[in] enabled              If true enabled, otherwise disabled
+  ///
+  void SetEnabled(bool enabled)
+  {
+    m_interface->kodi_gui->control_edit->set_enabled(m_interface->kodiBase, m_controlHandle,
+                                                     enabled);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief To set the text string on edit control
-    ///
-    /// @param[in] label                Text to show
-    ///
-    void SetLabel(const std::string& label)
-    {
-      m_interface->kodi_gui->control_edit->set_label(m_interface->kodiBase, m_controlHandle, label.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief To set the text string on edit control
+  ///
+  /// @param[in] label                Text to show
+  ///
+  void SetLabel(const std::string& label)
+  {
+    m_interface->kodi_gui->control_edit->set_label(m_interface->kodiBase, m_controlHandle,
+                                                   label.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief Returns the text heading for this edit control.
-    ///
-    /// @return                         Heading text
-    ///
-    std::string GetLabel() const
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief Returns the text heading for this edit control.
+  ///
+  /// @return                         Heading text
+  ///
+  std::string GetLabel() const
+  {
+    std::string label;
+    char* ret =
+        m_interface->kodi_gui->control_edit->get_label(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string label;
-      char* ret = m_interface->kodi_gui->control_edit->get_label(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
+    return label;
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief Set's text heading for this edit control.
-    ///
-    /// @param[in] text                 string or unicode - text string.
-    ///
-    void SetText(const std::string& text)
-    {
-      m_interface->kodi_gui->control_edit->set_text(m_interface->kodiBase, m_controlHandle, text.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief Set's text heading for this edit control.
+  ///
+  /// @param[in] text                 string or unicode - text string.
+  ///
+  void SetText(const std::string& text)
+  {
+    m_interface->kodi_gui->control_edit->set_text(m_interface->kodiBase, m_controlHandle,
+                                                  text.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief Returns the text value for this edit control.
-    ///
-    /// @return                         Text value of control
-    ///
-    std::string GetText() const
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief Returns the text value for this edit control.
+  ///
+  /// @return                         Text value of control
+  ///
+  std::string GetText() const
+  {
+    std::string text;
+    char* ret =
+        m_interface->kodi_gui->control_edit->get_text(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string text;
-      char* ret = m_interface->kodi_gui->control_edit->get_text(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          text = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return text;
+      if (std::strlen(ret))
+        text = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
+    return text;
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief Set the cursor position on text.
-    ///
-    /// @param[in] iPosition            The position to set
-    ///
-    void SetCursorPosition(unsigned int iPosition)
-    {
-      m_interface->kodi_gui->control_edit->set_cursor_position(m_interface->kodiBase, m_controlHandle, iPosition);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief Set the cursor position on text.
+  ///
+  /// @param[in] iPosition            The position to set
+  ///
+  void SetCursorPosition(unsigned int iPosition)
+  {
+    m_interface->kodi_gui->control_edit->set_cursor_position(m_interface->kodiBase, m_controlHandle,
+                                                             iPosition);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief To get current cursor position on text field
-    ///
-    /// @return                         The current cursor position
-    ///
-    unsigned int GetCursorPosition()
-    {
-      return m_interface->kodi_gui->control_edit->get_cursor_position(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief To get current cursor position on text field
+  ///
+  /// @return                         The current cursor position
+  ///
+  unsigned int GetCursorPosition()
+  {
+    return m_interface->kodi_gui->control_edit->get_cursor_position(m_interface->kodiBase,
+                                                                    m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CEdit
-    /// @brief To set field input type which are defined on \ref AddonGUIInputType
-    ///
-    /// @param[in] type                 The \ref AddonGUIInputType "Add-on input type"
-    ///                                 to use
-    /// @param[in] heading              The heading text for related keyboard
-    ///                                 dialog
-    ///
-    void SetInputType(AddonGUIInputType type, const std::string& heading)
-    {
-      m_interface->kodi_gui->control_edit->set_input_type(m_interface->kodiBase, m_controlHandle, static_cast<int>(type), heading.c_str());
-    }
-    //--------------------------------------------------------------------------
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief To set field input type which are defined on \ref AddonGUIInputType
+  ///
+  /// @param[in] type                 The \ref AddonGUIInputType "Add-on input type"
+  ///                                 to use
+  /// @param[in] heading              The heading text for related keyboard
+  ///                                 dialog
+  ///
+  void SetInputType(AddonGUIInputType type, const std::string& heading)
+  {
+    m_interface->kodi_gui->control_edit->set_input_type(m_interface->kodiBase, m_controlHandle,
+                                                        static_cast<int>(type), heading.c_str());
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h
index aab8929..02c843f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h
@@ -18,130 +18,135 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CFadeLabel Control Fade Label
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CFadeLabel }
+/// **Window control used to show multiple pieces of text in the same position,
+/// by fading from one to the other**
+///
+/// The fade label  control is used for displaying multiple pieces  of text in
+/// the same  space in  Kodi. You can choose  the font, size, colour, location
+/// and contents  of the text to be displayed.  The first piece of information
+/// to display fades in over 50 frames, then scrolls off to the left.  Once it
+/// is  finished scrolling off screen,  the second piece  of information fades
+/// in and  the process repeats.  A fade label  control is not  supported in a
+/// list container.
+///
+/// It has the header \ref FadeLabel.h "#include <kodi/gui/controls/FadeLabel.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Fade_Label_Control "fade label control"
+///
+/// @note The  call of the  control is only  possible from  the  corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CFadeLabel : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
   ///
-  /// \defgroup cpp_kodi_gui_controls_CFadeLabel Control Fade Label
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CFadeLabel }
-  /// **Window control used to show multiple pieces of text in the same position,
-  /// by fading from one to the other**
+  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  /// @brief Construct a new control.
   ///
-  /// The fade label  control is used for displaying multiple pieces  of text in
-  /// the same  space in  Kodi. You can choose  the font, size, colour, location
-  /// and contents  of the text to be displayed.  The first piece of information
-  /// to display fades in over 50 frames, then scrolls off to the left.  Once it
-  /// is  finished scrolling off screen,  the second piece  of information fades
-  /// in and  the process repeats.  A fade label  control is not  supported in a
-  /// list container.
+  /// @param[in] window     related window control class
+  /// @param[in] controlId  Used skin xml control id
   ///
-  /// It has the header \ref FadeLabel.h "#include <kodi/gui/controls/FadeLabel.h>"
-  /// be included to enjoy it.
+  CFadeLabel(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_fade_label(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CFadeLabel can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref Fade_Label_Control "fade label control"
+  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  /// @brief Destructor.
+  ///
+  ~CFadeLabel() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// @note The  call of the  control is only  possible from  the  corresponding
-  /// window as its class and identification number is required.
+  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  /// @brief Set the control on window to visible.
   ///
-  class CFadeLabel : public CAddonGUIControlBase
+  /// @param[in] visible    If true visible, otherwise hidden
+  ///
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-    /// @brief Construct a new control.
-    ///
-    /// @param[in] window     related window control class
-    /// @param[in] controlId  Used skin xml control id
-    ///
-    CFadeLabel(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_fade_label(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CFadeLabel can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-    /// @brief Destructor.
-    ///
-    ~CFadeLabel() override = default;
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_fade_label->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                           visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-    /// @brief Set the control on window to visible.
-    ///
-    /// @param[in] visible    If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_fade_label->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-    /// @brief To add additional text string on fade label.
-    ///
-    /// @param[in] label      Text to show
-    ///
-    void AddLabel(const std::string& label)
-    {
-      m_interface->kodi_gui->control_fade_label->add_label(m_interface->kodiBase, m_controlHandle, label.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  /// @brief To add additional text string on fade label.
+  ///
+  /// @param[in] label      Text to show
+  ///
+  void AddLabel(const std::string& label)
+  {
+    m_interface->kodi_gui->control_fade_label->add_label(m_interface->kodiBase, m_controlHandle,
+                                                         label.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-    /// @brief Get the used text from button
-    ///
-    /// @return               Text shown
-    ///
-    std::string GetLabel() const
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  /// @brief Get the used text from button
+  ///
+  /// @return               Text shown
+  ///
+  std::string GetLabel() const
+  {
+    std::string label;
+    char* ret = m_interface->kodi_gui->control_fade_label->get_label(m_interface->kodiBase,
+                                                                     m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string label;
-      char* ret = m_interface->kodi_gui->control_fade_label->get_label(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
+    return label;
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-    /// @brief To enable or disable scrolling on fade label
-    ///
-    /// @param[in] scroll     To  enable scrolling  set  to true,  otherwise  is
-    ///                       disabled
-    ///
-    void SetScrolling(bool scroll)
-    {
-      m_interface->kodi_gui->control_fade_label->set_scrolling(m_interface->kodiBase, m_controlHandle, scroll);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  /// @brief To enable or disable scrolling on fade label
+  ///
+  /// @param[in] scroll     To  enable scrolling  set  to true,  otherwise  is
+  ///                       disabled
+  ///
+  void SetScrolling(bool scroll)
+  {
+    m_interface->kodi_gui->control_fade_label->set_scrolling(m_interface->kodiBase, m_controlHandle,
+                                                             scroll);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CFadeLabel
-    /// @brief To reset al inserted labels.
-    ///
-    void Reset()
-    {
-      m_interface->kodi_gui->control_fade_label->reset(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CFadeLabel
+  /// @brief To reset al inserted labels.
+  ///
+  void Reset()
+  {
+    m_interface->kodi_gui->control_fade_label->reset(m_interface->kodiBase, m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h
index a872ab0..b4d092f 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h
@@ -18,94 +18,98 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CImage Control Image
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CImage }
+/// **Window control used to show an image.**
+///
+/// The  image control is used  for displaying  images in Kodi. You can choose
+/// the position, size, transparency and contents of the image to be displayed.
+///
+/// It has the header \ref Image.h "#include <kodi/gui/controls/Image.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Image_Control "image control"
+///
+/// @note The  call of  the control is  only possible  from the  corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CImage : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CImage
+  /// @brief Construct a new control
   ///
-  /// \defgroup cpp_kodi_gui_controls_CImage Control Image
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CImage }
-  /// **Window control used to show an image.**
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
+  ///
+  CImage(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_image(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CImage can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// The  image control is used  for displaying  images in Kodi. You can choose
-  /// the position, size, transparency and contents of the image to be displayed.
+  /// \ingroup cpp_kodi_gui_controls_CImage
+  /// @brief Destructor
   ///
-  /// It has the header \ref Image.h "#include <kodi/gui/controls/Image.h>"
-  /// be included to enjoy it.
+  ~CImage() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref Image_Control "image control"
+  /// \ingroup cpp_kodi_gui_controls_CImage
+  /// @brief Set the control on window to visible
   ///
-  /// @note The  call of  the control is  only possible  from the  corresponding
-  /// window as its class and identification number is required.
+  /// @param[in] visible              If true visible, otherwise hidden
   ///
-  class CImage : public CAddonGUIControlBase
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CImage
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CImage(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_image(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CImage can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CImage
-    /// @brief Destructor
-    ///
-    ~CImage() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CImage
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_image->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_image->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                      visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CImage
-    /// @brief To set the filename used on image control.
-    ///
-    /// @param[in] filename             Image file to use
-    /// @param[in] useCache             To define  storage of image,  default is
-    ///                                 in  cache,  if false  becomes it  loaded
-    ///                                 always on changes again
-    ///
-    void SetFileName(const std::string& filename, bool useCache = true)
-    {
-      m_interface->kodi_gui->control_image->set_filename(m_interface->kodiBase, m_controlHandle, filename.c_str(), useCache);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CImage
+  /// @brief To set the filename used on image control.
+  ///
+  /// @param[in] filename             Image file to use
+  /// @param[in] useCache             To define  storage of image,  default is
+  ///                                 in  cache,  if false  becomes it  loaded
+  ///                                 always on changes again
+  ///
+  void SetFileName(const std::string& filename, bool useCache = true)
+  {
+    m_interface->kodi_gui->control_image->set_filename(m_interface->kodiBase, m_controlHandle,
+                                                       filename.c_str(), useCache);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CImage
-    /// @brief To set set the diffuse color on image.
-    ///
-    /// @param[in] colorDiffuse         Color to use for diffuse
-    ///
-    void SetColorDiffuse(uint32_t colorDiffuse)
-    {
-      m_interface->kodi_gui->control_image->set_color_diffuse(m_interface->kodiBase, m_controlHandle, colorDiffuse);
-    }
-    //--------------------------------------------------------------------------
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CImage
+  /// @brief To set set the diffuse color on image.
+  ///
+  /// @param[in] colorDiffuse         Color to use for diffuse
+  ///
+  void SetColorDiffuse(uint32_t colorDiffuse)
+  {
+    m_interface->kodi_gui->control_image->set_color_diffuse(m_interface->kodiBase, m_controlHandle,
+                                                            colorDiffuse);
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h
index eecfd8b..82604bd 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h
@@ -18,99 +18,103 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CLabel Control Label
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CLabel }
+/// **Window control used to show some lines of text.**
+///
+/// The  label control  is used for  displaying text  in Kodi.  You can choose
+/// the font, size, colour, location and contents of the text to be displayed.
+///
+/// It has the header \ref Label.h "#include <kodi/gui/controls/Label.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Label_Control "label control"
+///
+/// @note The  call  of the control  is only possible  from the  corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CLabel : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CLabel
+  /// @brief Construct a new control
+  ///
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
   ///
-  /// \defgroup cpp_kodi_gui_controls_CLabel Control Label
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CLabel }
-  /// **Window control used to show some lines of text.**
+  CLabel(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_label(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CLabel can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// The  label control  is used for  displaying text  in Kodi.  You can choose
-  /// the font, size, colour, location and contents of the text to be displayed.
+  /// \ingroup cpp_kodi_gui_controls_CLabel
+  /// @brief Destructor
   ///
-  /// It has the header \ref Label.h "#include <kodi/gui/controls/Label.h>"
-  /// be included to enjoy it.
+  ~CLabel() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref Label_Control "label control"
+  /// \ingroup cpp_kodi_gui_controls_CLabel
+  /// @brief Set the control on window to visible
   ///
-  /// @note The  call  of the control  is only possible  from the  corresponding
-  /// window as its class and identification number is required.
+  /// @param[in] visible              If true visible, otherwise hidden
   ///
-  class CLabel : public CAddonGUIControlBase
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CLabel
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CLabel(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_label(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CLabel can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CLabel
-    /// @brief Destructor
-    ///
-    ~CLabel() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CLabel
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_label->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_label->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                      visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CLabel
-    /// @brief To set the text string on label
-    ///
-    /// @param[in] text                 Text to show
-    ///
-    void SetLabel(const std::string& text)
-    {
-      m_interface->kodi_gui->control_label->set_label(m_interface->kodiBase, m_controlHandle, text.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CLabel
+  /// @brief To set the text string on label
+  ///
+  /// @param[in] text                 Text to show
+  ///
+  void SetLabel(const std::string& text)
+  {
+    m_interface->kodi_gui->control_label->set_label(m_interface->kodiBase, m_controlHandle,
+                                                    text.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CLabel
-    /// @brief Get the used text from control
-    ///
-    /// @return                         Used text on label control
-    ///
-    std::string GetLabel() const
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CLabel
+  /// @brief Get the used text from control
+  ///
+  /// @return                         Used text on label control
+  ///
+  std::string GetLabel() const
+  {
+    std::string label;
+    char* ret =
+        m_interface->kodi_gui->control_label->get_label(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string label;
-      char* ret = m_interface->kodi_gui->control_label->get_label(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
-  };
+    return label;
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h
index 78880c4..8cb582b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h
@@ -18,92 +18,96 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CProgress Control Progress
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CProgress }
+/// **Window control to show the progress of a particular operation**
+///
+/// The progress control is used to show the progress of an item that may take
+/// a long time,  or to show how far  through a movie you are.  You can choose
+/// the position, size, and look of the progress control.
+///
+/// It has the header \ref Progress.h "#include <kodi/gui/controls/Progress.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Progress_Control "progress control"
+///
+/// @note The call of the control is only possible from the corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CProgress : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CProgress
+  /// @brief Construct a new control
   ///
-  /// \defgroup cpp_kodi_gui_controls_CProgress Control Progress
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CProgress }
-  /// **Window control to show the progress of a particular operation**
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
+  ///
+  CProgress(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_progress(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CProgress can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// The progress control is used to show the progress of an item that may take
-  /// a long time,  or to show how far  through a movie you are.  You can choose
-  /// the position, size, and look of the progress control.
+  /// \ingroup cpp_kodi_gui_controls_CProgress
+  /// @brief Destructor
   ///
-  /// It has the header \ref Progress.h "#include <kodi/gui/controls/Progress.h>"
-  /// be included to enjoy it.
+  ~CProgress() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref Progress_Control "progress control"
+  /// \ingroup cpp_kodi_gui_controls_CProgress
+  /// @brief Set the control on window to visible
   ///
-  /// @note The call of the control is only possible from the corresponding
-  /// window as its class and identification number is required.
+  /// @param[in] visible              If true visible, otherwise hidden
   ///
-  class CProgress : public CAddonGUIControlBase
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CProgress
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CProgress(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_progress(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CProgress can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CProgress
-    /// @brief Destructor
-    ///
-    ~CProgress() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CProgress
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_progress->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_progress->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                         visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CProgress
-    /// @brief To set Percent position of control
-    ///
-    /// @param[in] percent              The percent position to use
-    ///
-    void SetPercentage(float percent)
-    {
-      m_interface->kodi_gui->control_progress->set_percentage(m_interface->kodiBase, m_controlHandle, percent);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CProgress
+  /// @brief To set Percent position of control
+  ///
+  /// @param[in] percent              The percent position to use
+  ///
+  void SetPercentage(float percent)
+  {
+    m_interface->kodi_gui->control_progress->set_percentage(m_interface->kodiBase, m_controlHandle,
+                                                            percent);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CProgress
-    /// @brief Get the active percent position of progress bar
-    ///
-    /// @return                         Progress position as percent
-    ///
-    float GetPercentage() const
-    {
-      return m_interface->kodi_gui->control_progress->get_percentage(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CProgress
+  /// @brief Get the active percent position of progress bar
+  ///
+  /// @return                         Progress position as percent
+  ///
+  float GetPercentage() const
+  {
+    return m_interface->kodi_gui->control_progress->get_percentage(m_interface->kodiBase,
+                                                                   m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h
index 1721759..305195d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h
@@ -18,142 +18,149 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CRadioButton Control Radio Button
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CRadioButton }
+/// **Window control for a radio button (as used for on/off settings)**
+///
+/// The radio  button control is used for creating push button on/off settings
+/// in Kodi. You can choose the position,  size,  and look of the button. When
+/// the user clicks on the radio button,  the state will change,  toggling the
+/// extra  textures  (textureradioon and textureradiooff).  Used  for settings
+/// controls.
+///
+/// It has the header \ref RadioButton.h "#include <kodi/gui/controls/RadioButton.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Radio_button_control "radio button control"
+///
+/// @note The  call  of the  control is  only possible  from the corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CRadioButton : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRadioButton
+  /// @brief Construct a new control
+  ///
+  /// @param[in] window     related window control class
+  /// @param[in] controlId  Used skin xml control id
   ///
-  /// \defgroup cpp_kodi_gui_controls_CRadioButton Control Radio Button
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CRadioButton }
-  /// **Window control for a radio button (as used for on/off settings)**
+  CRadioButton(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_radio_button(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CRadioButton can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// The radio  button control is used for creating push button on/off settings
-  /// in Kodi. You can choose the position,  size,  and look of the button. When
-  /// the user clicks on the radio button,  the state will change,  toggling the
-  /// extra  textures  (textureradioon and textureradiooff).  Used  for settings
-  /// controls.
+  /// \ingroup cpp_kodi_gui_controls_CRadioButton
+  /// @brief Destructor
   ///
-  /// It has the header \ref RadioButton.h "#include <kodi/gui/controls/RadioButton.h>"
-  /// be included to enjoy it.
+  ~CRadioButton() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref Radio_button_control "radio button control"
+  /// \ingroup cpp_kodi_gui_controls_CRadioButton
+  /// @brief Set the control on window to visible
   ///
-  /// @note The  call  of the  control is  only possible  from the corresponding
-  /// window as its class and identification number is required.
+  /// @param[in] visible    If true visible, otherwise hidden
   ///
-  class CRadioButton : public CAddonGUIControlBase
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRadioButton
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window     related window control class
-    /// @param[in] controlId  Used skin xml control id
-    ///
-    CRadioButton(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_radio_button(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CRadioButton can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRadioButton
-    /// @brief Destructor
-    ///
-    ~CRadioButton() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRadioButton
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible    If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_radio_button->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_radio_button->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                             visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRadioButton
-    /// @brief Set's the control's enabled/disabled state
-    ///
-    /// @param[in] enabled    If true enabled, otherwise disabled
-    ///
-    void SetEnabled(bool enabled)
-    {
-      m_interface->kodi_gui->control_radio_button->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRadioButton
+  /// @brief Set's the control's enabled/disabled state
+  ///
+  /// @param[in] enabled    If true enabled, otherwise disabled
+  ///
+  void SetEnabled(bool enabled)
+  {
+    m_interface->kodi_gui->control_radio_button->set_enabled(m_interface->kodiBase, m_controlHandle,
+                                                             enabled);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRadioButton
-    /// @brief To set the text string on radio button
-    ///
-    /// @param[in] label      Text to show
-    ///
-    void SetLabel(const std::string& label)
-    {
-      m_interface->kodi_gui->control_radio_button->set_label(m_interface->kodiBase, m_controlHandle, label.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRadioButton
+  /// @brief To set the text string on radio button
+  ///
+  /// @param[in] label      Text to show
+  ///
+  void SetLabel(const std::string& label)
+  {
+    m_interface->kodi_gui->control_radio_button->set_label(m_interface->kodiBase, m_controlHandle,
+                                                           label.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRadioButton
-    /// @brief Get the used text from control
-    ///
-    /// @return               Text shown
-    ///
-    std::string GetLabel() const
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRadioButton
+  /// @brief Get the used text from control
+  ///
+  /// @return               Text shown
+  ///
+  std::string GetLabel() const
+  {
+    std::string label;
+    char* ret = m_interface->kodi_gui->control_radio_button->get_label(m_interface->kodiBase,
+                                                                       m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string label;
-      char* ret = m_interface->kodi_gui->control_radio_button->get_label(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          label = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return label;
+      if (std::strlen(ret))
+        label = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
+    return label;
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRadioButton
-    /// @brief To set radio button condition to on or off
-    ///
-    /// @param[in] selected   true set radio button to  selection on,  otherwise
-    ///                       off
-    ///
-    void SetSelected(bool selected)
-    {
-      m_interface->kodi_gui->control_radio_button->set_selected(m_interface->kodiBase, m_controlHandle, selected);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRadioButton
+  /// @brief To set radio button condition to on or off
+  ///
+  /// @param[in] selected   true set radio button to  selection on,  otherwise
+  ///                       off
+  ///
+  void SetSelected(bool selected)
+  {
+    m_interface->kodi_gui->control_radio_button->set_selected(m_interface->kodiBase,
+                                                              m_controlHandle, selected);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRadioButton
-    /// @brief Get the current selected condition of radio button
-    ///
-    /// @return               Selected condition
-    ///
-    bool IsSelected() const
-    {
-      return m_interface->kodi_gui->control_radio_button->is_selected(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRadioButton
+  /// @brief Get the current selected condition of radio button
+  ///
+  /// @return               Selected condition
+  ///
+  bool IsSelected() const
+  {
+    return m_interface->kodi_gui->control_radio_button->is_selected(m_interface->kodiBase,
+                                                                    m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h
index b3dadcd..7cc9b24 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h
@@ -10,6 +10,7 @@
 
 #include "../../AddonBase.h"
 #include "../Window.h"
+#include "../renderHelper.h"
 
 namespace kodi
 {
@@ -18,186 +19,186 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CRendering Control Rendering
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CRendering }
+/// **Window control for rendering own parts**
+///
+/// This rendering control is used  when own parts are needed.  You  have  the
+/// control  over them  to render direct  OpenGL or  DirectX  content  to  the
+/// screen set by the size of them.
+///
+/// Alternative  can be  the virtual  functions from t his been ignored if the
+/// callbacks are  defined  by the  \ref CRendering_SetIndependentCallbacks function  and
+/// class is used as single and not as a parent class.
+///
+/// It has the header \ref Rendering.h "#include <kodi/gui/controls/Rendering.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Addon_Rendering_control "rendering control"
+///
+/// @note The  call of  the control is only  possible  from  the corresponding
+/// window as its class and identification number is required.
+///
+
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CRendering_Defs Definitions, structures and enumerators
+/// \ingroup cpp_kodi_gui_controls_CRendering
+/// @brief **Library definition values**
+///
+
+class ATTRIBUTE_HIDDEN CRendering : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRendering
+  /// @brief Construct a new control
+  ///
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
+  ///
+  CRendering(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_render_addon(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (m_controlHandle)
+      m_interface->kodi_gui->control_rendering->set_callbacks(m_interface->kodiBase,
+                                                              m_controlHandle, this, OnCreateCB,
+                                                              OnRenderCB, OnStopCB, OnDirtyCB);
+    else
+      kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::%s can't create control class from Kodi !!!",
+                __FUNCTION__);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRendering
+  /// @brief Destructor
+  ///
+  ~CRendering() override
+  {
+    m_interface->kodi_gui->control_rendering->destroy(m_interface->kodiBase, m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// \defgroup cpp_kodi_gui_controls_CRendering Control Rendering
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CRendering }
-  /// **Window control for rendering own parts**
+  /// \ingroup cpp_kodi_gui_controls_CRendering
+  /// @brief To create rendering control on Add-on
   ///
-  /// This rendering control is used  when own parts are needed.  You  have  the
-  /// control  over them  to render direct  OpenGL or  DirectX  content  to  the
-  /// screen set by the size of them.
+  /// Function  creates the  needed rendering  control for Kodi  which becomes
+  /// handled and processed from Add-on
   ///
-  /// Alternative  can be  the virtual  functions from t his been ignored if the
-  /// callbacks are  defined  by the  \ref CRendering_SetIndependentCallbacks function  and
-  /// class is used as single and not as a parent class.
+  /// @note This is  callback  function  from Kodi  to  Add-on and  not to use
+  /// for calls from add-on to this function.
   ///
-  /// It has the header \ref Rendering.h "#include <kodi/gui/controls/Rendering.h>"
-  /// be included to enjoy it.
+  /// @param[in] x                    Horizontal position
+  /// @param[in] y                    Vertical position
+  /// @param[in] w                    Width of control
+  /// @param[in] h                    Height of control
+  /// @param[in] device               The device to use.  For OpenGL  is empty
+  ///                                 on Direct X is the needed device send.
+  /// @return                         Add-on needs to return true if successed,
+  ///                                 otherwise false.
   ///
-  /// Here you find the needed skin part for a \ref Addon_Rendering_control "rendering control"
+  virtual bool Create(int x, int y, int w, int h, void* device) { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRendering
+  /// @brief Render process call from Kodi
   ///
-  /// @note The  call of  the control is only  possible  from  the corresponding
-  /// window as its class and identification number is required.
+  /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
+  /// for calls from add-on to this function.
   ///
+  virtual void Render() {}
+  //--------------------------------------------------------------------------
 
-  //============================================================================
+  //==========================================================================
   ///
-  /// \defgroup cpp_kodi_gui_controls_CRendering_Defs Definitions, structures and enumerators
   /// \ingroup cpp_kodi_gui_controls_CRendering
-  /// @brief **Library definition values**
+  /// @brief Call from Kodi to stop rendering process
   ///
+  /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
+  /// for calls from add-on to this function.
+  ///
+  virtual void Stop() {}
+  //--------------------------------------------------------------------------
 
-  class CRendering : public CAddonGUIControlBase
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRendering
+  /// @brief Call from Kodi where add-on  becomes asked about  dirty rendering
+  /// region.
+  ///
+  /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
+  /// for calls from add-on to this function.
+  ///
+  virtual bool Dirty() { return false; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CRendering
+  /// \anchor CRendering_SetIndependentCallbacks
+  /// @brief If the  class is used  independent (with "new CRendering")
+  /// and not as  parent (with "cCLASS_own : CRendering") from own must
+  /// be the callback from Kodi to add-on overdriven with own functions!
+  ///
+  void SetIndependentCallbacks(
+      GUIHANDLE cbhdl,
+      bool (*CBCreate)(GUIHANDLE cbhdl, int x, int y, int w, int h, void* device),
+      void (*CBRender)(GUIHANDLE cbhdl),
+      void (*CBStop)(GUIHANDLE cbhdl),
+      bool (*CBDirty)(GUIHANDLE cbhdl))
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRendering
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CRendering(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_render_addon(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (m_controlHandle)
-        m_interface->kodi_gui->control_rendering->set_callbacks(m_interface->kodiBase, m_controlHandle, this,
-                                                                OnCreateCB, OnRenderCB, OnStopCB, OnDirtyCB);
-      else
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::%s can't create control class from Kodi !!!", __FUNCTION__);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRendering
-    /// @brief Destructor
-    ///
-    ~CRendering() override
-    {
-      m_interface->kodi_gui->control_rendering->destroy(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRendering
-    /// @brief To create rendering control on Add-on
-    ///
-    /// Function  creates the  needed rendering  control for Kodi  which becomes
-    /// handled and processed from Add-on
-    ///
-    /// @note This is  callback  function  from Kodi  to  Add-on and  not to use
-    /// for calls from add-on to this function.
-    ///
-    /// @param[in] x                    Horizontal position
-    /// @param[in] y                    Vertical position
-    /// @param[in] w                    Width of control
-    /// @param[in] h                    Height of control
-    /// @param[in] device               The device to use.  For OpenGL  is empty
-    ///                                 on Direct X is the needed device send.
-    /// @return                         Add-on needs to return true if successed,
-    ///                                 otherwise false.
-    ///
-    virtual bool Create(int x, int y, int w, int h, void* device) { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRendering
-    /// @brief Render process call from Kodi
-    ///
-    /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
-    /// for calls from add-on to this function.
-    ///
-    virtual void Render() { }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRendering
-    /// @brief Call from Kodi to stop rendering process
-    ///
-    /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
-    /// for calls from add-on to this function.
-    ///
-    virtual void Stop() { }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRendering
-    /// @brief Call from Kodi where add-on  becomes asked about  dirty rendering
-    /// region.
-    ///
-    /// @note This  is callback  function from  Kodi to  Add-on  and not  to use
-    /// for calls from add-on to this function.
-    ///
-    virtual bool Dirty() { return false; }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CRendering
-    /// \anchor CRendering_SetIndependentCallbacks
-    /// @brief If the  class is used  independent (with "new CRendering")
-    /// and not as  parent (with "cCLASS_own : CRendering") from own must
-    /// be the callback from Kodi to add-on overdriven with own functions!
-    ///
-    void SetIndependentCallbacks(
-        GUIHANDLE             cbhdl,
-        bool      (*CBCreate)(GUIHANDLE cbhdl,
-                              int       x,
-                              int       y,
-                              int       w,
-                              int       h,
-                              void*     device),
-        void      (*CBRender)(GUIHANDLE cbhdl),
-        void      (*CBStop)  (GUIHANDLE cbhdl),
-        bool      (*CBDirty) (GUIHANDLE cbhdl))
-    {
-      if (!cbhdl ||
-          !CBCreate || !CBRender || !CBStop || !CBDirty)
-      {
-        kodi::Log(ADDON_LOG_ERROR, "kodi::gui::controls::%s called with nullptr !!!", __FUNCTION__);
-        return;
-      }
-
-      m_interface->kodi_gui->control_rendering->set_callbacks(m_interface->kodiBase, m_controlHandle, cbhdl,
-                                          CBCreate, CBRender, CBStop, CBDirty);
-    }
-    //--------------------------------------------------------------------------
-
-  private:
-    /*
-     * Defined callback functions from Kodi to add-on, for use in parent / child system
-     * (is private)!
-     */
-    static bool OnCreateCB(void* cbhdl, int x, int y, int w, int h, void* device)
+    if (!cbhdl || !CBCreate || !CBRender || !CBStop || !CBDirty)
     {
-      return static_cast<CRendering*>(cbhdl)->Create(x, y, w, h, device);
+      kodi::Log(ADDON_LOG_ERROR, "kodi::gui::controls::%s called with nullptr !!!", __FUNCTION__);
+      return;
     }
 
-    static void OnRenderCB(void* cbhdl)
-    {
-      static_cast<CRendering*>(cbhdl)->Render();
-    }
+    m_interface->kodi_gui->control_rendering->set_callbacks(
+        m_interface->kodiBase, m_controlHandle, cbhdl, CBCreate, CBRender, CBStop, CBDirty);
+  }
+  //--------------------------------------------------------------------------
+
+private:
+  /*
+   * Defined callback functions from Kodi to add-on, for use in parent / child system
+   * (is private)!
+   */
+  static bool OnCreateCB(void* cbhdl, int x, int y, int w, int h, void* device)
+  {
+    static_cast<CRendering*>(cbhdl)->m_renderHelper = kodi::gui::GetRenderHelper();
+    return static_cast<CRendering*>(cbhdl)->Create(x, y, w, h, device);
+  }
 
-    static void OnStopCB(void* cbhdl)
-    {
-      static_cast<CRendering*>(cbhdl)->Stop();
-    }
+  static void OnRenderCB(void* cbhdl)
+  {
+    if (!static_cast<CRendering*>(cbhdl)->m_renderHelper)
+      return;
+    static_cast<CRendering*>(cbhdl)->m_renderHelper->Begin();
+    static_cast<CRendering*>(cbhdl)->Render();
+    static_cast<CRendering*>(cbhdl)->m_renderHelper->End();
+  }
+
+  static void OnStopCB(void* cbhdl)
+  {
+    static_cast<CRendering*>(cbhdl)->Stop();
+    static_cast<CRendering*>(cbhdl)->m_renderHelper = nullptr;
+  }
 
-    static bool OnDirtyCB(void* cbhdl)
-    {
-      return static_cast<CRendering*>(cbhdl)->Dirty();
-    }
+  static bool OnDirtyCB(void* cbhdl) { return static_cast<CRendering*>(cbhdl)->Dirty(); }
 
-  };
+  std::shared_ptr<kodi::gui::IRenderHelper> m_renderHelper;
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h
index 4f97ba5..76a02aa 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h
@@ -18,294 +18,308 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CSettingsSlider Control Settings Slider
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CSettingsSlider }
+/// **Window control for moveable slider with text name**
+///
+/// The settings slider control is  used in the settings  screens for  when an
+/// option is best  specified on a sliding scale. You can choose the position,
+/// size, and look of the slider control.  It is basically a cross between the
+/// button control  and a slider  control.  It has a  label and  focus and non
+/// focus textures, as well as a slider control on the right.
+///
+/// It has the header \ref SettingsSlider.h "#include <kodi/gui/controls/SettingsSlider.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Settings_Slider_Control "settings slider control"
+///
+/// @note The call  of the control  is only  possible  from the  corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CSettingsSlider : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
   ///
-  /// \defgroup cpp_kodi_gui_controls_CSettingsSlider Control Settings Slider
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CSettingsSlider }
-  /// **Window control for moveable slider with text name**
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief Construct a new control
   ///
-  /// The settings slider control is  used in the settings  screens for  when an
-  /// option is best  specified on a sliding scale. You can choose the position,
-  /// size, and look of the slider control.  It is basically a cross between the
-  /// button control  and a slider  control.  It has a  label and  focus and non
-  /// focus textures, as well as a slider control on the right.
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
   ///
-  /// It has the header \ref SettingsSlider.h "#include <kodi/gui/controls/SettingsSlider.h>"
-  /// be included to enjoy it.
+  CSettingsSlider(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_settings_slider(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CSettingsSlider can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref Settings_Slider_Control "settings slider control"
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief Destructor
+  ///
+  ~CSettingsSlider() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// @note The call  of the control  is only  possible  from the  corresponding
-  /// window as its class and identification number is required.
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief Set the control on window to visible
   ///
-  class CSettingsSlider : public CAddonGUIControlBase
+  /// @param[in] visible              If true visible, otherwise hidden
+  ///
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CSettingsSlider(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_settings_slider(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CSettingsSlider can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief Destructor
-    ///
-    ~CSettingsSlider() override = default;
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_settings_slider->set_visible(m_interface->kodiBase,
+                                                                m_controlHandle, visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief Set's the control's enabled/disabled state
-    ///
-    /// @param[in] enabled              If true enabled, otherwise disabled
-    ///
-    void SetEnabled(bool enabled)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief Set's the control's enabled/disabled state
+  ///
+  /// @param[in] enabled              If true enabled, otherwise disabled
+  ///
+  void SetEnabled(bool enabled)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_enabled(m_interface->kodiBase,
+                                                                m_controlHandle, enabled);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief To set the text string on settings slider
-    ///
-    /// @param[in] text                 Text to show
-    ///
-    void SetText(const std::string& text)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_text(m_interface->kodiBase, m_controlHandle, text.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief To set the text string on settings slider
+  ///
+  /// @param[in] text                 Text to show
+  ///
+  void SetText(const std::string& text)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_text(m_interface->kodiBase, m_controlHandle,
+                                                             text.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief To reset slider on defaults
-    ///
-    void Reset()
-    {
-      m_interface->kodi_gui->control_settings_slider->reset(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief To reset slider on defaults
+  ///
+  void Reset()
+  {
+    m_interface->kodi_gui->control_settings_slider->reset(m_interface->kodiBase, m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief To set the the range as integer of slider, e.g. -10 is the slider
-    /// start and e.g. +10 is  the from here defined position where it reach the
-    /// end.
-    ///
-    /// Ad default is the range from 0 to 100.
-    ///
-    /// The integer interval is as default 1 and can be changed with
-    /// @ref SetIntInterval.
-    ///
-    /// @param[in] start                Integer start value
-    /// @param[in] end                  Integer end value
-    ///
-    /// @note Percent, floating point  or integer are alone possible.  Combining
-    /// these different  values  can be not  together  and can, therefore,  only
-    /// one each can be used.
-    ///
-    void SetIntRange(int start, int end)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_int_range(m_interface->kodiBase, m_controlHandle, start, end);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief To set the the range as integer of slider, e.g. -10 is the slider
+  /// start and e.g. +10 is  the from here defined position where it reach the
+  /// end.
+  ///
+  /// Ad default is the range from 0 to 100.
+  ///
+  /// The integer interval is as default 1 and can be changed with
+  /// @ref SetIntInterval.
+  ///
+  /// @param[in] start                Integer start value
+  /// @param[in] end                  Integer end value
+  ///
+  /// @note Percent, floating point  or integer are alone possible.  Combining
+  /// these different  values  can be not  together  and can, therefore,  only
+  /// one each can be used.
+  ///
+  void SetIntRange(int start, int end)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_int_range(m_interface->kodiBase,
+                                                                  m_controlHandle, start, end);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief Set the slider position  with the given integer value.  The Range
-    /// must be defined with a call from \ref SetIntRange before.
-    ///
-    /// @param[in] value                Position in range to set with integer
-    ///
-    /// @note Percent, floating point  or integer are alone possible.  Combining
-    /// these different  values ​​can  be not  together and  can, therefore,  only
-    /// one each can be used.
-    ///
-    void SetIntValue(int value)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_int_value(m_interface->kodiBase, m_controlHandle, value);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief Set the slider position  with the given integer value.  The Range
+  /// must be defined with a call from \ref SetIntRange before.
+  ///
+  /// @param[in] value                Position in range to set with integer
+  ///
+  /// @note Percent, floating point  or integer are alone possible.  Combining
+  /// these different  values ​​can  be not  together and  can, therefore,  only
+  /// one each can be used.
+  ///
+  void SetIntValue(int value)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_int_value(m_interface->kodiBase,
+                                                                  m_controlHandle, value);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief To get the current position as integer value.
-    ///
-    /// @return                         The position as integer
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these different  values ​​can  be not  together and can,  therefore,  only
-    /// one each can be used.
-    ///
-    int GetIntValue() const
-    {
-      return m_interface->kodi_gui->control_settings_slider->get_int_value(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief To get the current position as integer value.
+  ///
+  /// @return                         The position as integer
+  ///
+  /// @note Percent,  floating point or integer are alone possible.  Combining
+  /// these different  values ​​can  be not  together and can,  therefore,  only
+  /// one each can be used.
+  ///
+  int GetIntValue() const
+  {
+    return m_interface->kodi_gui->control_settings_slider->get_int_value(m_interface->kodiBase,
+                                                                         m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief To set the  interval steps of slider,  as default is it 1.  If it
-    /// becomes  changed with  this function  will a step  of the user  with the
-    /// value fixed here be executed.
-    ///
-    /// @param[in] interval             Intervall step to set.
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these different values  ​​can  be not  together and can,  therefore,  only
-    /// one each can be used.
-    ///
-    void SetIntInterval(int interval)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_int_interval(m_interface->kodiBase, m_controlHandle, interval);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief To set the  interval steps of slider,  as default is it 1.  If it
+  /// becomes  changed with  this function  will a step  of the user  with the
+  /// value fixed here be executed.
+  ///
+  /// @param[in] interval             Intervall step to set.
+  ///
+  /// @note Percent,  floating point or integer are alone possible.  Combining
+  /// these different values  ​​can  be not  together and can,  therefore,  only
+  /// one each can be used.
+  ///
+  void SetIntInterval(int interval)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_int_interval(m_interface->kodiBase,
+                                                                     m_controlHandle, interval);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief Sets the percent of the slider.
-    ///
-    /// @param[in] percent              float - Percent value of slide
-    ///
-    /// @note Percent, floating point  or integer are alone possible.  Combining
-    /// these different  values ​​can  be not together  and can,  therefore,  only
-    /// one each can be used.
-    ///
-    void SetPercentage(float percent)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_percentage(m_interface->kodiBase, m_controlHandle, percent);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief Sets the percent of the slider.
+  ///
+  /// @param[in] percent              float - Percent value of slide
+  ///
+  /// @note Percent, floating point  or integer are alone possible.  Combining
+  /// these different  values ​​can  be not together  and can,  therefore,  only
+  /// one each can be used.
+  ///
+  void SetPercentage(float percent)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_percentage(m_interface->kodiBase,
+                                                                   m_controlHandle, percent);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief Returns a float of the percent of the slider.
-    ///
-    /// @return                         float - Percent of slider
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these different  values ​​can be  not together  and can,  therefore,  only
-    /// one each can be used.
-    ///
-    float GetPercentage() const
-    {
-      return m_interface->kodi_gui->control_settings_slider->get_percentage(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief Returns a float of the percent of the slider.
+  ///
+  /// @return                         float - Percent of slider
+  ///
+  /// @note Percent,  floating point or integer are alone possible.  Combining
+  /// these different  values ​​can be  not together  and can,  therefore,  only
+  /// one each can be used.
+  ///
+  float GetPercentage() const
+  {
+    return m_interface->kodi_gui->control_settings_slider->get_percentage(m_interface->kodiBase,
+                                                                          m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief To set the the range as float of slider, e.g. -25.0 is the slider
-    /// start and  e.g.  +25.0 is the from  here defined position where it reach
-    /// the end.
-    ///
-    /// As default is the range 0.0 to 1.0.
-    ///
-    /// The float interval is as default 0.1 and can be changed with
-    /// @ref SetFloatInterval.
-    ///
-    /// @param[in] start                Integer start value
-    /// @param[in] end                  Integer end value
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these different values ​​ can be not  together  and can,  therefore,  only
-    /// one each can be used.
-    ///
-    void SetFloatRange(float start, float end)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_float_range(m_interface->kodiBase, m_controlHandle, start, end);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief To set the the range as float of slider, e.g. -25.0 is the slider
+  /// start and  e.g.  +25.0 is the from  here defined position where it reach
+  /// the end.
+  ///
+  /// As default is the range 0.0 to 1.0.
+  ///
+  /// The float interval is as default 0.1 and can be changed with
+  /// @ref SetFloatInterval.
+  ///
+  /// @param[in] start                Integer start value
+  /// @param[in] end                  Integer end value
+  ///
+  /// @note Percent,  floating point or integer are alone possible.  Combining
+  /// these different values ​​ can be not  together  and can,  therefore,  only
+  /// one each can be used.
+  ///
+  void SetFloatRange(float start, float end)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_float_range(m_interface->kodiBase,
+                                                                    m_controlHandle, start, end);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief Set  the slider position  with the given  float value.  The Range
-    /// can be defined with a  call from \ref SetIntRange before,  as default it
-    /// is 0.0 to 1.0.
-    ///
-    /// @param[in] value                Position in range to set with float
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these different  values ​​can be not  together  and can,  therefore,  only
-    /// one each can be used.
-    ///
-    void SetFloatValue(float value)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_float_value(m_interface->kodiBase, m_controlHandle, value);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief Set  the slider position  with the given  float value.  The Range
+  /// can be defined with a  call from \ref SetIntRange before,  as default it
+  /// is 0.0 to 1.0.
+  ///
+  /// @param[in] value                Position in range to set with float
+  ///
+  /// @note Percent,  floating point or integer are alone possible.  Combining
+  /// these different  values ​​can be not  together  and can,  therefore,  only
+  /// one each can be used.
+  ///
+  void SetFloatValue(float value)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_float_value(m_interface->kodiBase,
+                                                                    m_controlHandle, value);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief To get the current position as float value.
-    ///
-    /// @return                         The position as float
-    ///
-    float GetFloatValue() const
-    {
-      return m_interface->kodi_gui->control_settings_slider->get_float_value(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief To get the current position as float value.
+  ///
+  /// @return                         The position as float
+  ///
+  float GetFloatValue() const
+  {
+    return m_interface->kodi_gui->control_settings_slider->get_float_value(m_interface->kodiBase,
+                                                                           m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
-    /// @brief To set  the interval steps of slider,  as default is it 0.1 If it
-    /// becomes changed with this function will a step of the user with the
-    /// value fixed here be executed.
-    ///
-    /// @param[in] interval             Intervall step to set.
-    ///
-    /// @note Percent, floating point or  integer are alone possible.  Combining
-    /// these different values ​​can be not together and can, therefore, only
-    /// one each can be used.
-    ///
-    void SetFloatInterval(float interval)
-    {
-      m_interface->kodi_gui->control_settings_slider->set_float_interval(m_interface->kodiBase, m_controlHandle, interval);
-    }
-    //--------------------------------------------------------------------------
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSettingsSlider
+  /// @brief To set  the interval steps of slider,  as default is it 0.1 If it
+  /// becomes changed with this function will a step of the user with the
+  /// value fixed here be executed.
+  ///
+  /// @param[in] interval             Intervall step to set.
+  ///
+  /// @note Percent, floating point or  integer are alone possible.  Combining
+  /// these different values ​​can be not together and can, therefore, only
+  /// one each can be used.
+  ///
+  void SetFloatInterval(float interval)
+  {
+    m_interface->kodi_gui->control_settings_slider->set_float_interval(m_interface->kodiBase,
+                                                                       m_controlHandle, interval);
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h
index 6eae70a..715cc7d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h
@@ -18,307 +18,321 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CSlider Control Slider
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CSlider }
+/// **Window control for moveable slider**
+///
+/// The slider control is used for things where a sliding bar best  represents
+/// the operation at hand (such as a volume control or seek control).  You can
+/// choose the position, size, and look of the slider control.
+///
+/// It has the header \ref Slider.h "#include <kodi/gui/controls/Slider.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Slider_Control "slider control"
+///
+/// @note The  call of the  control  is only  possible from  the corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CSlider : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
   ///
-  /// \defgroup cpp_kodi_gui_controls_CSlider Control Slider
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CSlider }
-  /// **Window control for moveable slider**
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief Construct a new control
   ///
-  /// The slider control is used for things where a sliding bar best  represents
-  /// the operation at hand (such as a volume control or seek control).  You can
-  /// choose the position, size, and look of the slider control.
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
   ///
-  /// It has the header \ref Slider.h "#include <kodi/gui/controls/Slider.h>"
-  /// be included to enjoy it.
+  CSlider(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_slider(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CSlider can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref Slider_Control "slider control"
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief Destructor
   ///
-  /// @note The  call of the  control  is only  possible from  the corresponding
-  /// window as its class and identification number is required.
+  ~CSlider() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  class CSlider : public CAddonGUIControlBase
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief Set the control on window to visible
+  ///
+  /// @param[in] visible              If true visible, otherwise hidden
+  ///
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CSlider(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_slider(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CSlider can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief Destructor
-    ///
-    ~CSlider() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_slider->set_visible(m_interface->kodiBase, m_controlHandle, visible);
-    }
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_slider->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                       visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief Set's the control's enabled/disabled state
-    ///
-    /// @param[in] enabled              If true enabled, otherwise disabled
-    ///
-    void SetEnabled(bool enabled)
-    {
-      m_interface->kodi_gui->control_slider->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief Set's the control's enabled/disabled state
+  ///
+  /// @param[in] enabled              If true enabled, otherwise disabled
+  ///
+  void SetEnabled(bool enabled)
+  {
+    m_interface->kodi_gui->control_slider->set_enabled(m_interface->kodiBase, m_controlHandle,
+                                                       enabled);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief To reset slider on defaults
-    ///
-    void Reset()
-    {
-      m_interface->kodi_gui->control_slider->reset(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief To reset slider on defaults
+  ///
+  void Reset()
+  {
+    m_interface->kodi_gui->control_slider->reset(m_interface->kodiBase, m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief With GetDescription becomes a string value of position returned.
-    ///
-    /// @return                        Text string about current slider position
-    ///
-    /// The following are the text definition returned from this:
-    /// | Value     | Without range selection | With range selection           |
-    /// |:---------:|:------------------------|:-------------------------------|
-    /// | float     | <c>%2.2f</c>            | <c>[%2.2f, %2.2f]</c>          |
-    /// | integer   | <c>%i</c>               | <c>[%i, %i]</c>                |
-    /// | percent   | <c>%i%%</c>             | <c>[%i%%, %i%%]</c>            |
-    ///
-    std::string GetDescription() const
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief With GetDescription becomes a string value of position returned.
+  ///
+  /// @return                        Text string about current slider position
+  ///
+  /// The following are the text definition returned from this:
+  /// | Value     | Without range selection | With range selection           |
+  /// |:---------:|:------------------------|:-------------------------------|
+  /// | float     | <c>%2.2f</c>            | <c>[%2.2f, %2.2f]</c>          |
+  /// | integer   | <c>%i</c>               | <c>[%i, %i]</c>                |
+  /// | percent   | <c>%i%%</c>             | <c>[%i%%, %i%%]</c>            |
+  ///
+  std::string GetDescription() const
+  {
+    std::string text;
+    char* ret = m_interface->kodi_gui->control_slider->get_description(m_interface->kodiBase,
+                                                                       m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string text;
-      char* ret = m_interface->kodi_gui->control_slider->get_description(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          text = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return text;
+      if (std::strlen(ret))
+        text = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
+    return text;
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief To set the the range as integer of slider, e.g. -10 is the slider
-    /// start and e.g. +10 is the from here defined position where it  reach the
-    /// end.
-    ///
-    /// Ad default is the range from 0 to 100.
-    ///
-    /// The integer interval is as default 1 and can be changed with
-    /// @ref SetIntInterval.
-    ///
-    /// @param[in] start                Integer start value
-    /// @param[in] end                  Integer end value
-    ///
-    /// @note Percent, floating point or  integer are alone possible.  Combining
-    /// these different values can be not together and can, therefore,  only one
-    /// each can be used.
-    ///
-    void SetIntRange(int start, int end)
-    {
-      m_interface->kodi_gui->control_slider->set_int_range(m_interface->kodiBase, m_controlHandle, start, end);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief To set the the range as integer of slider, e.g. -10 is the slider
+  /// start and e.g. +10 is the from here defined position where it  reach the
+  /// end.
+  ///
+  /// Ad default is the range from 0 to 100.
+  ///
+  /// The integer interval is as default 1 and can be changed with
+  /// @ref SetIntInterval.
+  ///
+  /// @param[in] start                Integer start value
+  /// @param[in] end                  Integer end value
+  ///
+  /// @note Percent, floating point or  integer are alone possible.  Combining
+  /// these different values can be not together and can, therefore,  only one
+  /// each can be used.
+  ///
+  void SetIntRange(int start, int end)
+  {
+    m_interface->kodi_gui->control_slider->set_int_range(m_interface->kodiBase, m_controlHandle,
+                                                         start, end);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup CSlider
-    /// @brief Set the slider position  with the given integer value.  The Range
-    /// must be defined with a call from \ref SetIntRange before.
-    ///
-    /// @param[in] value                Position in range to set with integer
-    ///
-    /// @note Percent, floating point or integer  are alone possible.  Combining
-    /// these different values can be not together and can, therefore,  only one
-    /// each can be used.
-    ///
-    void SetIntValue(int value)
-    {
-      m_interface->kodi_gui->control_slider->set_int_value(m_interface->kodiBase, m_controlHandle, value);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup CSlider
+  /// @brief Set the slider position  with the given integer value.  The Range
+  /// must be defined with a call from \ref SetIntRange before.
+  ///
+  /// @param[in] value                Position in range to set with integer
+  ///
+  /// @note Percent, floating point or integer  are alone possible.  Combining
+  /// these different values can be not together and can, therefore,  only one
+  /// each can be used.
+  ///
+  void SetIntValue(int value)
+  {
+    m_interface->kodi_gui->control_slider->set_int_value(m_interface->kodiBase, m_controlHandle,
+                                                         value);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief To get the current position as integer value.
-    ///
-    /// @return                         The position as integer
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these  different  values  can be not together and can,  therefore,  only
-    /// one each can be used.
-    ///
-    int GetIntValue() const
-    {
-      return m_interface->kodi_gui->control_slider->get_int_value(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief To get the current position as integer value.
+  ///
+  /// @return                         The position as integer
+  ///
+  /// @note Percent,  floating point or integer are alone possible.  Combining
+  /// these  different  values  can be not together and can,  therefore,  only
+  /// one each can be used.
+  ///
+  int GetIntValue() const
+  {
+    return m_interface->kodi_gui->control_slider->get_int_value(m_interface->kodiBase,
+                                                                m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief To set the interval  steps of slider,  as default is it 1.  If it
-    /// becomes  changed  with this function  will a step  of the  user with the
-    /// value fixed here be executed.
-    ///
-    /// @param[in] interval             Intervall step to set.
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these different values can be not together and can, therefore,  only one
-    /// each can be used.
-    ///
-    void SetIntInterval(int interval)
-    {
-      m_interface->kodi_gui->control_slider->set_int_interval(m_interface->kodiBase, m_controlHandle, interval);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief To set the interval  steps of slider,  as default is it 1.  If it
+  /// becomes  changed  with this function  will a step  of the  user with the
+  /// value fixed here be executed.
+  ///
+  /// @param[in] interval             Intervall step to set.
+  ///
+  /// @note Percent,  floating point or integer are alone possible.  Combining
+  /// these different values can be not together and can, therefore,  only one
+  /// each can be used.
+  ///
+  void SetIntInterval(int interval)
+  {
+    m_interface->kodi_gui->control_slider->set_int_interval(m_interface->kodiBase, m_controlHandle,
+                                                            interval);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief Sets the percent of the slider.
-    ///
-    /// @param[in] percent              float - Percent value of slide
-    ///
-    /// @note Percent, floating point or  integer are alone possible.  Combining
-    /// these different values can be not together and can, therefore,  only one
-    /// each can be used.
-    ///
-    void SetPercentage(float percent)
-    {
-      m_interface->kodi_gui->control_slider->set_percentage(m_interface->kodiBase, m_controlHandle, percent);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief Sets the percent of the slider.
+  ///
+  /// @param[in] percent              float - Percent value of slide
+  ///
+  /// @note Percent, floating point or  integer are alone possible.  Combining
+  /// these different values can be not together and can, therefore,  only one
+  /// each can be used.
+  ///
+  void SetPercentage(float percent)
+  {
+    m_interface->kodi_gui->control_slider->set_percentage(m_interface->kodiBase, m_controlHandle,
+                                                          percent);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief Returns a float of the percent of the slider.
-    ///
-    /// @return                         float - Percent of slider
-    ///
-    /// @note Percent, floating point or integer  are alone possible.  Combining
-    /// these different values can be not together and can, therefore,  only one
-    /// each can be used.
-    ///
-    float GetPercentage() const
-    {
-      return m_interface->kodi_gui->control_slider->get_percentage(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief Returns a float of the percent of the slider.
+  ///
+  /// @return                         float - Percent of slider
+  ///
+  /// @note Percent, floating point or integer  are alone possible.  Combining
+  /// these different values can be not together and can, therefore,  only one
+  /// each can be used.
+  ///
+  float GetPercentage() const
+  {
+    return m_interface->kodi_gui->control_slider->get_percentage(m_interface->kodiBase,
+                                                                 m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief To set the the range as float of slider, e.g. -25.0 is the slider
-    /// start and e.g. +25.0 is  the from here  defined position  where it reach
-    /// the end.
-    ///
-    /// As default is the range 0.0 to 1.0.
-    ///
-    /// The float interval is as default 0.1 and can be changed with
-    /// @ref SetFloatInterval.
-    ///
-    /// @param[in] start                Integer start value
-    /// @param[in] end                  Integer end value
-    ///
-    /// @note Percent,  floating point or integer are alone possible.  Combining
-    /// these  different  values  can be not together and can,  therefore,  only
-    /// one each can be used.
-    ///
-    void SetFloatRange(float start, float end)
-    {
-      m_interface->kodi_gui->control_slider->set_float_range(m_interface->kodiBase, m_controlHandle, start, end);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief To set the the range as float of slider, e.g. -25.0 is the slider
+  /// start and e.g. +25.0 is  the from here  defined position  where it reach
+  /// the end.
+  ///
+  /// As default is the range 0.0 to 1.0.
+  ///
+  /// The float interval is as default 0.1 and can be changed with
+  /// @ref SetFloatInterval.
+  ///
+  /// @param[in] start                Integer start value
+  /// @param[in] end                  Integer end value
+  ///
+  /// @note Percent,  floating point or integer are alone possible.  Combining
+  /// these  different  values  can be not together and can,  therefore,  only
+  /// one each can be used.
+  ///
+  void SetFloatRange(float start, float end)
+  {
+    m_interface->kodi_gui->control_slider->set_float_range(m_interface->kodiBase, m_controlHandle,
+                                                           start, end);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief Set the slider  position with the  given float value.  The  Range
-    /// can be defined with a call from  \ref SetIntRange before,  as default it
-    /// is 0.0 to 1.0.
-    ///
-    /// @param[in] value                Position in range to set with float
-    ///
-    /// @note Percent, floating  point or integer are alone possible.  Combining
-    /// these different values can be not together and can, therefore,  only one
-    /// each can be used.
-    ///
-    void SetFloatValue(float value)
-    {
-      m_interface->kodi_gui->control_slider->set_float_value(m_interface->kodiBase, m_controlHandle, value);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief Set the slider  position with the  given float value.  The  Range
+  /// can be defined with a call from  \ref SetIntRange before,  as default it
+  /// is 0.0 to 1.0.
+  ///
+  /// @param[in] value                Position in range to set with float
+  ///
+  /// @note Percent, floating  point or integer are alone possible.  Combining
+  /// these different values can be not together and can, therefore,  only one
+  /// each can be used.
+  ///
+  void SetFloatValue(float value)
+  {
+    m_interface->kodi_gui->control_slider->set_float_value(m_interface->kodiBase, m_controlHandle,
+                                                           value);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief To get the current position as float value.
-    ///
-    /// @return                         The position as float
-    ///
-    float GetFloatValue() const
-    {
-      return m_interface->kodi_gui->control_slider->get_float_value(m_interface->kodiBase, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief To get the current position as float value.
+  ///
+  /// @return                         The position as float
+  ///
+  float GetFloatValue() const
+  {
+    return m_interface->kodi_gui->control_slider->get_float_value(m_interface->kodiBase,
+                                                                  m_controlHandle);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CSlider
-    /// @brief To set the interval  steps of slider, as default is it 0.1  If it
-    /// becomes changed  with this  function  will a step  of the user  with the
-    /// value fixed here be executed.
-    ///
-    /// @param[in] interval             Intervall step to set.
-    ///
-    /// @note Percent, floating point or integer  are alone possible.  Combining
-    /// these different  values can be  not together  and can,  therefore,  only
-    /// one each can be used.
-    ///
-    void SetFloatInterval(float interval)
-    {
-      m_interface->kodi_gui->control_slider->set_float_interval(m_interface->kodiBase, m_controlHandle, interval);
-    }
-    //--------------------------------------------------------------------------
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CSlider
+  /// @brief To set the interval  steps of slider, as default is it 0.1  If it
+  /// becomes changed  with this  function  will a step  of the user  with the
+  /// value fixed here be executed.
+  ///
+  /// @param[in] interval             Intervall step to set.
+  ///
+  /// @note Percent, floating point or integer  are alone possible.  Combining
+  /// these different  values can be  not together  and can,  therefore,  only
+  /// one each can be used.
+  ///
+  void SetFloatInterval(float interval)
+  {
+    m_interface->kodi_gui->control_slider->set_float_interval(m_interface->kodiBase,
+                                                              m_controlHandle, interval);
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h
index f3017b5..db8d491 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h
@@ -61,7 +61,7 @@ namespace controls
   } AddonGUISpinControlType;
   //----------------------------------------------------------------------------
 
-  class CSpin : public CAddonGUIControlBase
+  class ATTRIBUTE_HIDDEN CSpin : public CAddonGUIControlBase
   {
   public:
     //==========================================================================
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h
index 13ce1da..b4e8ae0 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h
@@ -18,147 +18,150 @@ namespace gui
 namespace controls
 {
 
-  //============================================================================
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_controls_CTextBox Control Text Box
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::controls::CTextBox }
+/// **Used to show a multi-page piece of text**
+///
+/// The text box control  can be used to display  descriptions,  help texts or
+/// other larger texts.  It corresponds to the representation which is also to
+/// be seen on the CDialogTextViewer.
+///
+/// It has the header \ref TextBox.h "#include <kodi/gui/controls/TextBox.h>"
+/// be included to enjoy it.
+///
+/// Here you find the needed skin part for a \ref Text_Box "textbox control".
+///
+/// @note The call  of the  control is  only possible  from the  corresponding
+/// window as its class and identification number is required.
+///
+class ATTRIBUTE_HIDDEN CTextBox : public CAddonGUIControlBase
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @brief Construct a new control
+  ///
+  /// @param[in] window               related window control class
+  /// @param[in] controlId            Used skin xml control id
   ///
-  /// \defgroup cpp_kodi_gui_controls_CTextBox Control Text Box
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::controls::CTextBox }
-  /// **Used to show a multi-page piece of text**
+  CTextBox(CWindow* window, int controlId) : CAddonGUIControlBase(window)
+  {
+    m_controlHandle = m_interface->kodi_gui->window->get_control_text_box(
+        m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+    if (!m_controlHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::controls::CTextBox can't create control class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// The text box control  can be used to display  descriptions,  help texts or
-  /// other larger texts.  It corresponds to the representation which is also to
-  /// be seen on the CDialogTextViewer.
+  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @brief Destructor
   ///
-  /// It has the header \ref TextBox.h "#include <kodi/gui/controls/TextBox.h>"
-  /// be included to enjoy it.
+  ~CTextBox() override = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// Here you find the needed skin part for a \ref Text_Box "textbox control".
+  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @brief Set the control on window to visible
   ///
-  /// @note The call  of the  control is  only possible  from the  corresponding
-  /// window as its class and identification number is required.
+  /// @param[in] visible              If true visible, otherwise hidden
   ///
-  class CTextBox : public CAddonGUIControlBase
+  void SetVisible(bool visible)
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CTextBox
-    /// @brief Construct a new control
-    ///
-    /// @param[in] window               related window control class
-    /// @param[in] controlId            Used skin xml control id
-    ///
-    CTextBox(CWindow* window, int controlId)
-      : CAddonGUIControlBase(window)
-    {
-      m_controlHandle = m_interface->kodi_gui->window->get_control_text_box(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
-      if (!m_controlHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CTextBox can't create control class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CTextBox
-    /// @brief Destructor
-    ///
-    ~CTextBox() override = default;
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CTextBox
-    /// @brief Set the control on window to visible
-    ///
-    /// @param[in] visible              If true visible, otherwise hidden
-    ///
-    void SetVisible(bool visible)
-    {
-      m_interface->kodi_gui->control_text_box->set_visible(m_interface->kodiBase, m_controlHandle,  visible);
-    }
-    //--------------------------------------------------------------------------
+    m_interface->kodi_gui->control_text_box->set_visible(m_interface->kodiBase, m_controlHandle,
+                                                         visible);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CTextBox
-    /// @brief To reset box an remove all the text
-    ///
-    void Reset()
-    {
-      m_interface->kodi_gui->control_text_box->reset(m_controlHandle, m_controlHandle);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @brief To reset box an remove all the text
+  ///
+  void Reset() { m_interface->kodi_gui->control_text_box->reset(m_controlHandle, m_controlHandle); }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CTextBox
-    /// @brief To set the text on box
-    ///
-    /// @param[in] text                 Text to show
-    ///
-    void SetText(const std::string& text)
-    {
-      m_interface->kodi_gui->control_text_box->set_text(m_interface->kodiBase, m_controlHandle,  text.c_str());
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @brief To set the text on box
+  ///
+  /// @param[in] text                 Text to show
+  ///
+  void SetText(const std::string& text)
+  {
+    m_interface->kodi_gui->control_text_box->set_text(m_interface->kodiBase, m_controlHandle,
+                                                      text.c_str());
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CTextBox
-    /// @brief Get the used text from control
-    ///
-    /// @return                         Text shown
-    ///
-    std::string GetText() const
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @brief Get the used text from control
+  ///
+  /// @return                         Text shown
+  ///
+  std::string GetText() const
+  {
+    std::string text;
+    char* ret =
+        m_interface->kodi_gui->control_text_box->get_text(m_interface->kodiBase, m_controlHandle);
+    if (ret != nullptr)
     {
-      std::string text;
-      char* ret = m_interface->kodi_gui->control_text_box->get_text(m_interface->kodiBase, m_controlHandle);
-      if (ret != nullptr)
-      {
-        if (std::strlen(ret))
-          text = ret;
-        m_interface->free_string(m_interface->kodiBase, ret);
-      }
-      return text;
+      if (std::strlen(ret))
+        text = ret;
+      m_interface->free_string(m_interface->kodiBase, ret);
     }
-    //--------------------------------------------------------------------------
+    return text;
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CTextBox
-    /// @brief To scroll text on other position
-    ///
-    /// @param[in] position             The line position to scroll to
-    ///
-    void Scroll(unsigned int position)
-    {
-      m_interface->kodi_gui->control_text_box->scroll(m_interface->kodiBase, m_controlHandle, position);
-    }
-    //--------------------------------------------------------------------------
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @brief To scroll text on other position
+  ///
+  /// @param[in] position             The line position to scroll to
+  ///
+  void Scroll(unsigned int position)
+  {
+    m_interface->kodi_gui->control_text_box->scroll(m_interface->kodiBase, m_controlHandle,
+                                                    position);
+  }
+  //--------------------------------------------------------------------------
 
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_controls_CTextBox
-    /// @brief To set automatic scrolling of textbox
-    ///
-    /// Specifies the timing  and conditions of  any autoscrolling  this textbox
-    /// should have. Times are in milliseconds.  The content is delayed  for the
-    /// given delay,  then scrolls at a rate of one line per time interval until
-    /// the end.  If the repeat tag is present,  it then  delays for  the repeat
-    /// time,  fades out over 1 second,  and repeats.  It does not wrap or reset
-    /// to the top at the end of the scroll.
-    ///
-    /// @param[in] delay                Content delay
-    /// @param[in] time                 One line per time interval
-    /// @param[in] repeat               Delays with given time, fades out over 1
-    ///                                 second, and repeats
-    ///
-    void SetAutoScrolling(int delay, int time, int repeat)
-    {
-      m_interface->kodi_gui->control_text_box->set_auto_scrolling(m_interface->kodiBase, m_controlHandle, delay, time, repeat);
-    }
-    //--------------------------------------------------------------------------
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_controls_CTextBox
+  /// @brief To set automatic scrolling of textbox
+  ///
+  /// Specifies the timing  and conditions of  any autoscrolling  this textbox
+  /// should have. Times are in milliseconds.  The content is delayed  for the
+  /// given delay,  then scrolls at a rate of one line per time interval until
+  /// the end.  If the repeat tag is present,  it then  delays for  the repeat
+  /// time,  fades out over 1 second,  and repeats.  It does not wrap or reset
+  /// to the top at the end of the scroll.
+  ///
+  /// @param[in] delay                Content delay
+  /// @param[in] time                 One line per time interval
+  /// @param[in] repeat               Delays with given time, fades out over 1
+  ///                                 second, and repeats
+  ///
+  void SetAutoScrolling(int delay, int time, int repeat)
+  {
+    m_interface->kodi_gui->control_text_box->set_auto_scrolling(
+        m_interface->kodiBase, m_controlHandle, delay, time, repeat);
+  }
+  //--------------------------------------------------------------------------
+};
 
 } /* namespace controls */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
index b8b4cbf..4eb64c7 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
@@ -200,6 +200,8 @@ typedef struct AddonToKodiFuncTable_kodi_gui_dialogFileBrowser
   void (*clear_file_list)(void* kodiBase, char*** file_list, unsigned int entries);
 } AddonToKodiFuncTable_kodi_gui_dialogFileBrowser;
 
+// typedef void (*char_callback_t) (CGUIKeyboard *ref, const std::string &typedString);
+
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogKeyboard
 {
   bool (*show_and_get_input_with_head)(void* kodiBase, const char* text_in, char** text_out, const char* heading, bool allow_empty_result, bool hiddenInput, unsigned int auto_close_ms);
@@ -276,8 +278,6 @@ typedef struct AddonToKodiFuncTable_kodi_gui_listItem
   void (*set_label)(void* kodiBase, void* handle, const char* label);
   char* (*get_label2)(void* kodiBase, void* handle);
   void (*set_label2)(void* kodiBase, void* handle, const char* label);
-  char* (*get_icon_image)(void* kodiBase, void* handle);
-  void (*set_icon_image)(void* kodiBase, void* handle, const char* image);
   char* (*get_art)(void* kodiBase, void* handle, const char* type);
   void (*set_art)(void* kodiBase, void* handle, const char* type, const char* image);
   char* (*get_path)(void* kodiBase, void* handle);
@@ -302,12 +302,12 @@ typedef struct AddonToKodiFuncTable_kodi_gui_window
   void* (*create)(void* kodiBase, const char* xml_filename, const char* default_skin, bool as_dialog, bool is_media);
   void (*destroy)(void* kodiBase, void* handle);
   void (*set_callbacks)(void* kodiBase, void* handle, void* clienthandle,
-       bool (*)(void* handle),
-       bool (*)(void* handle, int),
-       bool (*)(void* handle, int),
-       bool (*)(void* handle, int),
-       void (*)(void* handle, int, gui_context_menu_pair*, unsigned int*),
-       bool (*)(void* handle, int, unsigned int));
+        bool (*CBInit)(void*),
+        bool (*CBFocus)(void*, int),
+        bool (*CBClick)(void*, int),
+        bool (*CBOnAction)(void*, int, uint32_t, wchar_t),
+        void (*CBGetContextButtons)(void*, int, gui_context_menu_pair*, unsigned int*),
+        bool (*CBOnContextButton)(void*, int, unsigned int));
   bool (*show)(void* kodiBase, void* handle);
   bool (*close)(void* kodiBase, void* handle);
   bool (*do_modal)(void* kodiBase, void* handle);
@@ -316,6 +316,8 @@ typedef struct AddonToKodiFuncTable_kodi_gui_window
   bool (*set_focus_id)(void* kodiBase, void* handle, int control_id);
   int (*get_focus_id)(void* kodiBase, void* handle);
   void (*set_control_label)(void* kodiBase, void* handle, int control_id, const char* label);
+  void (*set_control_visible)(void* kodiBase, void* handle, int control_id, bool visible);
+  void (*set_control_selected)(void* kodiBase, void* handle, int control_id, bool selected);
 
   /* Window property functions */
   void (*set_property)(void* kodiBase, void* handle, const char* key, const char* value);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
index 26d6386..d545030 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
@@ -66,16 +66,18 @@ namespace dialogs
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::string>& entries)
+    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                     const std::vector<std::string>& entries)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
-      const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char**)));
+      unsigned int size = static_cast<unsigned int>(entries.size());
+      const char** cEntries = static_cast<const char**>(malloc(size * sizeof(const char**)));
       for (unsigned int i = 0; i < size; ++i)
       {
         cEntries[i] = entries[i].c_str();
       }
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
+      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(
+          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
       free(cEntries);
       return ret;
     }
@@ -113,10 +115,11 @@ namespace dialogs
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::pair<std::string, std::string>>& entries)
+    inline int ATTRIBUTE_HIDDEN Show(
+        const std::string& heading, const std::vector<std::pair<std::string, std::string>>& entries)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
+      unsigned int size = static_cast<unsigned int>(entries.size());
       const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char**)));
       for (unsigned int i = 0; i < size; ++i)
       {
@@ -160,10 +163,11 @@ namespace dialogs
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::pair<int, std::string>>& entries)
+    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                     const std::vector<std::pair<int, std::string>>& entries)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
+      unsigned int size = static_cast<unsigned int>(entries.size());
       const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char**)));
       for (unsigned int i = 0; i < size; ++i)
       {
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
index 417d5db..5a49b70 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
@@ -18,218 +18,232 @@ namespace gui
 namespace dialogs
 {
 
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_CExtendedProgress Dialog Extended Progress
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::dialogs::ExtendedProgress }
-  /// **Progress dialog shown for background work**
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_dialogs_CExtendedProgress Dialog Extended Progress
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::dialogs::ExtendedProgress }
+/// **Progress dialog shown for background work**
+///
+/// The with \ref ExtendedProgress.h "#include <kodi/gui/dialogs/ExtendedProgress.h>"
+/// given class are basically used to create Kodi's extended progress.
+///
+///
+/// --------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/ExtendedProgress.h>
+///
+/// kodi::gui::dialogs::CExtendedProgress *ext_progress = new kodi::gui::dialogs::CExtendedProgress("Test Extended progress");
+/// ext_progress->SetText("Test progress");
+/// for (unsigned int i = 0; i < 50; i += 10)
+/// {
+///   ext_progress->SetProgress(i, 100);
+///   sleep(1);
+/// }
+///
+/// ext_progress->SetTitle("Test Extended progress - Second round");
+/// ext_progress->SetText("Test progress - Step 2");
+///
+/// for (unsigned int i = 50; i < 100; i += 10)
+/// {
+///   ext_progress->SetProgress(i, 100);
+///   sleep(1);
+/// }
+/// delete ext_progress;
+/// ~~~~~~~~~~~~~
+///
+class ATTRIBUTE_HIDDEN CExtendedProgress
+{
+public:
+  //==========================================================================
   ///
-  /// The with \ref ExtendedProgress.h "#include <kodi/gui/dialogs/ExtendedProgress.h>"
-  /// given class are basically used to create Kodi's extended progress.
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// Construct a new dialog
   ///
+  /// @param[in] title  Title string
   ///
-  /// --------------------------------------------------------------------------
+  explicit CExtendedProgress(const std::string& title = "")
+  {
+    using namespace ::kodi::addon;
+    m_DialogHandle = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->new_dialog(
+        CAddonBase::m_interface->toKodi->kodiBase, title.c_str());
+    if (!m_DialogHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::CDialogExtendedProgress can't create window class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/gui/dialogs/ExtendedProgress.h>
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// Destructor
   ///
-  /// kodi::gui::dialogs::CExtendedProgress *ext_progress = new kodi::gui::dialogs::CExtendedProgress("Test Extended progress");
-  /// ext_progress->SetText("Test progress");
-  /// for (unsigned int i = 0; i < 50; i += 10)
-  /// {
-  ///   ext_progress->SetProgress(i, 100);
-  ///   sleep(1);
-  /// }
+  ~CExtendedProgress()
+  {
+    using namespace ::kodi::addon;
+    if (m_DialogHandle)
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->delete_dialog(
+          CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
   ///
-  /// ext_progress->SetTitle("Test Extended progress - Second round");
-  /// ext_progress->SetText("Test progress - Step 2");
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief Get the used title
   ///
-  /// for (unsigned int i = 50; i < 100; i += 10)
-  /// {
-  ///   ext_progress->SetProgress(i, 100);
-  ///   sleep(1);
-  /// }
-  /// delete ext_progress;
-  /// ~~~~~~~~~~~~~
+  /// @return Title string
   ///
-  class CExtendedProgress
+  std::string Title() const
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// Construct a new dialog
-    ///
-    /// @param[in] title  Title string
-    ///
-    explicit CExtendedProgress(const std::string& title = "")
-    {
-      using namespace ::kodi::addon;
-      m_DialogHandle = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->new_dialog(CAddonBase::m_interface->toKodi->kodiBase, title.c_str());
-      if (!m_DialogHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::CDialogExtendedProgress can't create window class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// Destructor
-    ///
-    ~CExtendedProgress()
-    {
-      using namespace ::kodi::addon;
-      if (m_DialogHandle)
-        CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->delete_dialog(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief Get the used title
-    ///
-    /// @return Title string
-    ///
-    std::string Title() const
-    {
-      using namespace ::kodi::addon;
-      std::string text;
-      char* strMsg = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_title(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-      if (strMsg != nullptr)
-      {
-        if (std::strlen(strMsg))
-          text = strMsg;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, strMsg);
-      }
-      return text;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief To set the title of dialog
-    ///
-    /// @param[in] title     Title string
-    ///
-    void SetTitle(const std::string& title)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_title(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, title.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief Get the used text information string
-    ///
-    /// @return Text string
-    ///
-    std::string Text() const
-    {
-      using namespace ::kodi::addon;
-      std::string text;
-      char* strMsg = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_text(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-      if (strMsg != nullptr)
-      {
-        if (std::strlen(strMsg))
-          text = strMsg;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, strMsg);
-      }
-      return text;
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief To set the used text information string
-    ///
-    /// @param[in] text         information text to set
-    ///
-    void SetText(const std::string& text)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_text(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, text.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief To ask dialog is finished
-    ///
-    /// @return True if on end
-    ///
-    bool IsFinished() const
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->is_finished(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief Mark progress finished
-    ///
-    void MarkFinished()
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->mark_finished(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief Get the current progress position as percent
-    ///
-    /// @return Position
-    ///
-    float Percentage() const
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_percentage(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief To set the current progress position as percent
-    ///
-    /// @param[in] percentage   Position to use from 0.0 to 100.0
-    ///
-    void SetPercentage(float percentage)
+    using namespace ::kodi::addon;
+    std::string text;
+    char* strMsg = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_title(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    if (strMsg != nullptr)
     {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_percentage(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, percentage);
+      if (std::strlen(strMsg))
+        text = strMsg;
+      CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   strMsg);
     }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
-    /// @brief To set progress position with predefined places
-    ///
-    /// @param[in] currentItem    Place position to use
-    /// @param[in] itemCount      Amount of used places
-    ///
-    void SetProgress(int currentItem, int itemCount)
+    return text;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To set the title of dialog
+  ///
+  /// @param[in] title     Title string
+  ///
+  void SetTitle(const std::string& title)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_title(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, title.c_str());
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief Get the used text information string
+  ///
+  /// @return Text string
+  ///
+  std::string Text() const
+  {
+    using namespace ::kodi::addon;
+    std::string text;
+    char* strMsg = CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_text(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+    if (strMsg != nullptr)
     {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_progress(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, currentItem, itemCount);
+      if (std::strlen(strMsg))
+        text = strMsg;
+      CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                   strMsg);
     }
-    //--------------------------------------------------------------------------
+    return text;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To set the used text information string
+  ///
+  /// @param[in] text         information text to set
+  ///
+  void SetText(const std::string& text)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_text(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, text.c_str());
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To ask dialog is finished
+  ///
+  /// @return True if on end
+  ///
+  bool IsFinished() const
+  {
+    using namespace ::kodi::addon;
+    return CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->is_finished(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief Mark progress finished
+  ///
+  void MarkFinished()
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->mark_finished(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief Get the current progress position as percent
+  ///
+  /// @return Position
+  ///
+  float Percentage() const
+  {
+    using namespace ::kodi::addon;
+    return CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->get_percentage(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
 
-  private:
-    void* m_DialogHandle;
-  };
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To set the current progress position as percent
+  ///
+  /// @param[in] percentage   Position to use from 0.0 to 100.0
+  ///
+  void SetPercentage(float percentage)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_percentage(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, percentage);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
+  /// @brief To set progress position with predefined places
+  ///
+  /// @param[in] currentItem    Place position to use
+  /// @param[in] itemCount      Amount of used places
+  ///
+  void SetProgress(int currentItem, int itemCount)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogExtendedProgress->set_progress(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, currentItem, itemCount);
+  }
+  //--------------------------------------------------------------------------
+
+private:
+  void* m_DialogHandle;
+};
 
 } /* namespace dialogs */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
index bb1065d..90da063 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
@@ -71,17 +71,22 @@ namespace dialogs
     /// fprintf(stderr, "Selected directory is : %s and was %s\n", directory.c_str(), ret ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndGetDirectory(const std::string& shares, const std::string& heading, std::string& path, bool writeOnly = false)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetDirectory(const std::string& shares,
+                                                     const std::string& heading,
+                                                     std::string& path,
+                                                     bool writeOnly = false)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_directory(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                      shares.c_str(), heading.c_str(), path.c_str(), &retString, writeOnly);
+      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->show_and_get_directory(
+          CAddonBase::m_interface->toKodi->kodiBase, shares.c_str(), heading.c_str(), path.c_str(),
+          &retString, writeOnly);
       if (retString != nullptr)
       {
         if (std::strlen(retString))
           path = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                     retString);
       }
       return ret;
     }
@@ -104,8 +109,12 @@ namespace dialogs
     ///                                 handled as directories.
     /// @return                         False if selection becomes canceled.
     ///
-    inline bool ShowAndGetFile(const std::string& shares, const std::string& mask, const std::string& heading,
-                               std::string& path, bool useThumbs = false, bool useFileDirectories = false)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetFile(const std::string& shares,
+                                                const std::string& mask,
+                                                const std::string& heading,
+                                                std::string& path,
+                                                bool useThumbs = false,
+                                                bool useFileDirectories = false)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -141,8 +150,13 @@ namespace dialogs
     /// @param[in] singleList
     /// @return                         False if selection becomes canceled.
     ///
-    inline bool ShowAndGetFileFromDir(const std::string& directory, const std::string& mask, const std::string& heading, std::string& path,
-                                      bool useThumbs = false, bool useFileDirectories = false, bool singleList = false)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetFileFromDir(const std::string& directory,
+                                                       const std::string& mask,
+                                                       const std::string& heading,
+                                                       std::string& path,
+                                                       bool useThumbs = false,
+                                                       bool useFileDirectories = false,
+                                                       bool singleList = false)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -176,8 +190,12 @@ namespace dialogs
     ///                               handled as directories.
     /// @return False if selection becomes canceled.
     ///
-    inline bool ShowAndGetFileList(const std::string& shares, const std::string& mask, const std::string& heading,
-                                   std::vector<std::string>& fileList, bool useThumbs = false, bool useFileDirectories = false)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetFileList(const std::string& shares,
+                                                    const std::string& mask,
+                                                    const std::string& heading,
+                                                    std::vector<std::string>& fileList,
+                                                    bool useThumbs = false,
+                                                    bool useFileDirectories = false)
     {
       using namespace ::kodi::addon;
       char** list = nullptr;
@@ -188,7 +206,7 @@ namespace dialogs
       if (ret)
       {
         for (unsigned int i = 0; i < listSize; ++i)
-          fileList.push_back(list[i]);
+          fileList.emplace_back(list[i]);
         CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->clear_file_list(CAddonBase::m_interface->toKodi->kodiBase, &list, listSize);
       }
       return ret;
@@ -208,7 +226,10 @@ namespace dialogs
     /// @param[in] type
     /// @return                       False if selection becomes canceled.
     ///
-    inline bool ShowAndGetSource(std::string& path, bool allowNetworkShares, const std::string& additionalShare = "", const std::string& type = "")
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetSource(std::string& path,
+                                                  bool allowNetworkShares,
+                                                  const std::string& additionalShare = "",
+                                                  const std::string& type = "")
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -235,7 +256,9 @@ namespace dialogs
     /// @param[out] path      Return value about selected image
     /// @return               False if selection becomes canceled.
     ///
-    inline bool ShowAndGetImage(const std::string& shares, const std::string& heading, std::string& path)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetImage(const std::string& shares,
+                                                 const std::string& heading,
+                                                 std::string& path)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -262,7 +285,9 @@ namespace dialogs
     /// @param[out] file_list   Return value about selected images
     /// @return                 False if selection becomes canceled.
     ///
-    inline bool ShowAndGetImageList(const std::string& shares, const std::string& heading, std::vector<std::string>& file_list)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetImageList(const std::string& shares,
+                                                     const std::string& heading,
+                                                     std::vector<std::string>& file_list)
     {
       using namespace ::kodi::addon;
       char** list = nullptr;
@@ -272,7 +297,7 @@ namespace dialogs
       if (ret)
       {
         for (unsigned int i = 0; i < listSize; ++i)
-          file_list.push_back(list[i]);
+          file_list.emplace_back(list[i]);
         CAddonBase::m_interface->toKodi->kodi_gui->dialogFileBrowser->clear_file_list(CAddonBase::m_interface->toKodi->kodiBase, &list, listSize);
       }
       return ret;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
index 76284d8..843bdfa 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
@@ -76,17 +76,23 @@ namespace dialogs
     ///                   text.c_str(), bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndGetInput(std::string& text, const std::string& heading, bool allowEmptyResult, bool hiddenInput = false, unsigned int autoCloseMs = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(std::string& text,
+                                                 const std::string& heading,
+                                                 bool allowEmptyResult,
+                                                 bool hiddenInput = false,
+                                                 unsigned int autoCloseMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_input_with_head(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                         text.c_str(), &retString, heading.c_str(), allowEmptyResult,
-                                                                                                         hiddenInput, autoCloseMs);
+      bool ret =
+          CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_input_with_head(
+              CAddonBase::m_interface->toKodi->kodiBase, text.c_str(), &retString, heading.c_str(),
+              allowEmptyResult, hiddenInput, autoCloseMs);
       if (retString != nullptr)
       {
         text = retString;
-        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString);
+        CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase,
+                                                     retString);
       }
       return ret;
     }
@@ -108,7 +114,9 @@ namespace dialogs
     ///                             false  if  unsuccessful   display,  no  user
     ///                             input, or canceled editing.
     ///
-    inline bool ShowAndGetInput(std::string& text, bool allowEmptyResult, unsigned int autoCloseMs = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(std::string& text,
+                                                 bool allowEmptyResult,
+                                                 unsigned int autoCloseMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -140,7 +148,10 @@ namespace dialogs
     ///                              false  if  unsuccessful  display,  no  user
     ///                              input, or canceled editing.
     ///
-    inline bool ShowAndGetNewPassword(std::string& newPassword, const std::string& heading, bool allowEmptyResult, unsigned int autoCloseMs = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetNewPassword(std::string& newPassword,
+                                                       const std::string& heading,
+                                                       bool allowEmptyResult,
+                                                       unsigned int autoCloseMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -170,7 +181,8 @@ namespace dialogs
     ///                               false  if  unsuccessful  display,  no  user
     ///                               input, or canceled editing.
     ///
-    inline bool ShowAndGetNewPassword(std::string& newPassword, unsigned int autoCloseMs = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetNewPassword(std::string& newPassword,
+                                                       unsigned int autoCloseMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -251,7 +263,10 @@ namespace dialogs
     /// }
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndVerifyNewPassword(std::string& newPassword, const std::string& heading, bool allowEmptyResult, unsigned int autoCloseMs = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword,
+                                                          const std::string& heading,
+                                                          bool allowEmptyResult,
+                                                          unsigned int autoCloseMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -281,7 +296,8 @@ namespace dialogs
     ///                            false  if  unsuccessful   display,   no  user
     ///                            input, or canceled editing.
     ///
-    inline bool ShowAndVerifyNewPassword(std::string& newPassword, unsigned int autoCloseMs = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword,
+                                                          unsigned int autoCloseMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -313,7 +329,10 @@ namespace dialogs
     ///                            unsuccessful input. -1 if no user  input  or
     ///                            canceled editing.
     ///
-    inline int ShowAndVerifyPassword(std::string& password, const std::string& heading, int retries, unsigned int autoCloseMs = 0)
+    inline int ATTRIBUTE_HIDDEN ShowAndVerifyPassword(std::string& password,
+                                                      const std::string& heading,
+                                                      int retries,
+                                                      unsigned int autoCloseMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -347,7 +366,9 @@ namespace dialogs
     ///                            false   if  unsuccessful  display,   no  user
     ///                            input, or canceled editing.
     ///
-    inline bool ShowAndGetFilter(std::string& text, bool searching, unsigned int autoCloseMs = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetFilter(std::string& text,
+                                                  bool searching,
+                                                  unsigned int autoCloseMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -372,7 +393,8 @@ namespace dialogs
     /// @return                    true   if    successful   done,    false   if
     ///                            unsuccessful or keyboard not present.
     ///
-    inline bool SendTextToActiveKeyboard(const std::string& text, bool closeKeyboard = false)
+    inline bool ATTRIBUTE_HIDDEN SendTextToActiveKeyboard(const std::string& text,
+                                                          bool closeKeyboard = false)
     {
       using namespace ::kodi::addon;
       return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->send_text_to_active_keyboard(CAddonBase::m_interface->toKodi->kodiBase,
@@ -387,7 +409,7 @@ namespace dialogs
     ///
     /// @return  true if keyboard present, false if not present
     ///
-    inline bool IsKeyboardActivated()
+    inline bool ATTRIBUTE_HIDDEN IsKeyboardActivated()
     {
       using namespace ::kodi::addon;
       return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->is_keyboard_activated(CAddonBase::m_interface->toKodi->kodiBase);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
index 4a8eccb..bff7683 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
@@ -50,11 +50,13 @@ namespace dialogs
     ///                                false if unsuccessful display, no user
     ///                                input, or canceled editing.
     ///
-    inline bool ShowAndVerifyNewPassword(std::string& newPassword)
+    inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword)
     {
       using namespace ::kodi::addon;
       char* pw = nullptr;
-      bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_new_password(CAddonBase::m_interface->toKodi->kodiBase, &pw);
+      bool ret =
+          CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_new_password(
+              CAddonBase::m_interface->toKodi->kodiBase, &pw);
       if (pw != nullptr)
       {
         newPassword = pw;
@@ -131,7 +133,9 @@ namespace dialogs
     /// }
     /// ~~~~~~~~~~~~~
     ///
-    inline int ShowAndVerifyPassword(const std::string& password, const std::string& heading, int retries)
+    inline int ATTRIBUTE_HIDDEN ShowAndVerifyPassword(const std::string& password,
+                                                      const std::string& heading,
+                                                      int retries)
     {
       using namespace ::kodi::addon;
       return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_verify_password(CAddonBase::m_interface->toKodi->kodiBase,
@@ -152,7 +156,9 @@ namespace dialogs
     ///                                 input. false if unsuccessful display, no
     ///                                 user input, or canceled editing.
     ///
-    inline bool ShowAndVerifyInput(std::string& toVerify, const std::string& heading, bool verifyInput)
+    inline bool ATTRIBUTE_HIDDEN ShowAndVerifyInput(std::string& toVerify,
+                                                    const std::string& heading,
+                                                    bool verifyInput)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -199,7 +205,7 @@ namespace dialogs
     /// printf("Selected time it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndGetTime(tm& time, const std::string& heading)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetTime(tm& time, const std::string& heading)
     {
       using namespace ::kodi::addon;
       return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_time(CAddonBase::m_interface->toKodi->kodiBase, &time, heading.c_str());
@@ -238,7 +244,7 @@ namespace dialogs
     /// printf("Selected date it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndGetDate(tm& date, const std::string& heading)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetDate(tm& date, const std::string& heading)
     {
       using namespace ::kodi::addon;
       return CAddonBase::m_interface->toKodi->kodi_gui->dialogNumeric->show_and_get_date(CAddonBase::m_interface->toKodi->kodiBase, &date, heading.c_str());
@@ -258,7 +264,8 @@ namespace dialogs
     ///                                 display, no user input, or canceled
     ///                                 editing.
     ///
-    inline bool ShowAndGetIPAddress(std::string& ipAddress, const std::string& heading)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetIPAddress(std::string& ipAddress,
+                                                     const std::string& heading)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -304,7 +311,9 @@ namespace dialogs
     ///                  strtoull(number.c_str(), nullptr, 0), bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndGetNumber(std::string& input, const std::string& heading, unsigned int autoCloseTimeoutMs = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetNumber(std::string& input,
+                                                  const std::string& heading,
+                                                  unsigned int autoCloseTimeoutMs = 0)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
@@ -331,7 +340,7 @@ namespace dialogs
     ///                         if unsuccessful display, no user input, or
     ///                         canceled editing.
     ///
-    inline bool ShowAndGetSeconds(std::string& time, const std::string& heading)
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetSeconds(std::string& time, const std::string& heading)
     {
       using namespace ::kodi::addon;
       char* retString = nullptr;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
index a47880f..b9a3a0d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
@@ -52,11 +52,11 @@ namespace dialogs
     /// kodi::gui::dialogs::OK::ShowAndGetInput("Test dialog", "Hello World!\nI'm a call from add-on\n :) :D");
     /// ~~~~~~~~~~~~~
     ///
-    inline void ShowAndGetInput(const std::string& heading, const std::string& text)
+    inline void ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading, const std::string& text)
     {
       using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogOK->show_and_get_input_single_text(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                          heading.c_str(), text.c_str());
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogOK->show_and_get_input_single_text(
+          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str());
     }
     //--------------------------------------------------------------------------
 
@@ -80,7 +80,10 @@ namespace dialogs
     /// kodi::gui::dialogs::OK::ShowAndGetInput("Test dialog", "Hello World!", "I'm a call from add-on", " :) :D");
     /// ~~~~~~~~~~~~~
     ///
-    inline void ShowAndGetInput(const std::string& heading, const std::string& line0, const std::string& line1, const std::string& line2)
+    inline void ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
+                                                 const std::string& line0,
+                                                 const std::string& line1,
+                                                 const std::string& line2)
     {
       using namespace ::kodi::addon;
       CAddonBase::m_interface->toKodi->kodi_gui->dialogOK->show_and_get_input_line_text(CAddonBase::m_interface->toKodi->kodiBase,
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h
index bbaa98d..b1f8cc5 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h
@@ -18,223 +18,237 @@ namespace gui
 namespace dialogs
 {
 
-  //============================================================================
-  ///
-  /// \defgroup cpp_kodi_gui_dialogs_CProgress Dialog Progress
-  /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::dialogs::CProgress }
-  /// **Progress dialog shown in center**
-  ///
-  /// The with \ref DialogProgress.h "#include <kodi/gui/dialogs/Progress.h>"
-  /// given class are basically used to create Kodi's progress dialog with named
-  /// text fields.
-  ///
-  /// **Example:**
-  /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/gui/dialogs/Progress.h>
-  ///
-  /// kodi::gui::dialogs::CProgress *progress = new kodi::gui::dialogs::CProgress;
-  /// progress->SetHeading("Test progress");
-  /// progress->SetLine(1, "line 1");
-  /// progress->SetLine(2, "line 2");
-  /// progress->SetLine(3, "line 3");
-  /// progress->SetCanCancel(true);
-  /// progress->ShowProgressBar(true);
-  /// progress->Open();
-  /// for (unsigned int i = 0; i < 100; i += 10)
-  /// {
-  ///   progress->SetPercentage(i);
-  ///   sleep(1);
-  /// }
-  /// delete progress;
-  /// ~~~~~~~~~~~~~
-  ///
-  class CProgress
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_dialogs_CProgress Dialog Progress
+/// \ingroup cpp_kodi_gui
+/// @brief \cpp_class{ kodi::gui::dialogs::CProgress }
+/// **Progress dialog shown in center**
+///
+/// The with \ref DialogProgress.h "#include <kodi/gui/dialogs/Progress.h>"
+/// given class are basically used to create Kodi's progress dialog with named
+/// text fields.
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/gui/dialogs/Progress.h>
+///
+/// kodi::gui::dialogs::CProgress *progress = new kodi::gui::dialogs::CProgress;
+/// progress->SetHeading("Test progress");
+/// progress->SetLine(1, "line 1");
+/// progress->SetLine(2, "line 2");
+/// progress->SetLine(3, "line 3");
+/// progress->SetCanCancel(true);
+/// progress->ShowProgressBar(true);
+/// progress->Open();
+/// for (unsigned int i = 0; i < 100; i += 10)
+/// {
+///   progress->SetPercentage(i);
+///   sleep(1);
+/// }
+/// delete progress;
+/// ~~~~~~~~~~~~~
+///
+class ATTRIBUTE_HIDDEN CProgress
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief Construct a new dialog
+  ///
+  CProgress()
+  {
+    using namespace ::kodi::addon;
+    m_DialogHandle = CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->new_dialog(
+        CAddonBase::m_interface->toKodi->kodiBase);
+    if (!m_DialogHandle)
+      kodi::Log(ADDON_LOG_FATAL,
+                "kodi::gui::dialogs::CProgress can't create window class from Kodi !!!");
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief Destructor
+  ///
+  ~CProgress()
+  {
+    using namespace ::kodi::addon;
+    if (m_DialogHandle)
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->delete_dialog(
+          CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief To open the dialog
+  ///
+  void Open()
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->open(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief Set the heading title of dialog
+  ///
+  /// @param[in] heading Title string to use
+  ///
+  void SetHeading(const std::string& heading)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_heading(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, heading.c_str());
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief To set the line text field on dialog from 0 - 2
+  ///
+  /// @param[in] iLine Line number
+  /// @param[in] line Text string
+  ///
+  void SetLine(unsigned int iLine, const std::string& line)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_line(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, iLine, line.c_str());
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief To enable and show cancel button on dialog
+  ///
+  /// @param[in] canCancel if true becomes it shown
+  ///
+  void SetCanCancel(bool canCancel)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_can_cancel(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, canCancel);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief To check dialog for clicked cancel button
+  ///
+  /// @return True if canceled
+  ///
+  bool IsCanceled() const
+  {
+    using namespace ::kodi::addon;
+    return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->is_canceled(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief Get the current progress position as percent
+  ///
+  /// @param[in] percentage Position to use from 0 to 100
+  ///
+  void SetPercentage(int percentage)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_percentage(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, percentage);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief To set the current progress position as percent
+  ///
+  /// @return Current Position used from 0 to 100
+  ///
+  int GetPercentage() const
+  {
+    using namespace ::kodi::addon;
+    return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->get_percentage(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief To show or hide progress bar dialog
+  ///
+  /// @param[in] onOff If true becomes it shown
+  ///
+  void ShowProgressBar(bool onOff)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->show_progress_bar(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, onOff);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief Set the maximum position of progress, needed if `SetProgressAdvance(...)` is used
+  ///
+  /// @param[in] max Biggest usable position to use
+  ///
+  void SetProgressMax(int max)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_progress_max(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, max);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief To increase progress bar by defined step size until reach of maximum position
+  ///
+  /// @param[in] steps Step size to increase, default is 1
+  ///
+  void SetProgressAdvance(int steps = 1)
+  {
+    using namespace ::kodi::addon;
+    CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_progress_advance(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, steps);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_dialogs_CProgress
+  /// @brief To check progress was canceled on work
+  ///
+  /// @return True if aborted
+  ///
+  bool Abort()
   {
-  public:
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief Construct a new dialog
-    ///
-    CProgress()
-    {
-      using namespace ::kodi::addon;
-      m_DialogHandle = CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->new_dialog(CAddonBase::m_interface->toKodi->kodiBase);
-      if (!m_DialogHandle)
-        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::dialogs::CProgress can't create window class from Kodi !!!");
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief Destructor
-    ///
-    ~CProgress()
-    {
-      using namespace ::kodi::addon;
-      if (m_DialogHandle)
-        CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->delete_dialog(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief To open the dialog
-    ///
-    void Open()
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->open(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief Set the heading title of dialog
-    ///
-    /// @param[in] heading Title string to use
-    ///
-    void SetHeading(const std::string& heading)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_heading(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, heading.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief To set the line text field on dialog from 0 - 2
-    ///
-    /// @param[in] iLine Line number
-    /// @param[in] line Text string
-    ///
-    void SetLine(unsigned int iLine, const std::string& line)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_line(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, iLine, line.c_str());
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief To enable and show cancel button on dialog
-    ///
-    /// @param[in] canCancel if true becomes it shown
-    ///
-    void SetCanCancel(bool canCancel)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_can_cancel(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, canCancel);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief To check dialog for clicked cancel button
-    ///
-    /// @return True if canceled
-    ///
-    bool IsCanceled() const
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->is_canceled(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief Get the current progress position as percent
-    ///
-    /// @param[in] percentage Position to use from 0 to 100
-    ///
-    void SetPercentage(int percentage)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_percentage(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, percentage);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief To set the current progress position as percent
-    ///
-    /// @return Current Position used from 0 to 100
-    ///
-    int GetPercentage() const
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->get_percentage(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief To show or hide progress bar dialog
-    ///
-    /// @param[in] onOff If true becomes it shown
-    ///
-    void ShowProgressBar(bool onOff)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->show_progress_bar(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, onOff);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief Set the maximum position of progress, needed if `SetProgressAdvance(...)` is used
-    ///
-    /// @param[in] max Biggest usable position to use
-    ///
-    void SetProgressMax(int max)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_progress_max(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, max);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief To increase progress bar by defined step size until reach of maximum position
-    ///
-    /// @param[in] steps Step size to increase, default is 1
-    ///
-    void SetProgressAdvance(int steps=1)
-    {
-      using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->set_progress_advance(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle, steps);
-    }
-    //--------------------------------------------------------------------------
-
-    //==========================================================================
-    ///
-    /// \ingroup cpp_kodi_gui_dialogs_CProgress
-    /// @brief To check progress was canceled on work
-    ///
-    /// @return True if aborted
-    ///
-    bool Abort()
-    {
-      using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->abort(CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
-    }
-    //--------------------------------------------------------------------------
-
-  private:
-    void* m_DialogHandle;
-  };
+    using namespace ::kodi::addon;
+    return CAddonBase::m_interface->toKodi->kodi_gui->dialogProgress->abort(
+        CAddonBase::m_interface->toKodi->kodiBase, m_DialogHandle);
+  }
+  //--------------------------------------------------------------------------
+
+private:
+  void* m_DialogHandle;
+};
 
 } /* namespace dialogs */
 } /* namespace gui */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
index ba0db1d..39a98fe 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
@@ -104,16 +104,21 @@ namespace dialogs
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::string>& entries, int selected = -1, unsigned int autoclose = 0)
+    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                     const std::vector<std::string>& entries,
+                                     int selected = -1,
+                                     unsigned int autoclose = 0)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
-      const char** cEntries = (const char**)malloc(size*sizeof(const char**));
+      unsigned int size = static_cast<unsigned int>(entries.size());
+      const char** cEntries = (const char**)malloc(size * sizeof(const char**));
       for (unsigned int i = 0; i < size; ++i)
       {
         cEntries[i] = entries[i].c_str();
       }
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected, autoclose);
+      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open(
+          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected,
+          autoclose);
       free(cEntries);
       return ret;
     }
@@ -159,10 +164,13 @@ namespace dialogs
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, std::vector<SSelectionEntry>& entries, int selected = -1, unsigned int autoclose = 0)
+    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                     std::vector<SSelectionEntry>& entries,
+                                     int selected = -1,
+                                     unsigned int autoclose = 0)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
+      unsigned int size = static_cast<unsigned int>(entries.size());
       const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char*)));
       for (unsigned int i = 0; i < size; ++i)
       {
@@ -224,10 +232,12 @@ namespace dialogs
     /// }
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowMultiSelect(const std::string& heading, std::vector<SSelectionEntry>& entries, int autoclose = 0)
+    inline bool ATTRIBUTE_HIDDEN ShowMultiSelect(const std::string& heading,
+                                                 std::vector<SSelectionEntry>& entries,
+                                                 int autoclose = 0)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
+      unsigned int size = static_cast<unsigned int>(entries.size());
       const char** cEntryIDs = static_cast<const char**>(malloc(size*sizeof(const char*)));
       const char** cEntryNames = static_cast<const char**>(malloc(size*sizeof(const char*)));
       bool* cEntriesSelected = static_cast<bool*>(malloc(size*sizeof(bool)));
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
index da38f7c..5c81837 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
@@ -93,10 +93,11 @@ namespace dialogs
     ///  "interspersed renderings from classical composers.\n");
     /// ~~~~~~~~~~~~~
     ///
-    inline void Show(const std::string& heading, const std::string& text)
+    inline void ATTRIBUTE_HIDDEN Show(const std::string& heading, const std::string& text)
     {
       using namespace ::kodi::addon;
-      CAddonBase::m_interface->toKodi->kodi_gui->dialogTextViewer->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str());
+      CAddonBase::m_interface->toKodi->kodi_gui->dialogTextViewer->open(
+          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str());
     }
     //--------------------------------------------------------------------------
   };
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
index c694bf5..67c2fc4 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
@@ -73,14 +73,16 @@ namespace dialogs
     ///          canceled ? "canceled" : "not canceled");
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndGetInput(const std::string& heading, const std::string& text,
-                                bool& canceled, const std::string& noLabel = "",
-                                const std::string& yesLabel = "")
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
+                                                 const std::string& text,
+                                                 bool& canceled,
+                                                 const std::string& noLabel = "",
+                                                 const std::string& yesLabel = "")
     {
       using namespace ::kodi::addon;
-      return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_single_text(CAddonBase::m_interface->toKodi->kodiBase,
-                                                                                                    heading.c_str(), text.c_str(), &canceled,
-                                                                                                    noLabel.c_str(), yesLabel.c_str());
+      return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_single_text(
+          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), text.c_str(), &canceled,
+          noLabel.c_str(), yesLabel.c_str());
     }
     //--------------------------------------------------------------------------
 
@@ -115,9 +117,12 @@ namespace dialogs
     ///          ret ? "yes" : "no");
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndGetInput(const std::string& heading, const std::string& line0, const std::string& line1,
-                                const std::string& line2, const std::string& noLabel = "",
-                                const std::string& yesLabel = "")
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
+                                                 const std::string& line0,
+                                                 const std::string& line1,
+                                                 const std::string& line2,
+                                                 const std::string& noLabel = "",
+                                                 const std::string& yesLabel = "")
     {
       using namespace ::kodi::addon;
       return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_line_text(CAddonBase::m_interface->toKodi->kodiBase,
@@ -161,9 +166,13 @@ namespace dialogs
     ///          canceled ? "canceled" : "not canceled");
     /// ~~~~~~~~~~~~~
     ///
-    inline bool ShowAndGetInput(const std::string& heading, const std::string& line0, const std::string& line1,
-                                const std::string& line2, bool& canceled, const std::string& noLabel = "",
-                                const std::string& yesLabel = "")
+    inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(const std::string& heading,
+                                                 const std::string& line0,
+                                                 const std::string& line1,
+                                                 const std::string& line2,
+                                                 bool& canceled,
+                                                 const std::string& noLabel = "",
+                                                 const std::string& yesLabel = "")
     {
       using namespace ::kodi::addon;
       return CAddonBase::m_interface->toKodi->kodi_gui->dialogYesNo->show_and_get_input_line_button_text(CAddonBase::m_interface->toKodi->kodiBase,
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/CMakeLists.txt
new file mode 100644
index 0000000..a9ab70c
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(HEADERS GL.h
+            GLonDX.h
+            Shader.h)
+
+if(NOT ENABLE_STATIC_LIBS)
+  core_add_library(addons_kodi-addon-dev-kit_include_kodi_gui_gl)
+endif()
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GL.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GL.h
new file mode 100644
index 0000000..943c7d0
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GL.h
@@ -0,0 +1,111 @@
+/*
+ *  Copyright (C) 2005-2019 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
+
+//==============================================================================
+///
+/// \defgroup cpp_kodi_gui_gl OpenGL helpers
+/// \ingroup cpp_kodi_gui
+/// \brief Auxiliary functions for Open GL
+///
+/// This group includes help for definitions, functions, and classes for
+/// OpenGL.
+///
+/// To use OpenGL for your system, add the \ref GL.h "#include <kodi/gui/gl/GL.h>".
+///
+///
+///-----------------------------------------------------------------------------
+///
+/// The \ref HAS_GL is declared if Open GL is required and \ref HAS_GLES if Open GL 
+/// Embedded Systems (ES) is required, with ES the version is additionally given
+/// in the definition, this can be "2" or "3".
+///
+///
+///-----------------------------------------------------------------------------
+///
+/// Following \ref GL_TYPE_STRING define can be used, for example, to manage 
+/// different folders for GL and GLES and make the selection easier.
+/// This are on OpenGL <b>"GL"</b> and on Open GL|ES <b>"GLES"</b>.
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~~~~~{.cpp}
+/// kodi::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/frag.glsl");
+/// ~~~~~~~~~~~~~~~~~
+///
+///
+///----------------------------------------------------------------------------
+///
+/// In addition, \ref BUFFER_OFFSET is declared in it which can be used to give an 
+/// offset on the array to GL.
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~~~~~{.cpp}
+/// const struct PackedVertex {
+///   float position[3]; // Position x, y, z
+///   float color[4]; // Color r, g, b, a
+/// } vertices[3] = {
+///   { { -0.5f, -0.5f, 0.0f }, { 1.0f, 0.0f, 0.0f, 1.0f } },
+///   { {  0.5f, -0.5f, 0.0f }, { 0.0f, 1.0f, 0.0f, 1.0f } },
+///   { {  0.0f,  0.5f, 0.0f }, { 0.0f, 0.0f, 1.0f, 1.0f } }
+/// };
+///
+/// glVertexAttribPointer(m_aPosition, 3, GL_FLOAT, GL_FALSE, sizeof(PackedVertex), BUFFER_OFFSET(offsetof(PackedVertex, position)));
+/// glEnableVertexAttribArray(m_aPosition);
+///
+/// glVertexAttribPointer(m_aColor, 4, GL_FLOAT, GL_FALSE, sizeof(PackedVertex), BUFFER_OFFSET(offsetof(PackedVertex, color)));
+/// glEnableVertexAttribArray(m_aColor);
+/// ~~~~~~~~~~~~~~~~~
+
+#if HAS_GL
+  #define GL_TYPE_STRING "GL"
+  // always define GL_GLEXT_PROTOTYPES before include gl headers
+  #if !defined(GL_GLEXT_PROTOTYPES)
+    #define GL_GLEXT_PROTOTYPES
+  #endif
+  #if defined(TARGET_LINUX)
+    #include <GL/gl.h>
+    #include <GL/glext.h>
+  #elif defined(TARGET_FREEBSD)
+    #include <GL/gl.h>
+  #elif defined(TARGET_DARWIN)
+    #include <OpenGL/gl3.h>
+    #include <OpenGL/gl3ext.h>
+  #elif defined(WIN32)
+    #error Use of GL under Windows is not possible
+  #endif
+#elif HAS_GLES >= 2
+  #define GL_TYPE_STRING "GLES"
+  #if defined(WIN32)
+    #if defined(HAS_ANGLE)
+      #include <angle_gl.h>
+    #else
+      #error Use of GLES only be available under Windows by the use of angle
+    #endif
+  #elif defined(TARGET_DARWIN)
+    #if HAS_GLES == 3
+      #include <OpenGLES/ES3/gl.h>
+      #include <OpenGLES/ES3/glext.h>
+    #else
+      #include <OpenGLES/ES2/gl.h>
+      #include <OpenGLES/ES2/glext.h>
+    #endif
+  #else
+    #if HAS_GLES == 3
+      #include <GLES3/gl3.h>
+      #include <GLES3/gl3ext.h>
+    #else
+      #include <GLES2/gl2.h>
+      #include <GLES2/gl2ext.h>
+    #endif
+  #endif
+#endif
+
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GLonDX.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GLonDX.h
new file mode 100644
index 0000000..7a6a0a1
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/GLonDX.h
@@ -0,0 +1,369 @@
+/*
+ *  Copyright (C) 2005-2019 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 <angle_gl.h>
+#include <d3d11.h>
+#include <d3dcompiler.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <kodi/AddonBase.h>
+#include <kodi/gui/General.h>
+#include <wrl/client.h>
+
+#pragma comment( lib, "d3dcompiler.lib" )
+#ifndef GL_CLIENT_VERSION
+#define GL_CLIENT_VERSION 3
+#endif
+
+namespace kodi
+{
+namespace gui
+{
+namespace gl
+{
+
+class ATTRIBUTE_HIDDEN CGLonDX : public kodi::gui::IRenderHelper
+{
+public:
+  explicit CGLonDX() : m_pContext(reinterpret_cast<ID3D11DeviceContext*>(kodi::gui::GetHWContext())) {}
+  ~CGLonDX() override { destruct(); }
+
+  bool Init() override
+  {
+    EGLint egl_display_attrs[] =
+    {
+      EGL_PLATFORM_ANGLE_TYPE_ANGLE, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE,
+      EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, EGL_DONT_CARE,
+      EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, EGL_DONT_CARE,
+      EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE, EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE,
+      EGL_NONE
+    };
+    EGLint egl_config_attrs[] =
+    {
+      EGL_RED_SIZE, 8, EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE, 8, EGL_ALPHA_SIZE, 8,
+      EGL_BIND_TO_TEXTURE_RGBA, EGL_TRUE,
+      EGL_RENDERABLE_TYPE, GL_CLIENT_VERSION == 3 ? EGL_OPENGL_ES3_BIT : EGL_OPENGL_ES2_BIT,
+      EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+      EGL_NONE
+    };
+    EGLint egl_context_attrs[] =
+    {
+      EGL_CONTEXT_CLIENT_VERSION, GL_CLIENT_VERSION, EGL_NONE
+    };
+
+    m_eglDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, EGL_DEFAULT_DISPLAY, egl_display_attrs);
+    if (m_eglDisplay == EGL_NO_DISPLAY)
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to get EGL display (%s)", eglGetErrorString());
+      return false;
+    }
+
+    if (eglInitialize(m_eglDisplay, nullptr, nullptr) != EGL_TRUE)
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to init EGL display (%s)", eglGetErrorString());
+      return false;
+    }
+
+    EGLint numConfigs = 0;
+    if (eglChooseConfig(m_eglDisplay, egl_config_attrs, &m_eglConfig, 1, &numConfigs) != EGL_TRUE || numConfigs == 0)
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to get EGL config (%s)", eglGetErrorString());
+      return false;
+    }
+
+    m_eglContext = eglCreateContext(m_eglDisplay, m_eglConfig, nullptr, egl_context_attrs);
+    if (m_eglContext == EGL_NO_CONTEXT)
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to create EGL context (%s)", eglGetErrorString());
+      return false;
+    }
+
+    if (!createD3DResources())
+      return false;
+
+    if (eglMakeCurrent(m_eglDisplay, m_eglBuffer, m_eglBuffer, m_eglContext) != EGL_TRUE)
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to make current EGL (%s)", eglGetErrorString());
+      return false;
+    }
+    return true;
+  }
+
+  void CheckGL(ID3D11DeviceContext* device)
+  {
+    if (m_pContext != device)
+    {
+      m_pSRView = nullptr;
+      m_pVShader = nullptr;
+      m_pPShader = nullptr;
+      m_pContext = device;
+
+      if (m_eglBuffer != EGL_NO_SURFACE)
+      {
+        eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        eglDestroySurface(m_eglDisplay, m_eglBuffer);
+        m_eglBuffer = EGL_NO_SURFACE;
+      }
+
+      // create new resources
+      if (!createD3DResources())
+        return;
+
+      eglMakeCurrent(m_eglDisplay, m_eglBuffer, m_eglBuffer, m_eglContext);
+    }
+  }
+
+  void Begin() override
+  {
+    // confirm on begin D3D context is correct
+    CheckGL(reinterpret_cast<ID3D11DeviceContext*>(kodi::gui::GetHWContext()));
+
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+    glClear(GL_COLOR_BUFFER_BIT);
+  }
+
+  void End() override
+  {
+    glFlush();
+
+    // set our primitive shaders
+    m_pContext->VSSetShader(m_pVShader.Get(), nullptr, 0);
+    m_pContext->PSSetShader(m_pPShader.Get(), nullptr, 0);
+    m_pContext->PSSetShaderResources(0, 1, m_pSRView.GetAddressOf());
+    // draw texture
+    m_pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
+    m_pContext->IASetVertexBuffers(0, 0, nullptr, nullptr, nullptr);
+    m_pContext->IASetInputLayout(nullptr);
+    m_pContext->Draw(4, 0);
+    // unset shaders
+    m_pContext->PSSetShader(nullptr, nullptr, 0);
+    m_pContext->VSSetShader(nullptr, nullptr, 0);
+    // unbind our view
+    ID3D11ShaderResourceView* views[1] = {};
+    m_pContext->PSSetShaderResources(0, 1, views);
+  }
+
+private:
+  enum ShaderType
+  {
+    VERTEX_SHADER,
+    PIXEL_SHADER
+  };
+
+  bool createD3DResources()
+  {
+    HANDLE sharedHandle;
+    Microsoft::WRL::ComPtr<ID3D11Device> pDevice;
+    Microsoft::WRL::ComPtr<ID3D11RenderTargetView> pRTView;
+    Microsoft::WRL::ComPtr<ID3D11Resource> pRTResource;
+    Microsoft::WRL::ComPtr<ID3D11Texture2D> pRTTexture;
+    Microsoft::WRL::ComPtr<ID3D11Texture2D> pOffScreenTexture;
+    Microsoft::WRL::ComPtr<IDXGIResource>  dxgiResource;
+
+    m_pContext->GetDevice(&pDevice);
+    m_pContext->OMGetRenderTargets(1, &pRTView, nullptr);
+    if (!pRTView)
+      return false;
+
+    pRTView->GetResource(&pRTResource);
+    if (FAILED(pRTResource.As(&pRTTexture)))
+      return false;
+
+    D3D11_TEXTURE2D_DESC texDesc;
+    pRTTexture->GetDesc(&texDesc);
+    texDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+    texDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET;
+    texDesc.MiscFlags = D3D11_RESOURCE_MISC_SHARED;
+    if (FAILED(pDevice->CreateTexture2D(&texDesc, nullptr, &pOffScreenTexture)))
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to create intermediate texture");
+      return false;
+    }
+
+    CD3D11_SHADER_RESOURCE_VIEW_DESC srvDesc(pOffScreenTexture.Get(), D3D11_SRV_DIMENSION_TEXTURE2D);
+    if (FAILED(pDevice->CreateShaderResourceView(pOffScreenTexture.Get(), &srvDesc, &m_pSRView)))
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to create shader view");
+      return false;
+    }
+
+    if (FAILED(pOffScreenTexture.As(&dxgiResource)) ||
+        FAILED(dxgiResource->GetSharedHandle(&sharedHandle)))
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable get shared handle for texture");
+      return false;
+    }
+
+    // initiate simple shaders
+    if (FAILED(d3dCreateShader(VERTEX_SHADER, vs_out_shader_text, &m_pVShader)))
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to create vertex shader view");
+      return false;
+    }
+
+    if (FAILED(d3dCreateShader(PIXEL_SHADER, ps_out_shader_text, &m_pPShader)))
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to create pixel shader view");
+      return false;
+    }
+
+    // create EGL buffer from D3D shared texture
+    EGLint egl_buffer_attrs[] =
+    {
+      EGL_WIDTH, static_cast<EGLint>(texDesc.Width),
+      EGL_HEIGHT, static_cast<EGLint>(texDesc.Height),
+      EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
+      EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA,
+      EGL_NONE
+    };
+
+    m_eglBuffer = eglCreatePbufferFromClientBuffer(m_eglDisplay,
+      EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
+      sharedHandle, m_eglConfig, egl_buffer_attrs);
+
+    if (m_eglBuffer == EGL_NO_SURFACE)
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to create EGL buffer (%s)", eglGetErrorString());
+      return false;
+    }
+    return true;
+  }
+
+  HRESULT d3dCreateShader(ShaderType shaderType, const std::string& source, IUnknown** ppShader) const
+  {
+    Microsoft::WRL::ComPtr<ID3DBlob> pBlob;
+    Microsoft::WRL::ComPtr<ID3DBlob> pErrors;
+
+    auto hr = D3DCompile(source.c_str(), source.length(), nullptr, nullptr, nullptr, "main",
+      shaderType == PIXEL_SHADER ? "ps_4_0" : "vs_4_0", 0, 0, &pBlob, &pErrors);
+
+    if (SUCCEEDED(hr))
+    {
+      Microsoft::WRL::ComPtr<ID3D11Device> pDevice;
+      m_pContext->GetDevice(&pDevice);
+
+      if (shaderType == PIXEL_SHADER)
+      {
+        hr = pDevice->CreatePixelShader(pBlob->GetBufferPointer(), pBlob->GetBufferSize(), nullptr,
+          reinterpret_cast<ID3D11PixelShader**>(ppShader));
+      }
+      else
+      {
+        hr = pDevice->CreateVertexShader(pBlob->GetBufferPointer(), pBlob->GetBufferSize(), nullptr,
+          reinterpret_cast<ID3D11VertexShader**>(ppShader));
+      }
+
+      if (FAILED(hr))
+      {
+        Log(ADDON_LOG_ERROR, "GLonDX: unable to create %s shader",
+          shaderType == PIXEL_SHADER ? "pixel" : "vertex");
+      }
+    }
+    else
+    {
+      Log(ADDON_LOG_ERROR, "GLonDX: unable to compile shader (%s)", pErrors->GetBufferPointer());
+    }
+    return hr;
+  }
+
+  static const char* eglGetErrorString()
+  {
+#define CASE_STR( value ) case value: return #value
+    switch (eglGetError())
+    {
+      CASE_STR(EGL_SUCCESS);
+      CASE_STR(EGL_NOT_INITIALIZED);
+      CASE_STR(EGL_BAD_ACCESS);
+      CASE_STR(EGL_BAD_ALLOC);
+      CASE_STR(EGL_BAD_ATTRIBUTE);
+      CASE_STR(EGL_BAD_CONTEXT);
+      CASE_STR(EGL_BAD_CONFIG);
+      CASE_STR(EGL_BAD_CURRENT_SURFACE);
+      CASE_STR(EGL_BAD_DISPLAY);
+      CASE_STR(EGL_BAD_SURFACE);
+      CASE_STR(EGL_BAD_MATCH);
+      CASE_STR(EGL_BAD_PARAMETER);
+      CASE_STR(EGL_BAD_NATIVE_PIXMAP);
+      CASE_STR(EGL_BAD_NATIVE_WINDOW);
+      CASE_STR(EGL_CONTEXT_LOST);
+    default:
+      return "Unknown";
+    }
+#undef CASE_STR
+  }
+
+  void destruct()
+  {
+    if (m_eglDisplay != EGL_NO_DISPLAY)
+    {
+      eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+      if (m_eglBuffer != EGL_NO_SURFACE)
+      {
+        eglDestroySurface(m_eglDisplay, m_eglBuffer);
+        m_eglBuffer = EGL_NO_SURFACE;
+      }
+
+      if (m_eglContext != EGL_NO_CONTEXT)
+      {
+        eglDestroyContext(m_eglDisplay, m_eglContext);
+        m_eglContext = EGL_NO_CONTEXT;
+      }
+
+      eglTerminate(m_eglDisplay);
+      m_eglDisplay = EGL_NO_DISPLAY;
+    }
+
+    m_pSRView = nullptr;
+    m_pVShader = nullptr;
+    m_pPShader = nullptr;
+    m_pContext = nullptr;
+  }
+
+  EGLConfig m_eglConfig = EGL_NO_CONFIG_KHR;
+  EGLDisplay m_eglDisplay = EGL_NO_DISPLAY;
+  EGLContext m_eglContext = EGL_NO_CONTEXT;
+  EGLSurface m_eglBuffer = EGL_NO_SURFACE;
+
+  ID3D11DeviceContext* m_pContext = nullptr; // don't hold context
+  Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> m_pSRView = nullptr;
+  Microsoft::WRL::ComPtr<ID3D11VertexShader> m_pVShader = nullptr;
+  Microsoft::WRL::ComPtr<ID3D11PixelShader> m_pPShader = nullptr;
+
+#define TO_STRING(...) #__VA_ARGS__
+  std::string vs_out_shader_text = TO_STRING(
+  void main(uint id : SV_VertexId, out float2 tex : TEXCOORD0, out float4 pos : SV_POSITION)
+  {
+    tex = float2(id % 2, (id % 4) >> 1);
+    pos = float4((tex.x - 0.5f) * 2, -(tex.y - 0.5f) * 2, 0, 1);
+  });
+
+  std::string ps_out_shader_text = TO_STRING(
+  Texture2D texMain : register(t0);
+  SamplerState Sampler
+  {
+    Filter = MIN_MAG_MIP_LINEAR;
+    AddressU = CLAMP;
+    AddressV = CLAMP;
+    Comparison = NEVER;
+  };
+
+  float4 main(in float2 tex : TEXCOORD0) : SV_TARGET
+  {
+    return texMain.Sample(Sampler, tex);
+  });
+#undef TO_STRING
+}; /* class CGLonDX */
+
+} /* namespace gl */
+
+using CRenderHelper = gl::CGLonDX;
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/Shader.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/Shader.h
new file mode 100644
index 0000000..209f274
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/gl/Shader.h
@@ -0,0 +1,594 @@
+/*
+ *  Copyright (C) 2005-2019 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 "GL.h"
+
+#include <stdio.h>
+#include <vector>
+#include <string>
+
+#include <kodi/AddonBase.h>
+#include <kodi/Filesystem.h>
+
+#define LOG_SIZE 1024
+#define GLchar char
+
+namespace kodi
+{
+namespace gui
+{
+namespace gl
+{
+
+//========================================================================
+/// CShader - base class
+class ATTRIBUTE_HIDDEN CShader
+{
+public:
+  CShader() = default;
+  virtual ~CShader() = default;
+  virtual bool Compile(const std::string& extraBegin = "",
+                       const std::string& extraEnd = "") = 0;
+  virtual void Free() = 0;
+  virtual GLuint Handle() = 0;
+
+  bool LoadSource(const std::string& file)
+  {
+    char buffer[16384];
+
+    kodi::vfs::CFile source;
+    if (!source.OpenFile(file))
+    {
+      kodi::Log(ADDON_LOG_ERROR, "CShader::%s: Failed to open file '%s'", __FUNCTION__, file.c_str());
+      return false;
+    }
+    size_t len = source.Read(buffer, sizeof(buffer));
+    m_source.assign(buffer);
+    m_source[len] = 0;
+    source.Close();
+    return true;
+  }
+
+  bool OK() const { return m_compiled; }
+
+protected:
+  std::string m_source;
+  std::string m_lastLog;
+  bool m_compiled = false;
+};
+//------------------------------------------------------------------------
+
+//========================================================================
+/// CVertexShader
+class ATTRIBUTE_HIDDEN CVertexShader : public CShader
+{
+public:
+  CVertexShader() = default;
+  ~CVertexShader() override { Free(); }
+
+  void Free() override
+  {
+    if (m_vertexShader)
+      glDeleteShader(m_vertexShader);
+    m_vertexShader = 0;
+  }
+
+  bool Compile(const std::string& extraBegin = "",
+               const std::string& extraEnd = "") override
+  {
+    GLint params[4];
+
+    Free();
+
+    m_vertexShader = glCreateShader(GL_VERTEX_SHADER);
+
+    GLsizei count = 0;
+    const char *sources[3];
+    if (!extraBegin.empty())
+      sources[count++] = extraBegin.c_str();
+    if (!m_source.empty())
+      sources[count++] = m_source.c_str();
+    if (!extraEnd.empty())
+      sources[count++] = extraEnd.c_str();
+
+    glShaderSource(m_vertexShader, count, sources, nullptr);
+    glCompileShader(m_vertexShader);
+    glGetShaderiv(m_vertexShader, GL_COMPILE_STATUS, params);
+    if (params[0] != GL_TRUE)
+    {
+      GLchar log[LOG_SIZE];
+      glGetShaderInfoLog(m_vertexShader, LOG_SIZE, nullptr, log);
+      kodi::Log(ADDON_LOG_ERROR, "CVertexShader::%s: %s", __FUNCTION__, log);
+      fprintf(stderr, "CVertexShader::%s: %s\n", __FUNCTION__, log);
+      m_lastLog = log;
+      m_compiled = false;
+    }
+    else
+    {
+      GLchar log[LOG_SIZE];
+      glGetShaderInfoLog(m_vertexShader, LOG_SIZE, nullptr, log);
+      m_lastLog = log;
+      m_compiled = true;
+    }
+    return m_compiled;
+  }
+
+  GLuint Handle() override { return m_vertexShader; }
+
+protected:
+  GLuint m_vertexShader = 0;
+};
+//------------------------------------------------------------------------
+
+//========================================================================
+/// CPixelShader
+class ATTRIBUTE_HIDDEN CPixelShader : public CShader
+{
+public:
+  CPixelShader() = default;
+  ~CPixelShader() { Free(); }
+  void Free() override
+  {
+    if (m_pixelShader)
+      glDeleteShader(m_pixelShader);
+    m_pixelShader = 0;
+  }
+
+  bool Compile(const std::string& extraBegin = "",
+               const std::string& extraEnd = "") override
+  {
+    GLint params[4];
+
+    Free();
+
+    m_pixelShader = glCreateShader(GL_FRAGMENT_SHADER);
+
+    GLsizei count = 0;
+    const char *sources[3];
+    if (!extraBegin.empty())
+      sources[count++] = extraBegin.c_str();
+    if (!m_source.empty())
+      sources[count++] = m_source.c_str();
+    if (!extraEnd.empty())
+      sources[count++] = extraEnd.c_str();
+
+    glShaderSource(m_pixelShader, count, sources, 0);
+    glCompileShader(m_pixelShader);
+    glGetShaderiv(m_pixelShader, GL_COMPILE_STATUS, params);
+    if (params[0] != GL_TRUE)
+    {
+      GLchar log[LOG_SIZE];
+      glGetShaderInfoLog(m_pixelShader, LOG_SIZE, nullptr, log);
+      kodi::Log(ADDON_LOG_ERROR, "CPixelShader::%s: %s", __FUNCTION__, log);
+      fprintf(stderr, "CPixelShader::%s: %s\n", __FUNCTION__, log);
+      m_lastLog = log;
+      m_compiled = false;
+    }
+    else
+    {
+      GLchar log[LOG_SIZE];
+      glGetShaderInfoLog(m_pixelShader, LOG_SIZE, nullptr, log);
+      m_lastLog = log;
+      m_compiled = true;
+    }
+    return m_compiled;
+  }
+
+  GLuint Handle() override { return m_pixelShader; }
+
+protected:
+  GLuint m_pixelShader = 0;
+};
+//------------------------------------------------------------------------
+
+//============================================================================
+///
+/// \defgroup cpp_kodi_gui_gl_CShaderProgram GL Shader Program
+/// \ingroup cpp_kodi_gui_gl
+/// @brief \cpp_class{ kodi::gui::gl::CShaderProgram }
+/// **Class to manage an OpenGL shader program**
+///
+/// With this class the used GL shader code can be defined on the GPU and
+/// its variables can be managed between CPU and GPU.
+///
+/// It has the header \ref Shader.h "#include <kodi/gui/gl/Shader.h>"
+/// be included to enjoy it.
+///
+/// ----------------------------------------------------------------------------
+///
+/// <b>Example:</b>
+///
+/// ~~~~~~~~~~~~~{.cpp}
+///
+/// #include <kodi/gui/gl/Shader.h>
+/// ...
+///
+/// class ATTRIBUTE_HIDDEN CExample
+///   : ...,
+///     public kodi::gui::gl::CShaderProgram
+/// {
+/// public:
+///   CExample() = default;
+///
+///   bool Start();
+///   void Render();
+///
+///   // override functions for kodi::gui::gl::CShaderProgram
+///   void OnCompiledAndLinked() override;
+///   bool OnEnabled() override;
+///
+/// private:
+///   ...
+///   GLint m_aPosition = -1;
+///   GLint m_aColor = -1;
+/// };
+///
+/// bool CExample::Start()
+/// {
+///   // Define shaders and load
+///   std::string fraqShader = kodi::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/glsl.frag");
+///   std::string vertShader = kodi::GetAddonPath("resources/shaders/" GL_TYPE_STRING "/glsl.vert");
+///   if (!LoadShaderFiles(vertShader, fraqShader) || !CompileAndLink())
+///     return false;
+///
+///   ...
+///   return true;
+/// }
+///
+/// ...
+///
+/// void CExample::Render()
+/// {
+///   ...
+///
+///   EnableShader();
+///   ...
+///   DO WORK
+///   ...
+///   DisableShader();
+/// }
+///
+/// void CExample::OnCompiledAndLinked()
+/// {
+///   ...
+///   DO YOUR WORK HERE FOR WHAT IS ONE TIME REQUIRED DURING COMPILE OF SHADER, E.G.:
+///
+///   m_aPosition = glGetAttribLocation(ProgramHandle(), "a_position");
+///   m_aColor = glGetAttribLocation(ProgramHandle(), "a_color");
+/// }
+///
+/// bool OnEnabled() override
+/// {
+///   ...
+///   DO YOUR WORK HERE FOR WHAT REQUIRED DURING ENABLE OF SHADER
+///   ...
+///   return true;
+/// }
+///
+/// ADDONCREATOR(CExample);
+/// ~~~~~~~~~~~~~
+///
+
+//========================================================================
+/// CShaderProgram
+class ATTRIBUTE_HIDDEN CShaderProgram
+{
+public:
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief Construct a new shader
+  ///
+  /// Load must be done later with \ref LoadShaderFiles.
+  ///
+  CShaderProgram() = default;
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief Construct a new shader and load defined shader files
+  ///
+  /// @param[in] vert Path to used GL vertext shader
+  /// @param[in] frag Path to used GL fragment shader
+  ///
+  CShaderProgram(const std::string& vert, const std::string& frag)
+  {
+    LoadShaderFiles(vert, frag);
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief Destructor
+  ///
+  virtual ~CShaderProgram()
+  {
+    ShaderFree();
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief To load manually the needed shader files
+  ///
+  /// @param[in] vert Path to used GL vertext shader
+  /// @param[in] frag Path to used GL fragment shader
+  ///
+  ///
+  /// @note The use of the files is optional, but it must either be passed over
+  /// here or via \ref CompileAndLink, or both of the source code.
+  ///
+  bool LoadShaderFiles(const std::string& vert, const std::string& frag)
+  {
+    if (!kodi::vfs::FileExists(vert) || !m_pVP.LoadSource(vert))
+    {
+      kodi::Log(ADDON_LOG_ERROR, "%s: Failed to load '%s'", __func__, vert.c_str());
+      return false;
+    }
+
+    if (!kodi::vfs::FileExists(frag) || !m_pFP.LoadSource(frag))
+    {
+      kodi::Log(ADDON_LOG_ERROR, "%s: Failed to load '%s'", __func__, frag.c_str());
+      return false;
+    }
+
+    return true;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief To compile and link the shader to the GL interface
+  ///
+  /// Optionally, additional source code can be transferred here, or it can be
+  /// used independently without any files
+  ///
+  /// @param[in] vertexExtraBegin   [opt] To additionally add vextex source
+  ///                               code to the beginning of the loaded file
+  ///                               source code
+  /// @param[in] vertexExtraEnd     [opt] To additionally add vextex source
+  ///                               code to the end of the loaded file
+  ///                               source code
+  /// @param[in] fragmentExtraBegin [opt] To additionally add fragment source
+  ///                               code to the beginning of the loaded file
+  ///                               source code
+  /// @param[in] fragmentExtraEnd   [opt] To additionally add fragment source
+  ///                               code to the end of the loaded file
+  ///                               source code
+  /// @return                       true if compile was successed
+  ///
+  ///
+  /// @note In the case of a compile error, it will be written once into the Kodi
+  /// log and in addition to the console output to quickly detect the errors when
+  /// writing the damage.
+  ///
+  ///
+  bool CompileAndLink(const std::string& vertexExtraBegin = "",
+                      const std::string& vertexExtraEnd = "",
+                      const std::string& fragmentExtraBegin = "",
+                      const std::string& fragmentExtraEnd = "")
+  {
+    GLint params[4];
+
+    // free resources
+    ShaderFree();
+    m_ok = false;
+
+    // compiled vertex shader
+    if (!m_pVP.Compile(vertexExtraBegin, vertexExtraEnd))
+    {
+      kodi::Log(ADDON_LOG_ERROR, "GL: Error compiling vertex shader");
+      return false;
+    }
+
+    // compile pixel shader
+    if (!m_pFP.Compile(fragmentExtraBegin, fragmentExtraEnd))
+    {
+      m_pVP.Free();
+      kodi::Log(ADDON_LOG_ERROR, "GL: Error compiling fragment shader");
+      return false;
+    }
+
+    // create program object
+    m_shaderProgram = glCreateProgram();
+    if (!m_shaderProgram)
+    {
+      kodi::Log(ADDON_LOG_ERROR, "CShaderProgram::%s: Failed to create GL program", __FUNCTION__);
+      ShaderFree();
+      return false;
+    }
+
+    // attach the vertex shader
+    glAttachShader(m_shaderProgram, m_pVP.Handle());
+    glAttachShader(m_shaderProgram, m_pFP.Handle());
+
+    // link the program
+    glLinkProgram(m_shaderProgram);
+    glGetProgramiv(m_shaderProgram, GL_LINK_STATUS, params);
+    if (params[0] != GL_TRUE)
+    {
+      GLchar log[LOG_SIZE];
+      glGetProgramInfoLog(m_shaderProgram, LOG_SIZE, nullptr, log);
+      kodi::Log(ADDON_LOG_ERROR, "CShaderProgram::%s: %s", __FUNCTION__, log);
+      fprintf(stderr, "CShaderProgram::%s: %s\n", __FUNCTION__, log);
+      ShaderFree();
+      return false;
+    }
+
+    m_validated = false;
+    m_ok = true;
+    OnCompiledAndLinked();
+    return true;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief To activate the shader and use it on the GPU
+  ///
+  /// @return true if enable was successfull done
+  ///
+  ///
+  /// @note During this call, the \ref OnEnabled stored in the child is also
+  /// called
+  ///
+  bool EnableShader()
+  {
+    if (ShaderOK())
+    {
+      glUseProgram(m_shaderProgram);
+      if (OnEnabled())
+      {
+        if (!m_validated)
+        {
+          // validate the program
+          GLint params[4];
+          glValidateProgram(m_shaderProgram);
+          glGetProgramiv(m_shaderProgram, GL_VALIDATE_STATUS, params);
+          if (params[0] != GL_TRUE)
+          {
+            GLchar log[LOG_SIZE];
+            glGetProgramInfoLog(m_shaderProgram, LOG_SIZE, nullptr, log);
+            kodi::Log(ADDON_LOG_ERROR, "CShaderProgram::%s: %s", __FUNCTION__, log);
+            fprintf(stderr, "CShaderProgram::%s: %s\n", __FUNCTION__, log);
+          }
+          m_validated = true;
+        }
+        return true;
+      }
+      else
+      {
+        glUseProgram(0);
+        return false;
+      }
+      return true;
+    }
+    return false;
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief To deactivate the shader use on the GPU
+  ///
+  void DisableShader()
+  {
+    if (ShaderOK())
+    {
+      glUseProgram(0);
+      OnDisabled();
+    }
+  }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief Used to check if shader has been loaded before.
+  ///
+  /// @return true if enable was successfull done
+  ///
+  /// @note The CompileAndLink call sets these values
+  ///
+  ATTRIBUTE_FORCEINLINE bool ShaderOK() const { return m_ok; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief To get the vertex shader class used by Kodi at the addon
+  ///
+  /// @return pointer to vertex shader class
+  ///
+  ATTRIBUTE_FORCEINLINE CVertexShader& VertexShader() { return m_pVP; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief To get the fragment shader class used by Kodi at the addon
+  ///
+  /// @return pointer to fragment shader class
+  ///
+  ATTRIBUTE_FORCEINLINE CPixelShader& PixelShader() { return m_pFP; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief Used to get the definition created in the OpenGL itself
+  ///
+  /// @return GLuint of GL shader program handler
+  ///
+  ATTRIBUTE_FORCEINLINE GLuint ProgramHandle() { return m_shaderProgram; }
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_gl_CShaderProgram_child Child Functions
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram
+  /// @brief \cpp_class{ kodi::gui::gl::CShaderProgram child functions }
+  ///
+  /// Functions that are added by parent in the child
+  //@{
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram_child
+  /// @brief Mandatory child function to set the necessary CPU to GPU data
+  ///
+  virtual void OnCompiledAndLinked() {};
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram_child
+  /// @brief Optional function to exchange data between CPU and GPU while
+  /// activating the shader
+  ///
+  /// @return true if enable was successfull done
+  ///
+  virtual bool OnEnabled() { return true; };
+  //--------------------------------------------------------------------------
+
+  //==========================================================================
+  ///
+  /// \ingroup cpp_kodi_gui_gl_CShaderProgram_child
+  /// @brief Optional child function that may have to be performed when
+  /// switching off the shader
+  virtual void OnDisabled() {};
+  //--------------------------------------------------------------------------
+  //@}
+
+private:
+  void ShaderFree()
+  {
+    if (m_shaderProgram)
+      glDeleteProgram(m_shaderProgram);
+    m_shaderProgram = 0;
+    m_ok = false;
+  }
+
+  CVertexShader m_pVP;
+  CPixelShader m_pFP;
+  GLuint m_shaderProgram = 0;
+  bool m_ok = false;
+  bool m_validated = false;
+};
+//------------------------------------------------------------------------
+
+} /* namespace gl */
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/renderHelper.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/renderHelper.h
new file mode 100644
index 0000000..2e96d21
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/renderHelper.h
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (C) 2005-2019 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"
+
+namespace kodi
+{
+namespace gui
+{
+struct ATTRIBUTE_HIDDEN IRenderHelper
+{
+  virtual ~IRenderHelper() = default;
+  virtual bool Init() = 0;
+  virtual void Begin() = 0;
+  virtual void End() = 0;
+}; /* class IRenderHelper */
+} /* namespace gui */
+} /* namespace kodi */
+
+#if defined(WIN32) && defined(HAS_ANGLE)
+#include "gl/GLonDX.h"
+#else
+/*
+ * Default background GUI render helper class
+ */
+namespace kodi
+{
+namespace gui
+{
+struct ATTRIBUTE_HIDDEN CRenderHelperStub : public IRenderHelper
+{
+  bool Init() override { return true; }
+  void Begin() override { }
+  void End() override { }
+}; /* class CRenderHelperStub */
+
+using CRenderHelper = CRenderHelperStub;
+} /* namespace gui */
+} /* namespace kodi */
+#endif
+
+namespace kodi
+{
+namespace gui
+{
+
+/*
+ * Create render background handler, e.g. becomes on "Windows" Angle used
+ * to emulate GL.
+ *
+ * This only be used internal and not from addon's direct.
+ *
+ * Function defines here and not in CAddonBase because of a hen and egg problem.
+ */
+inline std::shared_ptr<IRenderHelper> ATTRIBUTE_HIDDEN GetRenderHelper()
+{
+  using namespace ::kodi::addon;
+  if (static_cast<CAddonBase*>(CAddonBase::m_interface->addonBase)->m_renderHelper)
+    return static_cast<CAddonBase*>(CAddonBase::m_interface->addonBase)->m_renderHelper;
+
+  const std::shared_ptr<kodi::gui::IRenderHelper> renderHelper(new CRenderHelper());
+  if (!renderHelper->Init())
+    return nullptr;
+
+  static_cast<CAddonBase*>(CAddonBase::m_interface->addonBase)->m_renderHelper =
+      renderHelper; // Hold on base for other types
+  return renderHelper;
+}
+
+} /* namespace gui */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
deleted file mode 100644
index 4338606..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- *  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 "kodi_game_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// --- Game operations ---------------------------------------------------------
-
-/*!
- * \brief Load a game
- *
- * \param url The URL to load
- *
- * return the error, or GAME_ERROR_NO_ERROR if the game was loaded
- */
-GAME_ERROR LoadGame(const char* url);
-
-/*!
- * \brief Load a game that requires multiple files
- *
- * \param type The game type
- * \param urls An array of urls
- * \param urlCount The number of urls in the array
- *
- * \return the error, or GAME_ERROR_NO_ERROR if the game was loaded
- */
-GAME_ERROR LoadGameSpecial(SPECIAL_GAME_TYPE type, const char** urls, size_t urlCount);
-
-/*!
- * \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 GAME_ERROR_NO_ERROR if the game add-on was loaded
- */
-GAME_ERROR LoadStandalone(void);
-
-/*!
- * \brief Unload the current game
- *
- * \return the error, or GAME_ERROR_NO_ERROR if the game was unloaded
- */
-/*! Unloads a currently loaded game */
-GAME_ERROR UnloadGame(void);
-
-/*!
- * \brief Get timing information about the loaded game
- *
- * \param[out] timing_info The info structure to fill
- *
- * \return the error, or GAME_ERROR_NO_ERROR if info was filled
- */
-GAME_ERROR GetGameTiming(game_system_timing* timing_info);
-
-/*!
- * \brief Get region of the loaded game
- *
- * \return the region, or GAME_REGION_UNKNOWN if unknown or no game is loaded
- */
-GAME_REGION GetRegion(void);
-
-/*!
- * \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
- */
-bool RequiresGameLoop(void);
-
-/*!
- * \brief Run a single frame for add-ons that use a game loop
- *
- * \return the error, or GAME_ERROR_NO_ERROR if there was no error
- */
-GAME_ERROR RunFrame(void);
-
-/*!
- * \brief Reset the current game
- *
- * \return the error, or GAME_ERROR_NO_ERROR if the game was reset
- */
-GAME_ERROR Reset(void);
-
-// --- 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 GAME_ERROR_NO_ERROR if the HW context was reset
- */
-GAME_ERROR HwContextReset(void);
-
-/*!
- * \brief Called before the context is destroyed
- *
- * Resources can be deinitialized at this step.
- *
- * \return the error, or GAME_ERROR_NO_ERROR if the HW context was destroyed
- */
-GAME_ERROR HwContextDestroy(void);
-
-// --- 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 controller_id The ID of the controller profile
- * \param feature_name The name of a feature in that profile
- * \return true if input is accepted for the feature, false otherwise
- */
-bool HasFeature(const char* controller_id, const char* feature_name);
-
-/*!
- * \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 DEFAULT_PORT_ID constant.
- */
-game_input_topology* GetTopology();
-
-/*!
- * \brief Free the topology's resources
- *
- * \param topology The topology returned by GetTopology()
- */
-void FreeTopology(game_input_topology* topology);
-
-/*!
- * \brief Set the layouts for known controllers
- *
- * \param controllers The controller layouts
- * \param controller_count The number of items in the array
- *
- * After loading the input topology, the frontend will call this with
- * controller layouts for all controllers discovered in the topology.
- */
-void SetControllerLayouts(const game_controller_layout* controllers, unsigned int controller_count);
-
-/*!
- * \brief Enable/disable keyboard input using the specified controller
- *
- * \param enable True to enable input, false otherwise
- * \param controller_id The controller ID if enabling, or unused if disabling
- *
- * \return True if keyboard input was enabled, false otherwise
- */
-bool EnableKeyboard(bool enable, const char* controller_id);
-
-/*!
- * \brief Enable/disable mouse input using the specified controller
- *
- * \param enable True to enable input, false otherwise
- * \param controller_id The controller ID if enabling, or unused if disabling
- *
- * \return True if mouse input was enabled, false otherwise
- */
-bool EnableMouse(bool enable, const char* controller_id);
-
-/*!
- * \brief Connect/disconnect a controller to a port on the virtual game console
- *
- * \param connect True to connect a controller, false to disconnect
- * \param port_address The address of the port
- * \param 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:
- *
- *     <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.
- */
-bool ConnectController(bool connect, const char* port_address, const char* controller_id);
-
-/*!
- * \brief Notify the add-on of an input event
- *
- * \param event The input event
- *
- * \return true if the event was handled, false otherwise
- */
-bool InputEvent(const game_input_event* event);
-
-// --- 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
- */
-size_t SerializeSize(void);
-
-/*!
- * \brief Serialize the state of the game
- *
- * \param data The buffer receiving the serialized game data
- * \param size The size of the buffer
- *
- * \return the error, or GAME_ERROR_NO_ERROR if the game was serialized into the buffer
- */
-GAME_ERROR Serialize(uint8_t* data, size_t size);
-
-/*!
- * \brief Deserialize the game from the given state
- *
- * \param data A buffer containing the game's new state
- * \param size The size of the buffer
- *
- * \return the error, or GAME_ERROR_NO_ERROR if the game deserialized
- */
-GAME_ERROR Deserialize(const uint8_t* data, size_t size);
-
-// --- Cheat operations --------------------------------------------------------
-
-/*!
- * \brief Reset the cheat system
- *
- * \return the error, or GAME_ERROR_NO_ERROR if the cheat system was reset
- */
-GAME_ERROR CheatReset(void);
-
-/*!
- * \brief Get a region of memory
- *
- * \param type The type of memory to retrieve
- * \param data Set to the region of memory; must remain valid until UnloadGame() is called
- * \param size Set to the size of the region of memory
- *
- * \return the error, or GAME_ERROR_NO_ERROR if data was set to a valid buffer
- */
-GAME_ERROR GetMemory(GAME_MEMORY type, uint8_t** data, size_t* size);
-
-/*!
- * \brief Set a cheat code
- *
- * \param index
- * \param enabled
- * \param code
- *
- * \return the error, or GAME_ERROR_NO_ERROR if the cheat was set
- */
-GAME_ERROR SetCheat(unsigned int index, bool enabled, const char* code);
-
-// --- Add-on helper implementation --------------------------------------------
-
-/*!
- * \brief Called by Kodi to assign the function pointers of this add-on to pClient
- *
- * Note that get_addon() is defined here, so it will be available in all
- * compiled game clients.
- */
-void __declspec(dllexport) get_addon(void* ptr)
-{
-  AddonInstance_Game* pClient = static_cast<AddonInstance_Game*>(ptr);
-
-  pClient->toAddon.LoadGame                 = LoadGame;
-  pClient->toAddon.LoadGameSpecial          = LoadGameSpecial;
-  pClient->toAddon.LoadStandalone           = LoadStandalone;
-  pClient->toAddon.UnloadGame               = UnloadGame;
-  pClient->toAddon.GetGameTiming            = GetGameTiming;
-  pClient->toAddon.GetRegion                = GetRegion;
-  pClient->toAddon.RequiresGameLoop         = RequiresGameLoop;
-  pClient->toAddon.RunFrame                 = RunFrame;
-  pClient->toAddon.Reset                    = Reset;
-  pClient->toAddon.HwContextReset           = HwContextReset;
-  pClient->toAddon.HwContextDestroy         = HwContextDestroy;
-  pClient->toAddon.HasFeature               = HasFeature;
-  pClient->toAddon.GetTopology              = GetTopology;
-  pClient->toAddon.FreeTopology             = FreeTopology;
-  pClient->toAddon.SetControllerLayouts     = SetControllerLayouts;
-  pClient->toAddon.EnableKeyboard           = EnableKeyboard;
-  pClient->toAddon.EnableMouse              = EnableMouse;
-  pClient->toAddon.ConnectController        = ConnectController;
-  pClient->toAddon.InputEvent               = InputEvent;
-  pClient->toAddon.SerializeSize            = SerializeSize;
-  pClient->toAddon.Serialize                = Serialize;
-  pClient->toAddon.Deserialize              = Deserialize;
-  pClient->toAddon.CheatReset               = CheatReset;
-  pClient->toAddon.GetMemory                = GetMemory;
-  pClient->toAddon.SetCheat                 = SetCheat;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h
deleted file mode 100644
index ec9d472..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
- *  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 "versions.h"
-#include "xbmc_addon_types.h"
-
-#include <stddef.h>
-#include <stdint.h>
-
-#ifndef TARGET_WINDOWS
-  #ifndef __cdecl
-    #define __cdecl
-  #endif
-  #ifndef __declspec
-    #define __declspec(X)
-  #endif
-#endif
-
-#undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN
-#undef PRAGMA_PACK_END
-
-#if defined(__GNUC__)
-  #define ATTRIBUTE_PACKED __attribute__ ((packed))
-  #define PRAGMA_PACK 0
-#endif
-
-#if !defined(ATTRIBUTE_PACKED)
-  #define ATTRIBUTE_PACKED
-  #define PRAGMA_PACK 1
-#endif
-
-#ifdef BUILD_KODI_ADDON
-#include "XBMC_vkeys.h"
-#else
-#include "input/XBMC_vkeys.h"
-#endif
-
-/*! Port ID used when topology is unknown */
-#define DEFAULT_PORT_ID  "1"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/// @name Add-on types
-///{
-/*! Game add-on error codes */
-typedef enum GAME_ERROR
-{
-  GAME_ERROR_NO_ERROR,               // no error occurred
-  GAME_ERROR_UNKNOWN,                // an unknown error occurred
-  GAME_ERROR_NOT_IMPLEMENTED,        // the method that the frontend called is not implemented
-  GAME_ERROR_REJECTED,               // the command was rejected by the game client
-  GAME_ERROR_INVALID_PARAMETERS,     // the parameters of the method that was called are invalid for this operation
-  GAME_ERROR_FAILED,                 // the command failed
-  GAME_ERROR_NOT_LOADED,             // no game is loaded
-  GAME_ERROR_RESTRICTED,             // game requires restricted resources
-} GAME_ERROR;
-///}
-
-/// @name Audio stream
-///{
-typedef enum GAME_PCM_FORMAT
-{
-  GAME_PCM_FORMAT_UNKNOWN,
-  GAME_PCM_FORMAT_S16NE,
-} GAME_PCM_FORMAT;
-
-typedef enum GAME_AUDIO_CHANNEL
-{
-  GAME_CH_NULL, // Channel list terminator
-  GAME_CH_FL,
-  GAME_CH_FR,
-  GAME_CH_FC,
-  GAME_CH_LFE,
-  GAME_CH_BL,
-  GAME_CH_BR,
-  GAME_CH_FLOC,
-  GAME_CH_FROC,
-  GAME_CH_BC,
-  GAME_CH_SL,
-  GAME_CH_SR,
-  GAME_CH_TFL,
-  GAME_CH_TFR,
-  GAME_CH_TFC,
-  GAME_CH_TC,
-  GAME_CH_TBL,
-  GAME_CH_TBR,
-  GAME_CH_TBC,
-  GAME_CH_BLOC,
-  GAME_CH_BROC,
-} GAME_AUDIO_CHANNEL;
-
-typedef struct game_stream_audio_properties
-{
-  GAME_PCM_FORMAT format;
-  const GAME_AUDIO_CHANNEL* channel_map;
-} ATTRIBUTE_PACKED game_stream_audio_properties;
-
-typedef struct game_stream_audio_packet
-{
-  const uint8_t *data;
-  size_t size;
-} ATTRIBUTE_PACKED game_stream_audio_packet;
-///}
-
-/// @name Video stream
-///{
-typedef enum GAME_PIXEL_FORMAT
-{
-  GAME_PIXEL_FORMAT_UNKNOWN,
-  GAME_PIXEL_FORMAT_0RGB8888,
-  GAME_PIXEL_FORMAT_RGB565,
-  GAME_PIXEL_FORMAT_0RGB1555,
-} GAME_PIXEL_FORMAT;
-
-typedef enum GAME_VIDEO_ROTATION
-{
-  GAME_VIDEO_ROTATION_0,
-  GAME_VIDEO_ROTATION_90_CCW,
-  GAME_VIDEO_ROTATION_180_CCW,
-  GAME_VIDEO_ROTATION_270_CCW,
-} GAME_VIDEO_ROTATION;
-
-typedef struct game_stream_video_properties
-{
-  GAME_PIXEL_FORMAT format;
-  unsigned int nominal_width;
-  unsigned int nominal_height;
-  unsigned int max_width;
-  unsigned int max_height;
-  float aspect_ratio; // If aspect_ratio is <= 0.0, an aspect ratio of nominal_width / nominal_height is assumed
-} ATTRIBUTE_PACKED game_stream_video_properties;
-
-typedef struct game_stream_video_packet
-{
-  unsigned int width;
-  unsigned int height;
-  GAME_VIDEO_ROTATION rotation;
-  const uint8_t *data;
-  size_t size;
-} ATTRIBUTE_PACKED game_stream_video_packet;
-///}
-
-/// @name Hardware framebuffer stream
-///{
-typedef enum GAME_HW_CONTEXT_TYPE
-{
-  GAME_HW_CONTEXT_NONE,
-
-  // OpenGL 2.x. Driver can choose to use latest compatibility context
-  GAME_HW_CONTEXT_OPENGL,
-
-  // OpenGL ES 2.0
-  GAME_HW_CONTEXT_OPENGLES2,
-
-  // Modern desktop core GL context. Use major/minor fields to set GL version
-  GAME_HW_CONTEXT_OPENGL_CORE,
-
-  // OpenGL ES 3.0
-  GAME_HW_CONTEXT_OPENGLES3,
-
-  // OpenGL ES 3.1+. Set major/minor fields.
-  GAME_HW_CONTEXT_OPENGLES_VERSION,
-
-  // Vulkan
-  GAME_HW_CONTEXT_VULKAN
-} GAME_HW_CONTEXT_TYPE;
-
-typedef struct game_stream_hw_framebuffer_properties
-{
-  /*!
-   * The API to use.
-   */
-  GAME_HW_CONTEXT_TYPE context_type;
-
-  /*!
-   * Set if render buffers should have depth component attached.
-   *
-   * TODO: Obsolete
-   */
-  bool depth;
-
-  /*!
-   * 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;
-
-  /*!
-   * 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;
-
-  /*!
-   * Major version number for core GL context or GLES 3.1+.
-   */
-  unsigned int version_major;
-
-  /*!
-   * Minor version number for core GL context or GLES 3.1+.
-   */
-  unsigned int version_minor;
-
-  /*!
-   * 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;
-
-  /*!
-   * Creates a debug context.
-   */
-  bool debug_context;
-} ATTRIBUTE_PACKED game_stream_hw_framebuffer_properties;
-
-typedef struct game_stream_hw_framebuffer_buffer
-{
-  uintptr_t framebuffer;
-} ATTRIBUTE_PACKED game_stream_hw_framebuffer_buffer;
-
-typedef struct game_stream_hw_framebuffer_packet
-{
-  uintptr_t framebuffer;
-} ATTRIBUTE_PACKED game_stream_hw_framebuffer_packet;
-
-typedef void (*game_proc_address_t)(void);
-///}
-
-/// @name Software framebuffer stream
-///{
-typedef game_stream_video_properties game_stream_sw_framebuffer_properties;
-
-typedef struct game_stream_sw_framebuffer_buffer
-{
-  GAME_PIXEL_FORMAT format;
-  uint8_t *data;
-  size_t size;
-} ATTRIBUTE_PACKED game_stream_sw_framebuffer_buffer;
-
-typedef game_stream_video_packet game_stream_sw_framebuffer_packet;
-///}
-
-/// @name Stream types
-///{
-typedef enum GAME_STREAM_TYPE
-{
-  GAME_STREAM_UNKNOWN,
-  GAME_STREAM_AUDIO,
-  GAME_STREAM_VIDEO,
-  GAME_STREAM_HW_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
-{
-  GAME_STREAM_TYPE type;
-  union
-  {
-    game_stream_audio_properties audio;
-    game_stream_video_properties video;
-    game_stream_hw_framebuffer_properties hw_framebuffer;
-    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
-{
-  GAME_STREAM_TYPE type;
-  union
-  {
-    game_stream_hw_framebuffer_buffer hw_framebuffer;
-    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
-{
-  GAME_STREAM_TYPE type;
-  union
-  {
-    game_stream_audio_packet audio;
-    game_stream_video_packet video;
-    game_stream_hw_framebuffer_packet hw_framebuffer;
-    game_stream_sw_framebuffer_packet sw_framebuffer;
-  };
-} ATTRIBUTE_PACKED game_stream_packet;
-///}
-
-/// @name Game types
-///{
-
-/*! Returned from game_get_region() */
-typedef enum GAME_REGION
-{
-  GAME_REGION_UNKNOWN,
-  GAME_REGION_NTSC,
-  GAME_REGION_PAL,
-} GAME_REGION;
-
-/*!
- * Special game types passed into game_load_game_special(). Only used when
- * multiple ROMs are required.
- */
-typedef enum SPECIAL_GAME_TYPE
-{
-  SPECIAL_GAME_TYPE_BSX,
-  SPECIAL_GAME_TYPE_BSX_SLOTTED,
-  SPECIAL_GAME_TYPE_SUFAMI_TURBO,
-  SPECIAL_GAME_TYPE_SUPER_GAME_BOY,
-} SPECIAL_GAME_TYPE;
-
-typedef enum GAME_MEMORY
-{
-  /*!
-   * 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,
-
-  /*!
-   * 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,
-
-  /*!
-   * 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,
-
-  /*! System ram lets a frontend peek into a game systems main RAM */
-  GAME_MEMORY_SYSTEM_RAM             = 2,
-
-  /*! Video ram lets a frontend peek into a game systems video RAM (VRAM) */
-  GAME_MEMORY_VIDEO_RAM              = 3,
-
-  /*! Special memory types */
-  GAME_MEMORY_SNES_BSX_RAM           = ((1 << 8) | GAME_MEMORY_SAVE_RAM),
-  GAME_MEMORY_SNES_BSX_PRAM          = ((2 << 8) | GAME_MEMORY_SAVE_RAM),
-  GAME_MEMORY_SNES_SUFAMI_TURBO_A_RAM= ((3 << 8) | GAME_MEMORY_SAVE_RAM),
-  GAME_MEMORY_SNES_SUFAMI_TURBO_B_RAM= ((4 << 8) | GAME_MEMORY_SAVE_RAM),
-  GAME_MEMORY_SNES_GAME_BOY_RAM      = ((5 << 8) | GAME_MEMORY_SAVE_RAM),
-  GAME_MEMORY_SNES_GAME_BOY_RTC      = ((6 << 8) | GAME_MEMORY_RTC),
-} GAME_MEMORY;
-
-/*! ID values for SIMD CPU features */
-typedef enum GAME_SIMD
-{
-  GAME_SIMD_SSE                      = (1 << 0),
-  GAME_SIMD_SSE2                     = (1 << 1),
-  GAME_SIMD_VMX                      = (1 << 2),
-  GAME_SIMD_VMX128                   = (1 << 3),
-  GAME_SIMD_AVX                      = (1 << 4),
-  GAME_SIMD_NEON                     = (1 << 5),
-  GAME_SIMD_SSE3                     = (1 << 6),
-  GAME_SIMD_SSSE3                    = (1 << 7),
-  GAME_SIMD_MMX                      = (1 << 8),
-  GAME_SIMD_MMXEXT                   = (1 << 9),
-  GAME_SIMD_SSE4                     = (1 << 10),
-  GAME_SIMD_SSE42                    = (1 << 11),
-  GAME_SIMD_AVX2                     = (1 << 12),
-  GAME_SIMD_VFPU                     = (1 << 13),
-} GAME_SIMD;
-///}
-
-/// @name Input types
-///{
-
-typedef enum GAME_INPUT_EVENT_SOURCE
-{
-  GAME_INPUT_EVENT_DIGITAL_BUTTON,
-  GAME_INPUT_EVENT_ANALOG_BUTTON,
-  GAME_INPUT_EVENT_AXIS,
-  GAME_INPUT_EVENT_ANALOG_STICK,
-  GAME_INPUT_EVENT_ACCELEROMETER,
-  GAME_INPUT_EVENT_KEY,
-  GAME_INPUT_EVENT_RELATIVE_POINTER,
-  GAME_INPUT_EVENT_ABSOLUTE_POINTER,
-  GAME_INPUT_EVENT_MOTOR,
-} GAME_INPUT_EVENT_SOURCE;
-
-typedef enum GAME_KEY_MOD
-{
-  GAME_KEY_MOD_NONE = 0x0000,
-
-  GAME_KEY_MOD_SHIFT = 0x0001,
-  GAME_KEY_MOD_CTRL = 0x0002,
-  GAME_KEY_MOD_ALT = 0x0004,
-  GAME_KEY_MOD_META = 0x0008,
-  GAME_KEY_MOD_SUPER = 0x0010,
-
-  GAME_KEY_MOD_NUMLOCK = 0x0100,
-  GAME_KEY_MOD_CAPSLOCK = 0x0200,
-  GAME_KEY_MOD_SCROLLOCK = 0x0400,
-} GAME_KEY_MOD;
-
-/*!
- * \brief Type of port on the virtual game console
- */
-typedef enum GAME_PORT_TYPE
-{
-  GAME_PORT_UNKNOWN,
-  GAME_PORT_KEYBOARD,
-  GAME_PORT_MOUSE,
-  GAME_PORT_CONTROLLER,
-} GAME_PORT_TYPE;
-
-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;
-
-struct game_input_port;
-
-/*!
- * \brief Device that can provide input
- */
-typedef struct game_input_device
-{
-  const char*      controller_id; // ID used in the Kodi controller API
-  const char*      port_address;
-  game_input_port* available_ports;
-  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
-{
-  GAME_PORT_TYPE     type;
-  const char*        port_id; // Required for GAME_PORT_CONTROLLER type
-  game_input_device* accepted_devices;
-  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
-{
-  game_input_port *ports; //! The list of ports on the virtual game console
-  unsigned int port_count; //! The number of ports
-  int player_limit; //! A limit on the number of input-providing devices, or -1 for no limit
-} ATTRIBUTE_PACKED game_input_topology;
-
-typedef struct game_digital_button_event
-{
-  bool         pressed;
-} ATTRIBUTE_PACKED game_digital_button_event;
-
-typedef struct game_analog_button_event
-{
-  float        magnitude;
-} ATTRIBUTE_PACKED game_analog_button_event;
-
-typedef struct game_axis_event
-{
-  float        position;
-} ATTRIBUTE_PACKED game_axis_event;
-
-typedef struct game_analog_stick_event
-{
-  float        x;
-  float        y;
-} ATTRIBUTE_PACKED game_analog_stick_event;
-
-typedef struct game_accelerometer_event
-{
-  float        x;
-  float        y;
-  float        z;
-} ATTRIBUTE_PACKED game_accelerometer_event;
-
-typedef struct game_key_event
-{
-  bool         pressed;
-
-  /*!
-   * 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;
-
-  GAME_KEY_MOD modifiers;
-} ATTRIBUTE_PACKED game_key_event;
-
-typedef struct game_rel_pointer_event
-{
-  int          x;
-  int          y;
-} ATTRIBUTE_PACKED game_rel_pointer_event;
-
-typedef struct game_abs_pointer_event
-{
-  bool         pressed;
-  float        x;
-  float        y;
-} ATTRIBUTE_PACKED game_abs_pointer_event;
-
-typedef struct game_motor_event
-{
-  float        magnitude;
-} ATTRIBUTE_PACKED game_motor_event;
-
-typedef struct game_input_event
-{
-  GAME_INPUT_EVENT_SOURCE type;
-  const char*             controller_id;
-  GAME_PORT_TYPE          port_type;
-  const char*             port_address;
-  const char*             feature_name;
-  union
-  {
-    struct game_digital_button_event digital_button;
-    struct game_analog_button_event  analog_button;
-    struct game_axis_event           axis;
-    struct game_analog_stick_event   analog_stick;
-    struct game_accelerometer_event  accelerometer;
-    struct game_key_event            key;
-    struct game_rel_pointer_event    rel_pointer;
-    struct game_abs_pointer_event    abs_pointer;
-    struct game_motor_event          motor;
-  };
-} ATTRIBUTE_PACKED game_input_event;
-///}
-
-/// @name Environment types
-///{
-struct game_system_timing
-{
-  double fps;                   // FPS of video content.
-  double sample_rate;           // Sampling rate of audio.
-};
-///}
-
-/*! Properties passed to the ADDON_Create() method of a game client */
-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 */
-
-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;
-
-typedef struct KodiToAddonFuncTable_Game
-{
-  GAME_ERROR  (__cdecl* LoadGame)(const char*);
-  GAME_ERROR  (__cdecl* LoadGameSpecial)(SPECIAL_GAME_TYPE, const char**, size_t);
-  GAME_ERROR  (__cdecl* LoadStandalone)(void);
-  GAME_ERROR  (__cdecl* UnloadGame)(void);
-  GAME_ERROR  (__cdecl* GetGameTiming)(game_system_timing*);
-  GAME_REGION (__cdecl* GetRegion)(void);
-  bool        (__cdecl* RequiresGameLoop)(void);
-  GAME_ERROR  (__cdecl* RunFrame)(void);
-  GAME_ERROR  (__cdecl* Reset)(void);
-  GAME_ERROR  (__cdecl* HwContextReset)(void);
-  GAME_ERROR  (__cdecl* HwContextDestroy)(void);
-  bool        (__cdecl* HasFeature)(const char*, const char*);
-  game_input_topology* (__cdecl* GetTopology)();
-  void        (__cdecl* FreeTopology)(game_input_topology*);
-  void        (__cdecl* SetControllerLayouts)(const game_controller_layout*, unsigned int);
-  bool        (__cdecl* EnableKeyboard)(bool, const char*);
-  bool        (__cdecl* EnableMouse)(bool, const char*);
-  bool        (__cdecl* ConnectController)(bool, const char*, const char*);
-  bool        (__cdecl* InputEvent)(const game_input_event*);
-  size_t      (__cdecl* SerializeSize)(void);
-  GAME_ERROR  (__cdecl* Serialize)(uint8_t*, size_t);
-  GAME_ERROR  (__cdecl* Deserialize)(const uint8_t*, size_t);
-  GAME_ERROR  (__cdecl* CheatReset)(void);
-  GAME_ERROR  (__cdecl* GetMemory)(GAME_MEMORY, uint8_t**, size_t*);
-  GAME_ERROR  (__cdecl* SetCheat)(unsigned int, bool, const char*);
-} KodiToAddonFuncTable_Game;
-
-typedef struct AddonInstance_Game
-{
-  AddonProps_Game props;
-  AddonToKodiFuncTable_Game toKodi;
-  KodiToAddonFuncTable_Game toAddon;
-} AddonInstance_Game;
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
deleted file mode 100644
index 233f682..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *  Copyright (C) 2015-2018 Team Kodi
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#pragma once
-
-#ifndef TARGET_WINDOWS
-#ifndef __cdecl
-#define __cdecl
-#endif
-#ifndef __declspec
-#define __declspec(X)
-#endif
-#endif
-
-#include <stdint.h>
-#include "xbmc_addon_types.h"
-#ifdef BUILD_KODI_ADDON
-#include "IFileTypes.h"
-#else
-#include "filesystem/IFileTypes.h"
-#include "PlatformDefs.h"
-#endif
-
-extern "C"
-{
-
-  struct VFSProperty
-  {
-    char* name;
-    char* val;
-  };
-
-  struct VFSDirEntry
-  {
-    char* label;             //!< item label
-    char* title;             //!< item title
-    char* path;              //!< item path
-    int num_props;           //!< Number of properties attached to item
-    VFSProperty* properties; //!< Properties
-    //FILETIME mtime;          //!< Mtime for file represented by item
-    bool folder;             //!< Item is a folder
-    uint64_t size;           //!< Size of file represented by item
-  };
-
-  struct VFSURL
-  {
-    const char* url;
-    const char* domain;
-    const char* hostname;
-    const char* filename;
-    unsigned int port;
-    const char* options;
-    const char* username;
-    const char* password;
-    const char* redacted;
-    const char* sharename;
-  };
-
-  struct VFSCallbacks
-  {
-    //! \brief Require keyboard input
-    //! \param heading The heading of the keyboard dialog
-    //! \param input A pointer to the resulting string. Must be free'd by caller.
-    //! \return True if input was received, false otherwise
-    bool (__cdecl* GetKeyboardInput)(void* ctx, const char* heading, char** input);
-
-    //! \brief Display an error dialog
-    //! \param heading The heading of the error dialog
-    //! \param line1 The first line of the error dialog
-    //! \param line2 The second line of the error dialog. Can be NULL
-    //! \param line3 The third line of the error dialog. Can be NULL
-    void (__cdecl* SetErrorDialog)(void* ctx, const char* heading, const char* line1, const char* line2, const char* line3);
-
-    //! \brief Prompt the user for authentication of a URL
-    //! \param url The URL
-    void (__cdecl* RequireAuthentication)(void* ctx, const char* url);
-
-    //! \brief The context to be passed to the callbacks
-    void* ctx;
-  };
-
-  typedef struct AddonProps_VFSEntry
-  {
-    int dummy;
-  } AddonProps_VFSEntry;
-
-  typedef AddonProps_VFSEntry VFS_PROPS;
-
-  typedef struct AddonToKodiFuncTable_VFSEntry
-  {
-    KODI_HANDLE kodiInstance;
-  } AddonToKodiFuncTable_VFSEntry;
-
-  typedef struct KodiToAddonFuncTable_VFSEntry
-  {
-    //! \brief Open a file for input
-    //! \param url The URL of the file
-    //! \return Context for the opened file
-    //! \sa IFile::Open
-    void* (__cdecl* Open) (VFSURL* url);
-
-    //! \brief Open a file for output
-    //! \param url The URL of the file
-    //! \param bOverwrite Whether or not to overwrite an existing file
-    //! \return Context for the opened file
-    //! \sa IFile::OpenForWrite
-    void* (__cdecl* OpenForWrite) (VFSURL* url, bool bOverWrite);
-
-    //! \brief Read from a file
-    //! \param context The context of the file
-    //! \param buffer The buffer to read data into
-    //! \param uiBufSize Number of bytes to read
-    //! \return Number of bytes read
-    //! \sa IFile::Read
-    ssize_t (__cdecl* Read) (void* context, void* buffer, size_t uiBufSize);
-
-    //! \brief Write to a file
-    //! \param context The context of the file
-    //! \param buffer The buffer to read data from
-    //! \param uiBufSize Number of bytes to write
-    //! \return Number of bytes written
-    //! \sa IFile::Write
-    ssize_t (__cdecl* Write) (void* context, const void* buffer, size_t uiBufSize);
-
-    //! \brief Seek in a file
-    //! \param context The context of the file
-    //! \param position The position to seek to
-    //! \param whence Position in file 'position' is relative to (SEEK_CUR, SEEK_SET, SEEK_END)
-    //! \return Offset in file after seek
-    //! \sa IFile::Seek
-    int64_t  (__cdecl* Seek) (void* context, int64_t position, int whence);
-
-    //! \brief Truncate a file
-    //! \param context The context of the file
-    //! \param size The size to truncate the file to
-    //! \return 0 on success, -1 on error
-    //! \sa IFile::Truncate
-    int      (__cdecl* Truncate) (void* context, int64_t size);
-
-    //! \brief Get total size of a file
-    //! \param context The context of the file
-    //! \return Total file size
-    //! \sa IFile::GetLength
-    int64_t  (__cdecl* GetLength) (void* context);
-
-    //! \brief Get current position in a file
-    //! \param context The context of the file
-    //! \return Current position
-    //! \sa IFile::GetPosition
-    int64_t  (__cdecl* GetPosition) (void* context);
-
-    //! \brief Get chunk size of a file
-    //! \param context The context of the file
-    //! \return Chunk size
-    //! \sa IFile::GetChunkSize()
-    int      (__cdecl* GetChunkSize)(void* context);
-
-    //! \brief Perform an IO-control on the file
-    //! \param context The context of the file
-    //! \param request The requested IO-control
-    //! \param param Parameter attached to the IO-control
-    //! \return -1 on error, >= 0 on success
-    //! \sa IFile::IoControl
-    int  (__cdecl* IoControl) (void* context, XFILE::EIoControl request, void* param);
-
-    //! \brief Stat a file
-    //! \param url The URL of the file
-    //! \param buffer The buffer to store results in
-    //! \return -1 on error, 0 otherwise
-    //! \sa IFile::Stat
-    int  (__cdecl* Stat) (VFSURL* url, struct __stat64* buffer);
-    //! \brief Close a file
-    //! \param context The context of the file
-    //! \return True on success, false on failure
-    //! \sa IFile::Close
-
-    bool (__cdecl* Close) (void* context);
-
-    //! \brief Check for file existence
-    //! \param url The URL of the file
-    //! \return True if file exists, false otherwise
-    //! \sa IFile::Exists
-    bool (__cdecl* Exists) (VFSURL* url);
-
-    //! \brief Clear out any idle connections
-    void (__cdecl* ClearOutIdle) ();
-
-    //! \brief Disconnect all connections
-    void (__cdecl* DisconnectAll) ();
-
-    //! \brief Delete a file
-    //! \param url The URL of the file
-    //! \return True if deletion was successful, false otherwise
-    //! \sa IFile::Delete
-    bool (__cdecl* Delete) (VFSURL* url);
-
-    //! \brief Rename a file
-    //! \param url The URL of the source file
-    //! \param url2 The URL of the destination file
-    //! \return True if deletion was successful, false otherwise
-    //! \sa IFile::Rename
-    bool (__cdecl* Rename) (VFSURL* url, VFSURL* url2);
-
-    //! \brief Check for directory existence
-    //! \param url The URL of the file
-    //! \return True if directory exists, false otherwise
-    //! \sa IDirectory::Exists
-    bool (__cdecl* DirectoryExists) (VFSURL* url);
-
-    //! \brief Remove a directory
-    //! \param url The URL of the directory
-    //! \return True if removal was successful, false otherwise
-    //! \sa IDirectory::Remove
-    bool (__cdecl* RemoveDirectory) (VFSURL* url);
-
-    //! \brief Create a directory
-    //! \param url The URL of the file
-    //! \return True if creation was successful, false otherwise
-    //! \sa IDirectory::Create
-    bool (__cdecl* CreateDirectory) (VFSURL* url);
-
-    //! \brief List a directory
-    //! \param url The URL of the directory
-    //! \param entries The entries in the directory
-    //! \param num_entries Number of entries in the directory
-    //! \param callbacks A callback structure
-    //! \return Context for the directory listing
-    //! \sa IDirectory::GetDirectory
-    void* (__cdecl* GetDirectory) (VFSURL* url,
-                                   VFSDirEntry** entries,
-                                   int* num_entries,
-                                   VFSCallbacks* callbacks);
-
-    //! \brief Free up resources after listing a directory
-    void (__cdecl* FreeDirectory) (void* ctx);
-
-    //! \brief Check if file should be presented as a directory (multiple streams)
-    //! \param url The URL of the file
-    //! \param entries The entries in the directory
-    //! \param num_entries Number of entries in the directory
-    //! \param rootpath Path to root directory if multiple entries
-    //! \return Context for the directory listing
-    //! \sa IFileDirectory::ContainsFiles, FreeDirectory
-    void* (__cdecl* ContainsFiles) (VFSURL* url,
-                                    VFSDirEntry** entries,
-                                    int* num_entries,
-                                    char* rootpath);
-  } KodiToAddonFuncTable_VFSEntry;
-
-  typedef struct AddonInstance_VFSEntry
-  {
-    AddonProps_VFSEntry props;
-    AddonToKodiFuncTable_VFSEntry toKodi;
-    KodiToAddonFuncTable_VFSEntry toAddon;
-  } AddonInstance_VFSEntry;
-
-}
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h
deleted file mode 100644
index 2e6459b..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- *  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 "libXBMC_addon.h"
-#include "kodi_game_types.h"
-
-#include <string>
-#include <stdio.h>
-
-#if defined(ANDROID)
-  #include <sys/stat.h>
-#endif
-
-class CHelper_libKODI_game
-{
-public:
-  CHelper_libKODI_game(void) :
-    m_handle(nullptr),
-    m_callbacks(nullptr)
-  {
-  }
-
-  ~CHelper_libKODI_game(void)
-  {
-  }
-
-  /*!
-    * @brief Resolve all callback methods
-    * @param handle Pointer to the add-on
-    * @return True when all methods were resolved, false otherwise.
-    */
-  bool RegisterMe(void* handle)
-  {
-    m_handle = static_cast<AddonCB*>(handle);
-    if (m_handle)
-      m_callbacks = (AddonInstance_Game*)m_handle->GameLib_RegisterMe(m_handle->addonData);
-    if (!m_callbacks)
-      fprintf(stderr, "libKODI_game-ERROR: GameLib_RegisterMe can't get callback table from Kodi !!!\n");
-
-    return m_callbacks != nullptr;
-  }
-
-  // --- Game callbacks --------------------------------------------------------
-
-  /*!
-   * \brief Requests the frontend to stop the current game
-   */
-  void CloseGame(void)
-  {
-    m_callbacks->toKodi.CloseGame(m_callbacks->toKodi.kodiInstance);
-  }
-
-  /*!
-   * \brief Create a stream for gameplay data
-   *
-   * \param properties The stream properties
-   *
-   * \return A stream handle, or NULL on failure
-   */
-  void* OpenStream(const game_stream_properties &properties)
-  {
-    return m_callbacks->toKodi.OpenStream(m_callbacks->toKodi.kodiInstance, &properties);
-  }
-
-  /*!
-   * \brief Get a buffer for zero-copy stream data
-   *
-   * \param stream The stream handle
-   * \param width The framebuffer width, or 0 for no width specified
-   * \param height The framebuffer height, or 0 for no height specified
-   * \param[out] buffer The buffer, or unmodified if false is returned
-   *
-   * If this returns true, buffer must be freed using ReleaseStreamBuffer().
-   *
-   * \return True if buffer was set, false otherwise
-   */
-  bool GetStreamBuffer(void *stream, unsigned int width, unsigned int height, game_stream_buffer &buffer)
-  {
-    return m_callbacks->toKodi.GetStreamBuffer(m_callbacks->toKodi.kodiInstance, stream, width, height, &buffer);
-  }
-
-  /*!
-   * \brief Add a data packet to a stream
-   *
-   * \param stream The target stream
-   * \param packet The data packet
-   */
-  void AddStreamData(void *stream, const game_stream_packet &packet)
-  {
-    m_callbacks->toKodi.AddStreamData(m_callbacks->toKodi.kodiInstance, stream, &packet);
-  }
-
-  /*!
-   * \brief Free an allocated buffer
-   *
-   * \param stream The stream handle
-   * \param buffer The buffer returned from GetStreamBuffer()
-   */
-  void ReleaseStreamBuffer(void *stream, game_stream_buffer &buffer)
-  {
-    m_callbacks->toKodi.ReleaseStreamBuffer(m_callbacks->toKodi.kodiInstance, stream, &buffer);
-  }
-
-  /*!
-   * \brief Free the specified stream
-   *
-   * \param stream The stream to close
-   */
-  void CloseStream(void *stream)
-  {
-    m_callbacks->toKodi.CloseStream(m_callbacks->toKodi.kodiInstance, stream);
-  }
-
-  // -- Hardware rendering callbacks -------------------------------------------
-
-  /*!
-   * \brief Get a symbol from the hardware context
-   *
-   * \param sym The symbol's name
-   *
-   * \return A function pointer for the specified symbol
-   */
-  game_proc_address_t HwGetProcAddress(const char* sym)
-  {
-    return m_callbacks->toKodi.HwGetProcAddress(m_callbacks->toKodi.kodiInstance, sym);
-  }
-
-  // --- Input callbacks -------------------------------------------------------
-
-  /*!
-   * \brief Notify the port of an input event
-   *
-   * \param event The input event
-   *
-   * Input events can arrive for the following sources:
-   *   - GAME_INPUT_EVENT_MOTOR
-   *
-   * \return true if the event was handled, false otherwise
-   */
-  bool InputEvent(const game_input_event& event)
-  {
-    return m_callbacks->toKodi.InputEvent(m_callbacks->toKodi.kodiInstance, &event);
-  }
-
-private:
-  AddonCB* m_handle;
-  AddonInstance_Game* m_callbacks;
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
deleted file mode 100644
index ff51c98..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
+++ /dev/null
@@ -1,1186 +0,0 @@
-/*
- *  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 <string>
-#include <vector>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "libXBMC_addon.h"
-
-typedef void* GUIHANDLE;
-
-namespace KodiAPI
-{
-namespace GUI
-{
-
-typedef struct CB_GUILib
-{
-  void (*Lock)();
-  void (*Unlock)();
-  int (*GetScreenHeight)();
-  int (*GetScreenWidth)();
-  int (*GetVideoResolution)();
-  GUIHANDLE (*Window_New)(void *addonData, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
-  void (*Window_Delete)(void *addonData, GUIHANDLE handle);
-  void (*Window_SetCallbacks)(void *addonData, GUIHANDLE handle, GUIHANDLE clienthandle, bool (*)(GUIHANDLE handle), bool (*)(GUIHANDLE handle, int), bool (*)(GUIHANDLE handle, int), bool (*)(GUIHANDLE handle, int));
-  bool (*Window_Show)(void *addonData, GUIHANDLE handle);
-  bool (*Window_Close)(void *addonData, GUIHANDLE handle);
-  bool (*Window_DoModal)(void *addonData, GUIHANDLE handle);
-  bool (*Window_SetFocusId)(void *addonData, GUIHANDLE handle, int iControlId);
-  int (*Window_GetFocusId)(void *addonData, GUIHANDLE handle);
-  bool (*Window_SetCoordinateResolution)(void *addonData, GUIHANDLE handle, int res);
-  void (*Window_SetProperty)(void *addonData, GUIHANDLE handle, const char *key, const char *value);
-  void (*Window_SetPropertyInt)(void *addonData, GUIHANDLE handle, const char *key, int value);
-  void (*Window_SetPropertyBool)(void *addonData, GUIHANDLE handle, const char *key, bool value);
-  void (*Window_SetPropertyDouble)(void *addonData, GUIHANDLE handle, const char *key, double value);
-  const char* (*Window_GetProperty)(void *addonData, GUIHANDLE handle, const char *key);
-  int (*Window_GetPropertyInt)(void *addonData, GUIHANDLE handle, const char *key);
-  bool (*Window_GetPropertyBool)(void *addonData, GUIHANDLE handle, const char *key);
-  double (*Window_GetPropertyDouble)(void *addonData, GUIHANDLE handle, const char *key);
-  void (*Window_ClearProperties)(void *addonData, GUIHANDLE handle);
-  int (*Window_GetListSize)(void *addonData, GUIHANDLE handle);
-  void (*Window_ClearList)(void *addonData, GUIHANDLE handle);
-  GUIHANDLE (*Window_AddItem)(void *addonData, GUIHANDLE handle, GUIHANDLE item, int itemPosition);
-  GUIHANDLE (*Window_AddStringItem)(void *addonData, GUIHANDLE handle, const char *itemName, int itemPosition);
-  void (*Window_RemoveItem)(void *addonData, GUIHANDLE handle, int itemPosition);
-  GUIHANDLE (*Window_GetListItem)(void *addonData, GUIHANDLE handle, int listPos);
-  void (*Window_SetCurrentListPosition)(void *addonData, GUIHANDLE handle, int listPos);
-  int (*Window_GetCurrentListPosition)(void *addonData, GUIHANDLE handle);
-  GUIHANDLE (*Window_GetControl_Spin)(void *addonData, GUIHANDLE handle, int controlId);
-  GUIHANDLE (*Window_GetControl_Button)(void *addonData, GUIHANDLE handle, int controlId);
-  GUIHANDLE (*Window_GetControl_RadioButton)(void *addonData, GUIHANDLE handle, int controlId);
-  GUIHANDLE (*Window_GetControl_Edit)(void *addonData, GUIHANDLE handle, int controlId);
-  GUIHANDLE (*Window_GetControl_Progress)(void *addonData, GUIHANDLE handle, int controlId);
-  GUIHANDLE (*Window_GetControl_RenderAddon)(void *addonData, GUIHANDLE handle, int controlId);
-  void (*Window_SetControlLabel)(void *addonData, GUIHANDLE handle, int controlId, const char *label);
-  void (*Window_MarkDirtyRegion)(void *addonData, GUIHANDLE handle);
-  void (*Control_Spin_SetVisible)(void *addonData, GUIHANDLE spinhandle, bool yesNo);
-  void (*Control_Spin_SetText)(void *addonData, GUIHANDLE spinhandle, const char *label);
-  void (*Control_Spin_Clear)(void *addonData, GUIHANDLE spinhandle);
-  void (*Control_Spin_AddLabel)(void *addonData, GUIHANDLE spinhandle, const char *label, int iValue);
-  int (*Control_Spin_GetValue)(void *addonData, GUIHANDLE spinhandle);
-  void (*Control_Spin_SetValue)(void *addonData, GUIHANDLE spinhandle, int iValue);
-  void (*Control_RadioButton_SetVisible)(void *addonData, GUIHANDLE handle, bool yesNo);
-  void (*Control_RadioButton_SetText)(void *addonData, GUIHANDLE handle, const char *label);
-  void (*Control_RadioButton_SetSelected)(void *addonData, GUIHANDLE handle, bool yesNo);
-  bool (*Control_RadioButton_IsSelected)(void *addonData, GUIHANDLE handle);
-  void (*Control_Progress_SetPercentage)(void *addonData, GUIHANDLE handle, float fPercent);
-  float (*Control_Progress_GetPercentage)(void *addonData, GUIHANDLE handle);
-  void (*Control_Progress_SetInfo)(void *addonData, GUIHANDLE handle, int iInfo);
-  int (*Control_Progress_GetInfo)(void *addonData, GUIHANDLE handle);
-  const char* (*Control_Progress_GetDescription)(void *addonData, GUIHANDLE handle);
-  GUIHANDLE (*Window_GetControl_Slider)(void *addonData, GUIHANDLE handle, int controlId);
-  void (*Control_Slider_SetVisible)(void *addonData, GUIHANDLE handle, bool yesNo);
-  const char *(*Control_Slider_GetDescription)(void *addonData, GUIHANDLE handle);
-  void (*Control_Slider_SetIntRange)(void *addonData, GUIHANDLE handle, int iStart, int iEnd);
-  void (*Control_Slider_SetIntValue)(void *addonData, GUIHANDLE handle, int iValue);
-  int (*Control_Slider_GetIntValue)(void *addonData, GUIHANDLE handle);
-  void (*Control_Slider_SetIntInterval)(void *addonData, GUIHANDLE handle, int iInterval);
-  void (*Control_Slider_SetPercentage)(void *addonData, GUIHANDLE handle, float fPercent);
-  float (*Control_Slider_GetPercentage)(void *addonData, GUIHANDLE handle);
-  void (*Control_Slider_SetFloatRange)(void *addonData, GUIHANDLE handle, float fStart, float fEnd);
-  void (*Control_Slider_SetFloatValue)(void *addonData, GUIHANDLE handle, float fValue);
-  float (*Control_Slider_GetFloatValue)(void *addonData, GUIHANDLE handle);
-  void (*Control_Slider_SetFloatInterval)(void *addonData, GUIHANDLE handle, float fInterval);
-  GUIHANDLE (*Window_GetControl_SettingsSlider)(void *addonData, GUIHANDLE handle, int controlId);
-  void (*Control_SettingsSlider_SetVisible)(void *addonData, GUIHANDLE handle, bool yesNo);
-  void (*Control_SettingsSlider_SetText)(void *addonData, GUIHANDLE handle, const char *label);
-  const char *(*Control_SettingsSlider_GetDescription)(void *addonData, GUIHANDLE handle);
-  void (*Control_SettingsSlider_SetIntRange)(void *addonData, GUIHANDLE handle, int iStart, int iEnd);
-  void (*Control_SettingsSlider_SetIntValue)(void *addonData, GUIHANDLE handle, int iValue);
-  int (*Control_SettingsSlider_GetIntValue)(void *addonData, GUIHANDLE handle);
-  void (*Control_SettingsSlider_SetIntInterval)(void *addonData, GUIHANDLE handle, int iInterval);
-  void (*Control_SettingsSlider_SetPercentage)(void *addonData, GUIHANDLE handle, float fPercent);
-  float (*Control_SettingsSlider_GetPercentage)(void *addonData, GUIHANDLE handle);
-  void (*Control_SettingsSlider_SetFloatRange)(void *addonData, GUIHANDLE handle, float fStart, float fEnd);
-  void (*Control_SettingsSlider_SetFloatValue)(void *addonData, GUIHANDLE handle, float fValue);
-  float (*Control_SettingsSlider_GetFloatValue)(void *addonData, GUIHANDLE handle);
-  void (*Control_SettingsSlider_SetFloatInterval)(void *addonData, GUIHANDLE handle, float fInterval);
-  GUIHANDLE (*ListItem_Create)(void *addonData, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
-  const char* (*ListItem_GetLabel)(void *addonData, GUIHANDLE handle);
-  void (*ListItem_SetLabel)(void *addonData, GUIHANDLE handle, const char *label);
-  const char* (*ListItem_GetLabel2)(void *addonData, GUIHANDLE handle);
-  void (*ListItem_SetLabel2)(void *addonData, GUIHANDLE handle, const char *label);
-  void (*ListItem_SetIconImage)(void *addonData, GUIHANDLE handle, const char *image);
-  void (*ListItem_SetThumbnailImage)(void *addonData, GUIHANDLE handle, const char *image);
-  void (*ListItem_SetInfo)(void *addonData, GUIHANDLE handle, const char *info);
-  void (*ListItem_SetProperty)(void *addonData, GUIHANDLE handle, const char *key, const char *value);
-  const char* (*ListItem_GetProperty)(void *addonData, GUIHANDLE handle, const char *key);
-  void (*ListItem_SetPath)(void *addonData, GUIHANDLE handle, const char *path);
-  void (*RenderAddon_SetCallbacks)(void *addonData, GUIHANDLE handle, GUIHANDLE clienthandle, bool (*createCB)(GUIHANDLE,int,int,int,int,void*), void (*renderCB)(GUIHANDLE), void (*stopCB)(GUIHANDLE), bool (*dirtyCB)(GUIHANDLE));
-  void (*RenderAddon_Delete)(void *addonData, GUIHANDLE handle);
-  void (*RenderAddon_MarkDirty)(void *addonData, GUIHANDLE handle);
-
-  bool (*Dialog_Keyboard_ShowAndGetInputWithHead)(char &strTextString, unsigned int iMaxStringSize, const char *heading, bool allowEmptyResult, bool hiddenInput, unsigned int autoCloseMs);
-  bool (*Dialog_Keyboard_ShowAndGetInput)(char &strTextString, unsigned int iMaxStringSize, bool allowEmptyResult, unsigned int autoCloseMs);
-  bool (*Dialog_Keyboard_ShowAndGetNewPasswordWithHead)(char &newPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs);
-  bool (*Dialog_Keyboard_ShowAndGetNewPassword)(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs);
-  bool (*Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead)(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmpty, unsigned int autoCloseMs);
-  bool (*Dialog_Keyboard_ShowAndVerifyNewPassword)(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs);
-  int (*Dialog_Keyboard_ShowAndVerifyPassword)(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs);
-  bool (*Dialog_Keyboard_ShowAndGetFilter)(char &aTextString, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs);
-  bool (*Dialog_Keyboard_SendTextToActiveKeyboard)(const char *aTextString, bool closeKeyboard);
-  bool (*Dialog_Keyboard_isKeyboardActivated)();
-
-  bool (*Dialog_Numeric_ShowAndVerifyNewPassword)(char &strNewPassword, unsigned int iMaxStringSize);
-  int (*Dialog_Numeric_ShowAndVerifyPassword)(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries);
-  bool (*Dialog_Numeric_ShowAndVerifyInput)(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, bool bGetUserInput);
-  bool (*Dialog_Numeric_ShowAndGetTime)(tm &time, const char *strHeading);
-  bool (*Dialog_Numeric_ShowAndGetDate)(tm &date, const char *strHeading);
-  bool (*Dialog_Numeric_ShowAndGetIPAddress)(char &strIPAddress, unsigned int iMaxStringSize, const char *strHeading);
-  bool (*Dialog_Numeric_ShowAndGetNumber)(char &strInput, unsigned int iMaxStringSize, const char *strHeading, unsigned int iAutoCloseTimeoutMs);
-  bool (*Dialog_Numeric_ShowAndGetSeconds)(char &timeString, unsigned int iMaxStringSize, const char *strHeading);
-
-  bool (*Dialog_FileBrowser_ShowAndGetFile)(const char *directory, const char *mask, const char *heading, char &path, unsigned int iMaxStringSize, bool useThumbs, bool useFileDirectories, bool singleList);
-
-  void (*Dialog_OK_ShowAndGetInputSingleText)(const char *heading, const char *text);
-  void (*Dialog_OK_ShowAndGetInputLineText)(const char *heading, const char *line0, const char *line1, const char *line2);
-
-  bool (*Dialog_YesNo_ShowAndGetInputSingleText)(const char *heading, const char *text, bool& bCanceled, const char *noLabel, const char *yesLabel);
-  bool (*Dialog_YesNo_ShowAndGetInputLineText)(const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel, const char *yesLabel);
-  bool (*Dialog_YesNo_ShowAndGetInputLineButtonText)(const char *heading, const char *line0, const char *line1, const char *line2, bool &bCanceled, const char *noLabel, const char *yesLabel);
-
-  void (*Dialog_TextViewer)(const char *heading, const char *text);
-
-  int (*Dialog_Select)(const char *heading, const char *entries[], unsigned int size, int selected);
-} CB_GUILib;
-
-} /* namespace GUI */
-} /* namespace KodiAPI */
-
-
-#define ADDON_ACTION_PREVIOUS_MENU          10
-#define ADDON_ACTION_CLOSE_DIALOG           51
-#define ADDON_ACTION_NAV_BACK               92
-
-class CAddonGUIControlBase
-{
-public:
-  GUIHANDLE GetControlHandle() const { return m_controlHandle; }
-
-protected:
-  CAddonGUIControlBase(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIControlBase* window)
-  : m_controlHandle(nullptr), m_Handle(hdl), m_cb(cb), m_Window(window) {}
-  virtual ~CAddonGUIControlBase() = default;
-
-  GUIHANDLE m_controlHandle;
-  AddonCB* m_Handle;
-  KodiAPI::GUI::CB_GUILib* m_cb;
-  CAddonGUIControlBase* m_Window;
-
-private:
-  CAddonGUIControlBase() = delete;
-  CAddonGUIControlBase(const CAddonGUIControlBase&) = delete;
-  CAddonGUIControlBase &operator=(const CAddonGUIControlBase&) = delete;
-};
-
-class CAddonListItem : public CAddonGUIControlBase
-{
-public:
-  CAddonListItem(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path)
-    : CAddonGUIControlBase(hdl, cb, nullptr)
-  {
-    m_controlHandle = m_cb->ListItem_Create(m_Handle->addonData, label, label2, iconImage, thumbnailImage, path);
-  }
-
-  ~CAddonListItem() override = default;
-
-  const char *GetLabel()
-  {
-    if (!m_controlHandle)
-      return "";
-
-    return m_cb->ListItem_GetLabel(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetLabel(const char *label)
-  {
-    if (m_controlHandle)
-      m_cb->ListItem_SetLabel(m_Handle->addonData, m_controlHandle, label);
-  }
-
-  const char *GetLabel2()
-  {
-    if (!m_controlHandle)
-      return "";
-
-    return m_cb->ListItem_GetLabel2(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetLabel2(const char *label)
-  {
-    if (m_controlHandle)
-      m_cb->ListItem_SetLabel2(m_Handle->addonData, m_controlHandle, label);
-  }
-
-  void SetIconImage(const char *image)
-  {
-    if (m_controlHandle)
-      m_cb->ListItem_SetIconImage(m_Handle->addonData, m_controlHandle, image);
-  }
-
-  void SetThumbnailImage(const char *image)
-  {
-    if (m_controlHandle)
-      m_cb->ListItem_SetThumbnailImage(m_Handle->addonData, m_controlHandle, image);
-  }
-
-  void SetInfo(const char *Info)
-  {
-    if (m_controlHandle)
-      m_cb->ListItem_SetInfo(m_Handle->addonData, m_controlHandle, Info);
-  }
-
-  void SetProperty(const char *key, const char *value)
-  {
-    if (m_controlHandle)
-      m_cb->ListItem_SetProperty(m_Handle->addonData, m_controlHandle, key, value);
-  }
-
-  const char *GetProperty(const char *key) const
-  {
-    if (!m_controlHandle)
-      return "";
-
-    return m_cb->ListItem_GetProperty(m_Handle->addonData, m_controlHandle, key);
-  }
-
-  void SetPath(const char *Path)
-  {
-    if (m_controlHandle)
-      m_cb->ListItem_SetPath(m_Handle->addonData, m_controlHandle, Path);
-  }
-};
-
-class CAddonGUIWindow : public CAddonGUIControlBase
-{
-public:
-  CAddonGUIWindow(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog)
-    : CAddonGUIControlBase(hdl, cb, nullptr)
-    , m_cbhdl(nullptr)
-    , CBOnInit(nullptr)
-    , CBOnFocus(nullptr)
-    , CBOnClick(nullptr)
-    , CBOnAction(nullptr)
-  {
-    if (hdl && cb)
-    {
-      m_controlHandle = m_cb->Window_New(m_Handle->addonData, xmlFilename, defaultSkin, forceFallback, asDialog);
-      if (!m_controlHandle)
-        fprintf(stderr, "libKODI_guilib: ERROR: Can't create window class !!!\n");
-
-      m_cb->Window_SetCallbacks(m_Handle->addonData, m_controlHandle, this, OnInitCB, OnClickCB, OnFocusCB, OnActionCB);
-    }
-  }
-
-  ~CAddonGUIWindow() override
-  {
-    if (m_Handle && m_cb && m_controlHandle)
-    {
-      m_cb->Window_Delete(m_Handle->addonData, m_controlHandle);
-      m_controlHandle = nullptr;
-    }
-  }
-
-  bool Show()
-  {
-    return m_cb->Window_Show(m_Handle->addonData, m_controlHandle);
-  }
-
-  void Close()
-  {
-    m_cb->Window_Close(m_Handle->addonData, m_controlHandle);
-  }
-
-  void DoModal()
-  {
-    m_cb->Window_DoModal(m_Handle->addonData, m_controlHandle);
-  }
-
-  bool SetFocusId(int iControlId)
-  {
-    return m_cb->Window_SetFocusId(m_Handle->addonData, m_controlHandle, iControlId);
-  }
-
-  int GetFocusId()
-  {
-    return m_cb->Window_GetFocusId(m_Handle->addonData, m_controlHandle);
-  }
-
-  bool SetCoordinateResolution(int res)
-  {
-    return m_cb->Window_SetCoordinateResolution(m_Handle->addonData, m_controlHandle, res);
-  }
-
-  void SetProperty(const char *key, const char *value)
-  {
-    m_cb->Window_SetProperty(m_Handle->addonData, m_controlHandle, key, value);
-  }
-
-  void SetPropertyInt(const char *key, int value)
-  {
-    m_cb->Window_SetPropertyInt(m_Handle->addonData, m_controlHandle, key, value);
-  }
-
-  void SetPropertyBool(const char *key, bool value)
-  {
-    m_cb->Window_SetPropertyBool(m_Handle->addonData, m_controlHandle, key, value);
-  }
-
-  void SetPropertyDouble(const char *key, double value)
-  {
-    m_cb->Window_SetPropertyDouble(m_Handle->addonData, m_controlHandle, key, value);
-  }
-
-  const char *GetProperty(const char *key) const
-  {
-    return m_cb->Window_GetProperty(m_Handle->addonData, m_controlHandle, key);
-  }
-
-  int GetPropertyInt(const char *key) const
-  {
-    return m_cb->Window_GetPropertyInt(m_Handle->addonData, m_controlHandle, key);
-  }
-
-  bool GetPropertyBool(const char *key) const
-  {
-    return m_cb->Window_GetPropertyBool(m_Handle->addonData, m_controlHandle, key);
-  }
-
-  double GetPropertyDouble(const char *key) const
-  {
-    return m_cb->Window_GetPropertyDouble(m_Handle->addonData, m_controlHandle, key);
-  }
-
-  void ClearProperties()
-  {
-    m_cb->Window_ClearProperties(m_Handle->addonData, m_controlHandle);
-  }
-
-  int GetListSize()
-  {
-    return m_cb->Window_GetListSize(m_Handle->addonData, m_controlHandle);
-  }
-
-  void ClearList()
-  {
-    m_cb->Window_ClearList(m_Handle->addonData, m_controlHandle);
-  }
-
-  GUIHANDLE AddStringItem(const char *name, int itemPosition = -1)
-  {
-    return m_cb->Window_AddStringItem(m_Handle->addonData, m_controlHandle, name, itemPosition);
-  }
-
-  void AddItem(GUIHANDLE item, int itemPosition = -1)
-  {
-    m_cb->Window_AddItem(m_Handle->addonData, m_controlHandle, item, itemPosition);
-  }
-
-  void AddItem(CAddonListItem *item, int itemPosition = -1)
-  {
-    m_cb->Window_AddItem(m_Handle->addonData, m_controlHandle, item->GetControlHandle(), itemPosition);
-  }
-
-  void RemoveItem(int itemPosition)
-  {
-    m_cb->Window_RemoveItem(m_Handle->addonData, m_controlHandle, itemPosition);
-  }
-
-  GUIHANDLE GetListItem(int listPos)
-  {
-    return m_cb->Window_GetListItem(m_Handle->addonData, m_controlHandle, listPos);
-  }
-
-  void SetCurrentListPosition(int listPos)
-  {
-    m_cb->Window_SetCurrentListPosition(m_Handle->addonData, m_controlHandle, listPos);
-  }
-
-  int GetCurrentListPosition()
-  {
-    return m_cb->Window_GetCurrentListPosition(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetControlLabel(int controlId, const char *label)
-  {
-    m_cb->Window_SetControlLabel(m_Handle->addonData, m_controlHandle, controlId, label);
-  }
-
-  void MarkDirtyRegion()
-  {
-    m_cb->Window_MarkDirtyRegion(m_Handle->addonData, m_controlHandle);
-  }
-
-  bool OnClick(int controlId)
-  {
-    if (!CBOnClick)
-      return false;
-
-    return CBOnClick(m_cbhdl, controlId);
-  }
-
-  bool OnFocus(int controlId)
-  {
-    if (!CBOnFocus)
-      return false;
-
-    return CBOnFocus(m_cbhdl, controlId);
-  }
-
-  bool OnInit()
-  {
-    if (!CBOnInit)
-      return false;
-
-    return CBOnInit(m_cbhdl);
-  }
-
-  bool OnAction(int actionId)
-  {
-    if (!CBOnAction)
-      return false;
-
-    return CBOnAction(m_cbhdl, actionId);
-  }
-
-  GUIHANDLE m_cbhdl;
-  bool (*CBOnInit)(GUIHANDLE cbhdl);
-  bool (*CBOnFocus)(GUIHANDLE cbhdl, int controlId);
-  bool (*CBOnClick)(GUIHANDLE cbhdl, int controlId);
-  bool (*CBOnAction)(GUIHANDLE cbhdl, int actionId);
-
-protected:
-  static bool OnInitCB(GUIHANDLE cbhdl);
-  static bool OnFocusCB(GUIHANDLE cbhdl, int controlId);
-  static bool OnClickCB(GUIHANDLE cbhdl, int controlId);
-  static bool OnActionCB(GUIHANDLE cbhdl, int actionId);
-};
-
-
-inline bool CAddonGUIWindow::OnInitCB(GUIHANDLE cbhdl)
-{
-  return static_cast<CAddonGUIWindow*>(cbhdl)->OnInit();
-}
-
-inline bool CAddonGUIWindow::OnClickCB(GUIHANDLE cbhdl, int controlId)
-{
-  return static_cast<CAddonGUIWindow*>(cbhdl)->OnClick(controlId);
-}
-
-inline bool CAddonGUIWindow::OnFocusCB(GUIHANDLE cbhdl, int controlId)
-{
-  return static_cast<CAddonGUIWindow*>(cbhdl)->OnFocus(controlId);
-}
-
-inline bool CAddonGUIWindow::OnActionCB(GUIHANDLE cbhdl, int actionId)
-{
-  return static_cast<CAddonGUIWindow*>(cbhdl)->OnAction(actionId);
-}
-
-class CAddonGUISpinControl: public CAddonGUIControlBase
-{
-public:
-  CAddonGUISpinControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
-    : CAddonGUIControlBase(hdl, cb, window)
-  {
-    m_controlHandle = m_cb->Window_GetControl_Spin(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
-  }
-  ~CAddonGUISpinControl(void) override = default;
-
-  void SetVisible(bool yesNo)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Spin_SetVisible(m_Handle->addonData, m_controlHandle, yesNo);
-  }
-
-  void SetText(const char *label)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Spin_SetText(m_Handle->addonData, m_controlHandle, label);
-  }
-
-  void Clear()
-  {
-    if (m_controlHandle)
-      m_cb->Control_Spin_Clear(m_Handle->addonData, m_controlHandle);
-  }
-
-  void AddLabel(const char *label, int iValue)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Spin_AddLabel(m_Handle->addonData, m_controlHandle, label, iValue);
-  }
-
-  int GetValue()
-  {
-    if (!m_controlHandle)
-      return -1;
-
-    return m_cb->Control_Spin_GetValue(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetValue(int iValue)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Spin_SetValue(m_Handle->addonData, m_controlHandle, iValue);
-  }
-};
-
-class CAddonGUIRadioButton : public CAddonGUIControlBase
-{
-public:
-  CAddonGUIRadioButton(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
-    : CAddonGUIControlBase(hdl, cb, window)
-  {
-    m_controlHandle = m_cb->Window_GetControl_RadioButton(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
-  }
-  ~CAddonGUIRadioButton() override = default;
-
-  void SetVisible(bool yesNo)
-  {
-    if (m_controlHandle)
-      m_cb->Control_RadioButton_SetVisible(m_Handle->addonData, m_controlHandle, yesNo);
-  }
-
-  void SetText(const char *label)
-  {
-    if (m_controlHandle)
-      m_cb->Control_RadioButton_SetText(m_Handle->addonData, m_controlHandle, label);
-  }
-
-  void SetSelected(bool yesNo)
-  {
-    if (m_controlHandle)
-      m_cb->Control_RadioButton_SetSelected(m_Handle->addonData, m_controlHandle, yesNo);
-  }
-
-  bool IsSelected()
-  {
-    if (!m_controlHandle)
-      return false;
-
-    return m_cb->Control_RadioButton_IsSelected(m_Handle->addonData, m_controlHandle);
-  }
-};
-
-class CAddonGUIProgressControl : public CAddonGUIControlBase
-{
-public:
-  CAddonGUIProgressControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
-    : CAddonGUIControlBase(hdl, cb, window)
-  {
-    m_controlHandle = m_cb->Window_GetControl_Progress(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
-  }
-
-  ~CAddonGUIProgressControl(void) override = default;
-
-  void SetPercentage(float fPercent)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Progress_SetPercentage(m_Handle->addonData, m_controlHandle, fPercent);
-  }
-
-  float GetPercentage() const
-  {
-    if (!m_controlHandle)
-      return 0.0f;
-
-    return m_cb->Control_Progress_GetPercentage(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetInfo(int iInfo)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Progress_SetInfo(m_Handle->addonData, m_controlHandle, iInfo);
-  }
-
-  int GetInfo() const
-  {
-    if (!m_controlHandle)
-      return -1;
-
-    return m_cb->Control_Progress_GetInfo(m_Handle->addonData, m_controlHandle);
-  }
-
-  std::string GetDescription() const
-  {
-    if (!m_controlHandle)
-      return "";
-
-    return m_cb->Control_Progress_GetDescription(m_Handle->addonData, m_controlHandle);
-  }
-};
-
-class CAddonGUISliderControl : public CAddonGUIControlBase
-{
-public:
-  CAddonGUISliderControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
-    : CAddonGUIControlBase(hdl, cb, window)
-  {
-    m_controlHandle = m_cb->Window_GetControl_Slider(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
-  }
-
-  ~CAddonGUISliderControl(void) override = default;
-
-  void SetVisible(bool yesNo)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Slider_SetVisible(m_Handle->addonData, m_controlHandle, yesNo);
-  }
-
-  std::string GetDescription() const
-  {
-    if (!m_controlHandle)
-      return "";
-
-    return m_cb->Control_Slider_GetDescription(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetIntRange(int iStart, int iEnd)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Slider_SetIntRange(m_Handle->addonData, m_controlHandle, iStart, iEnd);
-  }
-
-  void SetIntValue(int iValue)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Slider_SetIntValue(m_Handle->addonData, m_controlHandle, iValue);
-  }
-
-  int GetIntValue() const
-  {
-    if (!m_controlHandle)
-      return 0;
-    return m_cb->Control_Slider_GetIntValue(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetIntInterval(int iInterval)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Slider_SetIntInterval(m_Handle->addonData, m_controlHandle, iInterval);
-  }
-
-  void SetPercentage(float fPercent)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Slider_SetPercentage(m_Handle->addonData, m_controlHandle, fPercent);
-  }
-
-  float GetPercentage() const
-  {
-    if (!m_controlHandle)
-      return 0.0f;
-
-    return m_cb->Control_Slider_GetPercentage(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetFloatRange(float fStart, float fEnd)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Slider_SetFloatRange(m_Handle->addonData, m_controlHandle, fStart, fEnd);
-  }
-
-  void SetFloatValue(float fValue)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Slider_SetFloatValue(m_Handle->addonData, m_controlHandle, fValue);
-  }
-
-  float GetFloatValue() const
-  {
-    if (!m_controlHandle)
-      return 0.0f;
-    return m_cb->Control_Slider_GetFloatValue(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetFloatInterval(float fInterval)
-  {
-    if (m_controlHandle)
-      m_cb->Control_Slider_SetFloatInterval(m_Handle->addonData, m_controlHandle, fInterval);
-  }
-};
-
-class CAddonGUISettingsSliderControl : public CAddonGUIControlBase
-{
-public:
-  CAddonGUISettingsSliderControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
-    : CAddonGUIControlBase(hdl, cb, window)
-  {
-    m_controlHandle = m_cb->Window_GetControl_SettingsSlider(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
-  }
-
-  ~CAddonGUISettingsSliderControl(void) override = default;
-
-  void SetVisible(bool yesNo)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetVisible(m_Handle->addonData, m_controlHandle, yesNo);
-  }
-
-  void SetText(const char *label)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetText(m_Handle->addonData, m_controlHandle, label);
-  }
-
-  std::string GetDescription() const
-  {
-    if (!m_controlHandle)
-      return "";
-
-    return m_cb->Control_SettingsSlider_GetDescription(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetIntRange(int iStart, int iEnd)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetIntRange(m_Handle->addonData, m_controlHandle, iStart, iEnd);
-  }
-
-  void SetIntValue(int iValue)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetIntValue(m_Handle->addonData, m_controlHandle, iValue);
-  }
-
-  int GetIntValue() const
-  {
-    if (!m_controlHandle)
-      return 0;
-    return m_cb->Control_SettingsSlider_GetIntValue(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetIntInterval(int iInterval)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetIntInterval(m_Handle->addonData, m_controlHandle, iInterval);
-  }
-
-  void SetPercentage(float fPercent)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetPercentage(m_Handle->addonData, m_controlHandle, fPercent);
-  }
-
-  float GetPercentage() const
-  {
-    if (!m_controlHandle)
-      return 0.0f;
-
-    return m_cb->Control_SettingsSlider_GetPercentage(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetFloatRange(float fStart, float fEnd)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetFloatRange(m_Handle->addonData, m_controlHandle, fStart, fEnd);
-  }
-
-  void SetFloatValue(float fValue)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetFloatValue(m_Handle->addonData, m_controlHandle, fValue);
-  }
-
-  float GetFloatValue() const
-  {
-    if (!m_controlHandle)
-      return 0.0f;
-    return m_cb->Control_SettingsSlider_GetFloatValue(m_Handle->addonData, m_controlHandle);
-  }
-
-  void SetFloatInterval(float fInterval)
-  {
-    if (m_controlHandle)
-      m_cb->Control_SettingsSlider_SetFloatInterval(m_Handle->addonData, m_controlHandle, fInterval);
-  }
-};
-
-class CAddonGUIRenderingControl : public CAddonGUIControlBase
-{
-public:
-  CAddonGUIRenderingControl(AddonCB* hdl, KodiAPI::GUI::CB_GUILib* cb, CAddonGUIWindow *window, int controlId)
-    : CAddonGUIControlBase(hdl, cb, window)
-    , m_cbhdl(nullptr)
-    , CBCreate(nullptr)
-    , CBRender(nullptr)
-    , CBStop(nullptr)
-    , CBDirty(nullptr)
-  {
-    m_controlHandle = m_cb->Window_GetControl_RenderAddon(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
-  }
-
-  ~CAddonGUIRenderingControl() override
-  {
-    m_cb->RenderAddon_Delete(m_Handle->addonData, m_controlHandle);
-  }
-
-  void Init()
-  {
-    m_cb->RenderAddon_SetCallbacks(m_Handle->addonData, m_controlHandle, this, OnCreateCB, OnRenderCB, OnStopCB, OnDirtyCB);
-  }
-
-  bool Create(int x, int y, int w, int h, void *device)
-  {
-    if (!CBCreate)
-      return false;
-
-    return CBCreate(m_cbhdl, x, y, w, h, device);
-  }
-
-  void Render()
-  {
-    if (!CBRender)
-      return;
-
-    CBRender(m_cbhdl);
-  }
-
-  void Stop()
-  {
-    if (!CBStop)
-      return;
-
-    CBStop(m_cbhdl);
-  }
-
-  bool Dirty()
-  {
-    if (!CBDirty)
-      return true;
-
-    return CBDirty(m_cbhdl);
-  }
-
-  GUIHANDLE m_cbhdl;
-  bool (*CBCreate)(GUIHANDLE cbhdl, int x, int y, int w, int h, void *device);
-  void (*CBRender)(GUIHANDLE cbhdl);
-  void (*CBStop)(GUIHANDLE cbhdl);
-  bool (*CBDirty)(GUIHANDLE cbhdl);
-
-private:
-  static bool OnCreateCB(GUIHANDLE cbhdl, int x, int y, int w, int h, void* device);
-  static void OnRenderCB(GUIHANDLE cbhdl);
-  static void OnStopCB(GUIHANDLE cbhdl);
-  static bool OnDirtyCB(GUIHANDLE cbhdl);
-};
-
-inline bool CAddonGUIRenderingControl::OnCreateCB(GUIHANDLE cbhdl, int x, int y, int w, int h, void* device)
-{
-  return static_cast<CAddonGUIRenderingControl*>(cbhdl)->Create(x, y, w, h, device);
-}
-
-inline void CAddonGUIRenderingControl::OnRenderCB(GUIHANDLE cbhdl)
-{
-  static_cast<CAddonGUIRenderingControl*>(cbhdl)->Render();
-}
-
-inline void CAddonGUIRenderingControl::OnStopCB(GUIHANDLE cbhdl)
-{
-  static_cast<CAddonGUIRenderingControl*>(cbhdl)->Stop();
-}
-
-inline bool CAddonGUIRenderingControl::OnDirtyCB(GUIHANDLE cbhdl)
-{
-  return static_cast<CAddonGUIRenderingControl*>(cbhdl)->Dirty();
-}
-
-class CHelper_libKODI_guilib
-{
-public:
-  CHelper_libKODI_guilib()
-  {
-    m_Handle = nullptr;
-    m_Callbacks = nullptr;
-  }
-
-  ~CHelper_libKODI_guilib()
-  {
-    if (m_Handle && m_Callbacks)
-    {
-      m_Handle->GUILib_UnRegisterMe(m_Handle->addonData, m_Callbacks);
-    }
-  }
-
-  bool RegisterMe(void *handle)
-  {
-    m_Handle = static_cast<AddonCB*>(handle);
-    if (m_Handle)
-      m_Callbacks = (KodiAPI::GUI::CB_GUILib*)m_Handle->GUILib_RegisterMe(m_Handle->addonData);
-    if (!m_Callbacks)
-      fprintf(stderr, "libKODI_guilib-ERROR: GUILib_RegisterMe can't get callback table from Kodi !!!\n");
-
-    return m_Callbacks != nullptr;
-  }
-
-  void Lock()
-  {
-    m_Callbacks->Lock();
-  }
-
-  void Unlock()
-  {
-    m_Callbacks->Unlock();
-  }
-
-  int GetScreenHeight()
-  {
-    return m_Callbacks->GetScreenHeight();
-  }
-
-  int GetScreenWidth()
-  {
-    return m_Callbacks->GetScreenWidth();
-  }
-
-  int GetVideoResolution()
-  {
-    return m_Callbacks->GetVideoResolution();
-  }
-
-  CAddonGUIWindow* Window_create(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog)
-  {
-    return new CAddonGUIWindow(m_Handle, m_Callbacks, xmlFilename, defaultSkin, forceFallback, asDialog);
-  }
-
-  void Window_destroy(CAddonGUIWindow* p)
-  {
-    delete p;
-  }
-
-  CAddonGUISpinControl* Control_getSpin(CAddonGUIWindow *window, int controlId)
-  {
-    return new CAddonGUISpinControl(m_Handle, m_Callbacks, window, controlId);
-  }
-
-  void Control_releaseSpin(CAddonGUISpinControl* p)
-  {
-    delete p;
-  }
-
-  CAddonGUIRadioButton* Control_getRadioButton(CAddonGUIWindow *window, int controlId)
-  {
-    return new CAddonGUIRadioButton(m_Handle, m_Callbacks, window, controlId);
-  }
-
-  void Control_releaseRadioButton(CAddonGUIRadioButton* p)
-  {
-    delete p;
-  }
-
-  CAddonGUIProgressControl* Control_getProgress(CAddonGUIWindow *window, int controlId)
-  {
-    return new CAddonGUIProgressControl(m_Handle, m_Callbacks, window, controlId);
-  }
-
-  void Control_releaseProgress(CAddonGUIProgressControl* p)
-  {
-    delete p;
-  }
-
-  CAddonListItem* ListItem_create(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path)
-  {
-    return new CAddonListItem(m_Handle, m_Callbacks, label, label2, iconImage, thumbnailImage, path);
-  }
-
-  void ListItem_destroy(CAddonListItem* p)
-  {
-    delete p;
-  }
-
-  CAddonGUIRenderingControl* Control_getRendering(CAddonGUIWindow *window, int controlId)
-  {
-    return new CAddonGUIRenderingControl(m_Handle, m_Callbacks, window, controlId);
-  }
-
-  void Control_releaseRendering(CAddonGUIRenderingControl* p)
-  {
-    delete p;
-  }
-
-  CAddonGUISliderControl* Control_getSlider(CAddonGUIWindow *window, int controlId)
-  {
-    return new CAddonGUISliderControl(m_Handle, m_Callbacks, window, controlId);
-  }
-
-  void Control_releaseSlider(CAddonGUISliderControl* p)
-  {
-    delete p;
-  }
-
-  CAddonGUISettingsSliderControl* Control_getSettingsSlider(CAddonGUIWindow *window, int controlId)
-  {
-    return new CAddonGUISettingsSliderControl(m_Handle, m_Callbacks, window, controlId);
-  }
-
-  void Control_releaseSettingsSlider(CAddonGUISettingsSliderControl* p)
-  {
-    delete p;
-  }
-
-  /*! @name GUI Keyboard functions */
-  //@{
-  bool Dialog_Keyboard_ShowAndGetInput(char &strText, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, bool hiddenInput, unsigned int autoCloseMs = 0)
-  {
-    return m_Callbacks->Dialog_Keyboard_ShowAndGetInputWithHead(strText, iMaxStringSize, strHeading, allowEmptyResult, hiddenInput, autoCloseMs);
-  }
-
-  bool Dialog_Keyboard_ShowAndGetInput(char &strText, unsigned int iMaxStringSize, bool allowEmptyResult, unsigned int autoCloseMs = 0)
-  {
-    return m_Callbacks->Dialog_Keyboard_ShowAndGetInput(strText, iMaxStringSize, allowEmptyResult, autoCloseMs);
-  }
-
-  bool Dialog_Keyboard_ShowAndGetNewPassword(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs = 0)
-  {
-    return m_Callbacks->Dialog_Keyboard_ShowAndGetNewPasswordWithHead(strNewPassword, iMaxStringSize, strHeading, allowEmptyResult, autoCloseMs);
-  }
-
-  bool Dialog_Keyboard_ShowAndGetNewPassword(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs = 0)
-  {
-    return m_Callbacks->Dialog_Keyboard_ShowAndGetNewPassword(strNewPassword, iMaxStringSize, autoCloseMs);
-  }
-
-  bool Dialog_Keyboard_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize, const char *strHeading, bool allowEmptyResult, unsigned int autoCloseMs = 0)
-  {
-    return m_Callbacks->Dialog_Keyboard_ShowAndVerifyNewPasswordWithHead(strNewPassword, iMaxStringSize, strHeading, allowEmptyResult, autoCloseMs);
-  }
-
-  bool Dialog_Keyboard_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize, unsigned int autoCloseMs = 0)
-  {
-    return m_Callbacks->Dialog_Keyboard_ShowAndVerifyNewPassword(strNewPassword, iMaxStringSize, autoCloseMs);
-  }
-
-  int Dialog_Keyboard_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries, unsigned int autoCloseMs = 0)
-  {
-    return m_Callbacks->Dialog_Keyboard_ShowAndVerifyPassword(strPassword, iMaxStringSize, strHeading, iRetries, autoCloseMs);
-  }
-
-  bool Dialog_Keyboard_ShowAndGetFilter(char &strText, unsigned int iMaxStringSize, bool searching, unsigned int autoCloseMs = 0)
-  {
-    return m_Callbacks->Dialog_Keyboard_ShowAndGetFilter(strText, iMaxStringSize, searching, autoCloseMs);
-  }
-
-  bool Dialog_Keyboard_SendTextToActiveKeyboard(const char *aTextString, bool closeKeyboard = false)
-  {
-    return m_Callbacks->Dialog_Keyboard_SendTextToActiveKeyboard(aTextString, closeKeyboard);
-  }
-
-  bool Dialog_Keyboard_isKeyboardActivated()
-  {
-    return m_Callbacks->Dialog_Keyboard_isKeyboardActivated();
-  }
-  //@}
-
-  /*! @name GUI Numeric functions */
-  //@{
-  bool Dialog_Numeric_ShowAndVerifyNewPassword(char &strNewPassword, unsigned int iMaxStringSize)
-  {
-    return m_Callbacks->Dialog_Numeric_ShowAndVerifyNewPassword(strNewPassword, iMaxStringSize);
-  }
-
-  int Dialog_Numeric_ShowAndVerifyPassword(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, int iRetries)
-  {
-    return m_Callbacks->Dialog_Numeric_ShowAndVerifyPassword(strPassword, iMaxStringSize, strHeading, iRetries);
-  }
-
-  bool Dialog_Numeric_ShowAndVerifyInput(char &strPassword, unsigned int iMaxStringSize, const char *strHeading, bool bGetUserInput)
-  {
-    return m_Callbacks->Dialog_Numeric_ShowAndVerifyInput(strPassword, iMaxStringSize, strHeading, bGetUserInput);
-  }
-
-  bool Dialog_Numeric_ShowAndGetTime(tm &time, const char *strHeading)
-  {
-    return m_Callbacks->Dialog_Numeric_ShowAndGetTime(time, strHeading);
-  }
-
-  bool Dialog_Numeric_ShowAndGetDate(tm &date, const char *strHeading)
-  {
-    return m_Callbacks->Dialog_Numeric_ShowAndGetDate(date, strHeading);
-  }
-
-  bool Dialog_Numeric_ShowAndGetIPAddress(char &strIPAddress, unsigned int iMaxStringSize, const char *strHeading)
-  {
-    return m_Callbacks->Dialog_Numeric_ShowAndGetIPAddress(strIPAddress, iMaxStringSize, strHeading);
-  }
-
-  bool Dialog_Numeric_ShowAndGetNumber(char &strInput, unsigned int iMaxStringSize, const char *strHeading, unsigned int iAutoCloseTimeoutMs = 0)
-  {
-    return m_Callbacks->Dialog_Numeric_ShowAndGetNumber(strInput, iMaxStringSize, strHeading, iAutoCloseTimeoutMs);
-  }
-
-  bool Dialog_Numeric_ShowAndGetSeconds(char &strTime, unsigned int iMaxStringSize, const char *strHeading)
-  {
-    return m_Callbacks->Dialog_Numeric_ShowAndGetSeconds(strTime, iMaxStringSize, strHeading);
-  }
-  //@}
-
-  /*! @name GUI File browser functions */
-  //@{
-  bool Dialog_FileBrowser_ShowAndGetFile(const char *directory, const char *mask, const char *heading, char &strPath, unsigned int iMaxStringSize, bool useThumbs = false, bool useFileDirectories = false, bool singleList = false)
-  {
-    return m_Callbacks->Dialog_FileBrowser_ShowAndGetFile(directory, mask, heading, strPath, iMaxStringSize, useThumbs, useFileDirectories, singleList);
-  }
-  //@}
-
-  /*! @name GUI OK Dialog functions */
-  //@{
-  void Dialog_OK_ShowAndGetInput(const char *heading, const char *text)
-  {
-    return m_Callbacks->Dialog_OK_ShowAndGetInputSingleText(heading, text);
-  }
-
-  void Dialog_OK_ShowAndGetInput(const char *heading, const char *line0, const char *line1, const char *line2)
-  {
-    return m_Callbacks->Dialog_OK_ShowAndGetInputLineText(heading, line0, line1, line2);
-  }
-  //@}
-
-  /*! @name GUI Yes No Dialog functions */
-  //@{
-  bool Dialog_YesNo_ShowAndGetInput(const char *heading, const char *text, bool& bCanceled, const char *noLabel = "", const char *yesLabel = "")
-  {
-    return m_Callbacks->Dialog_YesNo_ShowAndGetInputSingleText(heading, text, bCanceled, noLabel, yesLabel);
-  }
-
-  bool Dialog_YesNo_ShowAndGetInput(const char *heading, const char *line0, const char *line1, const char *line2, const char *noLabel = "", const char *yesLabel = "")
-  {
-    return m_Callbacks->Dialog_YesNo_ShowAndGetInputLineText(heading, line0, line1, line2, noLabel, yesLabel);
-  }
-
-  bool Dialog_YesNo_ShowAndGetInput(const char *heading, const char *line0, const char *line1, const char *line2, bool &bCanceled, const char *noLabel = "", const char *yesLabel = "")
-  {
-    return m_Callbacks->Dialog_YesNo_ShowAndGetInputLineButtonText(heading, line0, line1, line2, bCanceled, noLabel, yesLabel);
-  }
-  //@}
-
-  /*! @name GUI Text viewer Dialog */
-  //@{
-  void Dialog_TextViewer(const char *heading, const char *text)
-  {
-    return m_Callbacks->Dialog_TextViewer(heading, text);
-  }
-  //@}
-
-  /*! @name GUI select Dialog */
-  //@{
-  int Dialog_Select(const char *heading, const char *entries[], unsigned int size, int selected = -1)
-  {
-    return m_Callbacks->Dialog_Select(heading, entries, size, selected);
-  }
-  //@}
-
-private:
-  AddonCB* m_Handle;
-  KodiAPI::GUI::CB_GUILib* m_Callbacks;
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
deleted file mode 100644
index 43e3022..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
- *  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 <string>
-#include <vector>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdarg.h>
-
-#include "versions.h"
-#if defined(BUILD_KODI_ADDON)
-#include "IFileTypes.h"
-#else
-#include "filesystem/IFileTypes.h"
-#endif
-
-struct VFSDirEntry;
-struct __stat64;
-
-#ifdef _WIN32                   // windows
-#ifndef _SSIZE_T_DEFINED
-typedef intptr_t      ssize_t;
-#define _SSIZE_T_DEFINED
-#endif // !_SSIZE_T_DEFINED
-
-#if defined(BUILD_KODI_ADDON)
-#include "p8-platform/windows/dlfcn-win32.h"
-#endif
-#else // windows
-#include <dlfcn.h>              // linux+osx
-#endif
-
-#ifdef LOG_DEBUG
-#undef LOG_DEBUG
-#endif
-#ifdef LOG_INFO
-#undef LOG_INFO
-#endif
-#ifdef LOG_NOTICE
-#undef LOG_NOTICE
-#endif
-#ifdef LOG_ERROR
-#undef LOG_ERROR
-#endif
-
-typedef void* (*KODIAddOnLib_RegisterMe)(void *addonData);
-typedef void (*KODIAddOnLib_UnRegisterMe)(void *addonData, void *cbTable);
-typedef void* (*KODIAudioEngineLib_RegisterMe)(void *addonData);
-typedef void (*KODIAudioEngineLib_UnRegisterMe)(void *addonData, void *cbTable);
-typedef void* (*KODIGUILib_RegisterMe)(void *addonData);
-typedef void (*KODIGUILib_UnRegisterMe)(void *addonData, void *cbTable);
-typedef void* (*KODIPVRLib_RegisterMe)(void *addonData);
-typedef void (*KODIPVRLib_UnRegisterMe)(void *addonData, void *cbTable);
-typedef void* (*KODICodecLib_RegisterMe)(void *addonData);
-typedef void (*KODICodecLib_UnRegisterMe)(void *addonData, void *cbTable);
-typedef void* (*KODIINPUTSTREAMLib_RegisterMe)(void *addonData);
-typedef void (*KODIINPUTSTREAMLib_UnRegisterMe)(void *addonData, void *cbTable);
-typedef void* (*KODIPeripheralLib_RegisterMe)(void *addonData);
-typedef void (*KODIPeripheralLib_UnRegisterMe)(void *addonData, void *cbTable);
-typedef void* (*KODIGameLib_RegisterMe)(void *addonData);
-typedef void (*KODIGameLib_UnRegisterMe)(void *addonData, void *cbTable);
-
-typedef struct AddonCB
-{
-  const char* libBasePath;  ///< Never, never change this!!!
-  void*       addonData;
-  KODIAddOnLib_RegisterMe           AddOnLib_RegisterMe;
-  KODIAddOnLib_UnRegisterMe         AddOnLib_UnRegisterMe;
-  KODIAudioEngineLib_RegisterMe     AudioEngineLib_RegisterMe;
-  KODIAudioEngineLib_UnRegisterMe   AudioEngineLib_UnRegisterMe;
-  KODICodecLib_RegisterMe           CodecLib_RegisterMe;
-  KODICodecLib_UnRegisterMe         CodecLib_UnRegisterMe;
-  KODIGUILib_RegisterMe             GUILib_RegisterMe;
-  KODIGUILib_UnRegisterMe           GUILib_UnRegisterMe;
-  KODIPVRLib_RegisterMe             PVRLib_RegisterMe;
-  KODIPVRLib_UnRegisterMe           PVRLib_UnRegisterMe;
-  KODIINPUTSTREAMLib_RegisterMe     INPUTSTREAMLib_RegisterMe;
-  KODIINPUTSTREAMLib_UnRegisterMe   INPUTSTREAMLib_UnRegisterMe;
-  KODIPeripheralLib_RegisterMe      PeripheralLib_RegisterMe;
-  KODIPeripheralLib_UnRegisterMe    PeripheralLib_UnRegisterMe;
-  KODIGameLib_RegisterMe            GameLib_RegisterMe;
-  KODIGameLib_UnRegisterMe          GameLib_UnRegisterMe;
-} AddonCB;
-
-namespace ADDON
-{
-  typedef enum addon_log
-  {
-    LOG_DEBUG,
-    LOG_INFO,
-    LOG_NOTICE,
-    LOG_ERROR
-  } addon_log_t;
-
-  typedef enum queue_msg
-  {
-    QUEUE_INFO,
-    QUEUE_WARNING,
-    QUEUE_ERROR
-  } queue_msg_t;
-}
-
-namespace KodiAPI
-{
-namespace AddOn
-{
-typedef struct CB_AddOn
-{
-  void (*Log)(void *addonData, const ADDON::addon_log_t loglevel, const char *msg);
-  void (*QueueNotification)(void *addonData, const ADDON::queue_msg_t type, const char *msg);
-  bool (*WakeOnLan)(const char* mac);
-  bool (*GetSetting)(void *addonData, const char *settingName, void *settingValue);
-  char* (*TranslateSpecialProtocol)(const char *strSource);
-  char* (*UnknownToUTF8)(const char *sourceDest);
-  char* (*GetLocalizedString)(const void* addonData, long dwCode);
-  char* (*GetDVDMenuLanguage)(const void* addonData);
-  void (*FreeString)(const void* addonData, char* str);
-  void (*FreeStringArray)(const void* addonData, char** arr, int numElements);
-
-  void* (*OpenFile)(const void* addonData, const char* strFileName, unsigned int flags);
-  void* (*OpenFileForWrite)(const void* addonData, const char* strFileName, bool bOverWrite);
-  ssize_t (*ReadFile)(const void* addonData, void* file, void* lpBuf, size_t uiBufSize);
-  bool (*ReadFileString)(const void* addonData, void* file, char *szLine, int iLineLength);
-  ssize_t (*WriteFile)(const void* addonData, void* file, const void* lpBuf, size_t uiBufSize);
-  void (*FlushFile)(const void* addonData, void* file);
-  int64_t (*SeekFile)(const void* addonData, void* file, int64_t iFilePosition, int iWhence);
-  int (*TruncateFile)(const void* addonData, void* file, int64_t iSize);
-  int64_t (*GetFilePosition)(const void* addonData, void* file);
-  int64_t (*GetFileLength)(const void* addonData, void* file);
-  double (*GetFileDownloadSpeed)(const void* addonData, void* file);
-  void (*CloseFile)(const void* addonData, void* file);
-  int (*GetFileChunkSize)(const void* addonData, void* file);
-  bool (*FileExists)(const void* addonData, const char *strFileName, bool bUseCache);
-  int (*StatFile)(const void* addonData, const char *strFileName, struct __stat64* buffer);
-  char *(*GetFilePropertyValue)(const void* addonData, void* file, XFILE::FileProperty type, const char *name);
-  char **(*GetFilePropertyValues)(const void* addonData, void* file, XFILE::FileProperty type, const char *name, int *numPorperties);
-  bool (*DeleteFile)(const void* addonData, const char *strFileName);
-  bool (*CanOpenDirectory)(const void* addonData, const char* strURL);
-  bool (*CreateDirectory)(const void* addonData, const char *strPath);
-  bool (*DirectoryExists)(const void* addonData, const char *strPath);
-  bool (*RemoveDirectory)(const void* addonData, const char *strPath);
-  bool (*GetDirectory)(const void* addonData, const char *strPath, const char* mask, VFSDirEntry** items, unsigned int* num_items);
-  void (*FreeDirectory)(const void* addonData, VFSDirEntry* items, unsigned int num_items);
-  void* (*CURLCreate)(const void* addonData, const char* strURL);
-  bool (*CURLAddOption)(const void* addonData, void* file, XFILE::CURLOPTIONTYPE type, const char* name, const char * value);
-  bool (*CURLOpen)(const void* addonData, void* file, unsigned int flags);
-} CB_AddOnLib;
-
-} /* namespace AddOn */
-} /* namespace KodiAPI */
-
-namespace ADDON
-{
-  class CHelper_libXBMC_addon
-  {
-  public:
-    CHelper_libXBMC_addon()
-    {
-      m_Handle = nullptr;
-      m_Callbacks = nullptr;
-    }
-
-    ~CHelper_libXBMC_addon()
-    {
-      if (m_Handle && m_Callbacks)
-      {
-        m_Handle->AddOnLib_UnRegisterMe(m_Handle->addonData, m_Callbacks);
-      }
-    }
-
-    bool RegisterMe(void *handle)
-    {
-      m_Handle = static_cast<AddonCB*>(handle);
-      if (m_Handle)
-        m_Callbacks = (KodiAPI::AddOn::CB_AddOnLib*)m_Handle->AddOnLib_RegisterMe(m_Handle->addonData);
-      if (!m_Callbacks)
-        fprintf(stderr, "libXBMC_addon-ERROR: AddOnLib_RegisterMe can't get callback table from Kodi !!!\n");
-
-      return m_Callbacks != nullptr;
-    }
-
-    /*!
-     * @brief Add a message to XBMC's log.
-     * @param loglevel The log level of the message.
-     * @param format The format of the message to pass to XBMC.
-     * @note This method uses limited buffer (16k) for the formatted output.
-     * So data, which will not fit into it, will be silently discarded.
-     */
-    void Log(const addon_log_t loglevel, const char *format, ... )
-    {
-      char buffer[16384];
-      static constexpr size_t len = sizeof (buffer) - 1;
-      va_list args;
-      va_start (args, format);
-      vsnprintf (buffer, len, format, args);
-      va_end (args);
-      buffer[len] = '\0'; // to be sure it's null-terminated
-      m_Callbacks->Log(m_Handle->addonData, loglevel, buffer);
-    }
-
-    /*!
-     * @brief Get a settings value for this add-on.
-     * @param settingName The name of the setting to get.
-     * @param settingValue The value.
-     * @return True if the settings was fetched successfully, false otherwise.
-     */
-    bool GetSetting(const char* settingName, void *settingValue)
-    {
-      return m_Callbacks->GetSetting(m_Handle->addonData, settingName, settingValue);
-    }
-
-    /*!
-    * @brief Translates a special protocol folder.
-    * @param source The file / folder to translate.
-    * @return The string translated to resolved path. Must be freed by calling FreeString() when done.
-    */
-    char *TranslateSpecialProtocol(const char *source)
-    {
-      return m_Callbacks->TranslateSpecialProtocol(source);
-    }
-
-    /*!
-     * @brief Queue a notification in the GUI.
-     * @param type The message type.
-     * @param format The format of the message to pass to display in XBMC.
-     */
-    void QueueNotification(const queue_msg_t type, const char *format, ... )
-    {
-      char buffer[16384];
-      va_list args;
-      va_start (args, format);
-      vsprintf (buffer, format, args);
-      va_end (args);
-      m_Callbacks->QueueNotification(m_Handle->addonData, type, buffer);
-    }
-
-    /*!
-     * @brief Send WakeOnLan magic packet.
-     * @param mac Network address of the host to wake.
-     * @return True if the magic packet was successfully sent, false otherwise.
-     */
-    bool WakeOnLan(const char* mac)
-    {
-      return m_Callbacks->WakeOnLan(mac);
-    }
-
-    /*!
-     * @brief Translate a string with an unknown encoding to UTF8.
-     * @param str The string to translate.
-     * @return The string translated to UTF8. Must be freed by calling FreeString() when done.
-     */
-    char* UnknownToUTF8(const char* str)
-    {
-      return m_Callbacks->UnknownToUTF8(str);
-    }
-
-    /*!
-     * @brief Get a localised message.
-     * @param dwCode The code of the message to get.
-     * @return The message. Must be freed by calling FreeString() when done.
-     */
-    char* GetLocalizedString(int dwCode)
-    {
-      return m_Callbacks->GetLocalizedString(m_Handle->addonData, dwCode);
-    }
-
-    /*!
-     * @brief Get the DVD menu language.
-     * @return The language. Must be freed by calling FreeString() when done.
-     */
-    char* GetDVDMenuLanguage()
-    {
-      return m_Callbacks->GetDVDMenuLanguage(m_Handle->addonData);
-    }
-
-    /*!
-     * @brief Free the memory used by str
-     * @param str The string to free
-     */
-    void FreeString(char* str)
-    {
-      m_Callbacks->FreeString(m_Handle->addonData, str);
-    }
-
-    /*!
-     * @brief Free the memory used by arr including its elements
-     * @param arr The string array to free
-     * @param numElements The length of the array
-     */
-    void FreeStringArray(char** arr, int numElements)
-    {
-      m_Callbacks->FreeStringArray(m_Handle->addonData, arr, numElements);
-    }
-
-    /*!
-     * @brief Open the file with filename via XBMC's CFile. Needs to be closed by calling CloseFile() when done.
-     * @param strFileName The filename to open.
-     * @param flags The flags to pass. Documented in XBMC's File.h
-     * @return A handle for the file, or NULL if it couldn't be opened.
-     */
-    void* OpenFile(const char* strFileName, unsigned int flags)
-    {
-      return m_Callbacks->OpenFile(m_Handle->addonData, strFileName, flags);
-    }
-
-    /*!
-     * @brief Open the file with filename via XBMC's CFile in write mode. Needs to be closed by calling CloseFile() when done.
-     * @param strFileName The filename to open.
-     * @param bOverWrite True to overwrite, false otherwise.
-     * @return A handle for the file, or NULL if it couldn't be opened.
-     */
-    void* OpenFileForWrite(const char* strFileName, bool bOverWrite)
-    {
-      return m_Callbacks->OpenFileForWrite(m_Handle->addonData, strFileName, bOverWrite);
-    }
-
-    /*!
-     * @brief Read from an open file.
-     * @param file The file handle to read from.
-     * @param lpBuf The buffer to store the data in.
-     * @param uiBufSize The size of the buffer.
-     * @return number of successfully read bytes if any bytes were read and stored in
-     *         buffer, zero if no bytes are available to read (end of file was reached)
-     *         or undetectable error occur, -1 in case of any explicit error
-     */
-    ssize_t ReadFile(void* file, void* lpBuf, size_t uiBufSize)
-    {
-      return m_Callbacks->ReadFile(m_Handle->addonData, file, lpBuf, uiBufSize);
-    }
-
-    /*!
-     * @brief Read a string from an open file.
-     * @param file The file handle to read from.
-     * @param szLine The buffer to store the data in.
-     * @param iLineLength The size of the buffer.
-     * @return True when a line was read, false otherwise.
-     */
-    bool ReadFileString(void* file, char *szLine, int iLineLength)
-    {
-      return m_Callbacks->ReadFileString(m_Handle->addonData, file, szLine, iLineLength);
-    }
-
-    /*!
-     * @brief Write to a file opened in write mode.
-     * @param file The file handle to write to.
-     * @param lpBuf The data to write.
-     * @param uiBufSize Size of the data to write.
-     * @return number of successfully written bytes if any bytes were written,
-     *         zero if no bytes were written and no detectable error occur,
-     *         -1 in case of any explicit error
-     */
-    ssize_t WriteFile(void* file, const void* lpBuf, size_t uiBufSize)
-    {
-      return m_Callbacks->WriteFile(m_Handle->addonData, file, lpBuf, uiBufSize);
-    }
-
-    /*!
-     * @brief Flush buffered data.
-     * @param file The file handle to flush the data for.
-     */
-    void FlushFile(void* file)
-    {
-       m_Callbacks->FlushFile(m_Handle->addonData, file);
-    }
-
-    /*!
-     * @brief Seek in an open file.
-     * @param file The file handle to see in.
-     * @param iFilePosition The new position.
-     * @param iWhence Seek argument. See stdio.h for possible values.
-     * @return The new position.
-     */
-    int64_t SeekFile(void* file, int64_t iFilePosition, int iWhence)
-    {
-      return m_Callbacks->SeekFile(m_Handle->addonData, file, iFilePosition, iWhence);
-    }
-
-    /*!
-     * @brief Truncate a file to the requested size.
-     * @param file The file handle to truncate.
-     * @param iSize The new max size.
-     * @return New size?
-     */
-    int TruncateFile(void* file, int64_t iSize)
-    {
-      return m_Callbacks->TruncateFile(m_Handle->addonData, file, iSize);
-    }
-
-    /*!
-     * @brief The current position in an open file.
-     * @param file The file handle to get the position for.
-     * @return The requested position.
-     */
-    int64_t GetFilePosition(void* file)
-    {
-      return m_Callbacks->GetFilePosition(m_Handle->addonData, file);
-    }
-
-    /*!
-     * @brief Get the file size of an open file.
-     * @param file The file to get the size for.
-     * @return The requested size.
-     */
-    int64_t GetFileLength(void* file)
-    {
-      return m_Callbacks->GetFileLength(m_Handle->addonData, file);
-    }
-
-    /*!
-    * @brief Get the download speed of an open file if available.
-    * @param file The file to get the size for.
-    * @return The download speed in seconds.
-    */
-    double GetFileDownloadSpeed(void* file)
-    {
-      return m_Callbacks->GetFileDownloadSpeed(m_Handle->addonData, file);
-    }
-
-    /*!
-     * @brief Close an open file.
-     * @param file The file handle to close.
-     */
-    void CloseFile(void* file)
-    {
-      m_Callbacks->CloseFile(m_Handle->addonData, file);
-    }
-
-    /*!
-     * @brief Get the chunk size for an open file.
-     * @param file the file handle to get the size for.
-     * @return The requested size.
-     */
-    int GetFileChunkSize(void* file)
-    {
-      return m_Callbacks->GetFileChunkSize(m_Handle->addonData, file);
-    }
-
-    /*!
-     * @brief Check if a file exists.
-     * @param strFileName The filename to check.
-     * @param bUseCache Check in file cache.
-     * @return true if the file exists false otherwise.
-     */
-    bool FileExists(const char *strFileName, bool bUseCache)
-    {
-      return m_Callbacks->FileExists(m_Handle->addonData, strFileName, bUseCache);
-    }
-
-    /*!
-     * @brief Reads file status.
-     * @param strFileName The filename to read the status from.
-     * @param buffer The file status is written into this buffer.
-     * @return The file status was successfully read.
-     */
-    int StatFile(const char *strFileName, struct __stat64* buffer)
-    {
-      return m_Callbacks->StatFile(m_Handle->addonData, strFileName, buffer);
-    }
-
-    /*!
-    * @brief Get a property from an open file.
-    * @param file The file to get an property for
-    * @param type Type of the requested property.
-    * @param name Name of the requested property / can be null.
-    * @return The value of the requested property, must be FreeString'ed.
-    */
-    char *GetFilePropertyValue(void* file, XFILE::FileProperty type, const char *name)
-    {
-      return m_Callbacks->GetFilePropertyValue(m_Handle->addonData, file, type, name);
-    }
-
-    /*!
-    * @brief Get multiple property values from an open file.
-    * @param file The file to get the property values for
-    * @param type Type of the requested property.
-    * @param name Name of the requested property / can be null.
-    * @param numValues Number of property values returned.
-    * @return List of values of the requested property, must be FreeStringArray'ed.
-    */
-    char **GetFilePropertyValues(void* file, XFILE::FileProperty type, const char *name, int *numValues)
-    {
-      return m_Callbacks->GetFilePropertyValues(m_Handle->addonData, file, type, name, numValues);
-    }
-
-    /*!
-     * @brief Deletes a file.
-     * @param strFileName The filename to delete.
-     * @return The file was successfully deleted.
-     */
-    bool DeleteFile(const char *strFileName)
-    {
-      return m_Callbacks->DeleteFile(m_Handle->addonData, strFileName);
-    }
-
-    /*!
-     * @brief Checks whether a directory can be opened.
-     * @param strUrl The URL of the directory to check.
-     * @return True when it can be opened, false otherwise.
-     */
-    bool CanOpenDirectory(const char* strUrl)
-    {
-      return m_Callbacks->CanOpenDirectory(m_Handle->addonData, strUrl);
-    }
-
-    /*!
-     * @brief Creates a directory.
-     * @param strPath Path to the directory.
-     * @return True when it was created, false otherwise.
-     */
-    bool CreateDirectory(const char *strPath)
-    {
-      return m_Callbacks->CreateDirectory(m_Handle->addonData, strPath);
-    }
-
-    /*!
-     * @brief Checks if a directory exists.
-     * @param strPath Path to the directory.
-     * @return True when it exists, false otherwise.
-     */
-    bool DirectoryExists(const char *strPath)
-    {
-      return m_Callbacks->DirectoryExists(m_Handle->addonData, strPath);
-    }
-
-    /*!
-     * @brief Removes a directory.
-     * @param strPath Path to the directory.
-     * @return True when it was removed, false otherwise.
-     */
-    bool RemoveDirectory(const char *strPath)
-    {
-      return m_Callbacks->RemoveDirectory(m_Handle->addonData, strPath);
-    }
-
-    /*!
-     * @brief Lists a directory.
-     * @param strPath Path to the directory.
-     * @param mask File mask
-     * @param items The directory entries
-     * @param num_items Number of entries in directory
-     * @return True if listing was successful, false otherwise.
-     */
-    bool GetDirectory(const char *strPath, const char* mask, VFSDirEntry** items, unsigned int* num_items)
-    {
-      return m_Callbacks->GetDirectory(m_Handle->addonData, strPath, mask, items, num_items);
-    }
-
-    /*!
-     * @brief Free a directory list
-     * @param items The directory entries
-     * @param num_items Number of entries in directory
-     */
-    void FreeDirectory(VFSDirEntry* items, unsigned int num_items)
-    {
-      m_Callbacks->FreeDirectory(m_Handle->addonData, items, num_items);
-    }
-
-    /*!
-    * @brief Create a Curl representation
-    * @param strURL the URL of the Type.
-    */
-    void* CURLCreate(const char* strURL)
-    {
-      return m_Callbacks->CURLCreate(m_Handle->addonData, strURL);
-    }
-
-    /*!
-    * @brief Adds options to the curl file created with CURLCeate
-    * @param file file pointer to the file returned by CURLCeate
-    * @param type option type to set
-    * @param name name of the option
-    * @param value value of the option
-    */
-    bool CURLAddOption(void* file, XFILE::CURLOPTIONTYPE type, const char* name, const char * value)
-    {
-      return m_Callbacks->CURLAddOption(m_Handle->addonData, file, type, name, value);
-    }
-
-    /*!
-    * @brief Opens the curl file created with CURLCeate
-    * @param file file pointer to the file returned by CURLCeate
-    * @param flags one or more bitwise or combinded flags form XFILE
-    */
-    bool CURLOpen(void* file, unsigned int flags)
-    {
-      return m_Callbacks->CURLOpen(m_Handle->addonData, file, flags);
-    }
-
-  private:
-    AddonCB* m_Handle;
-    KodiAPI::AddOn::CB_AddOnLib *m_Callbacks;
-  };
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
deleted file mode 100644
index 2a94f75..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- *  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 <string>
-#include <vector>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "xbmc_pvr_types.h"
-#include "libXBMC_addon.h"
-
-#define DVD_TIME_BASE 1000000
-
-//! @todo original definition is in DVDClock.h
-#define DVD_NOPTS_VALUE 0xFFF0000000000000
-
-class CHelper_libXBMC_pvr
-{
-public:
-  CHelper_libXBMC_pvr(void)
-  {
-    m_Handle = nullptr;
-    m_Callbacks = nullptr;
-  }
-
-  ~CHelper_libXBMC_pvr(void)
-  {
-    if (m_Handle && m_Callbacks)
-    {
-      m_Handle->PVRLib_UnRegisterMe(m_Handle->addonData, m_Callbacks);
-    }
-  }
-
-  /*!
-   * @brief Resolve all callback methods
-   * @param handle Pointer to the add-on
-   * @return True when all methods were resolved, false otherwise.
-   */
-  bool RegisterMe(void* handle)
-  {
-    m_Handle = static_cast<AddonCB*>(handle);
-    if (m_Handle)
-      m_Callbacks = (AddonInstance_PVR*)m_Handle->PVRLib_RegisterMe(m_Handle->addonData);
-    if (!m_Callbacks)
-      fprintf(stderr, "libXBMC_pvr-ERROR: PVRLib_register_me can't get callback table from Kodi !!!\n");
-
-    return m_Callbacks != NULL;
-  }
-
-  /*!
-   * @brief Transfer an EPG tag from the add-on to XBMC
-   * @param handle The handle parameter that XBMC used when requesting the EPG data
-   * @param entry The entry to transfer to XBMC
-   */
-  void TransferEpgEntry(const ADDON_HANDLE handle, const EPG_TAG* entry)
-  {
-    return m_Callbacks->toKodi.TransferEpgEntry(m_Callbacks->toKodi.kodiInstance, handle, entry);
-  }
-
-  /*!
-   * @brief Transfer a channel entry from the add-on to XBMC
-   * @param handle The handle parameter that XBMC used when requesting the channel list
-   * @param entry The entry to transfer to XBMC
-   */
-  void TransferChannelEntry(const ADDON_HANDLE handle, const PVR_CHANNEL* entry)
-  {
-    return m_Callbacks->toKodi.TransferChannelEntry(m_Callbacks->toKodi.kodiInstance, handle, entry);
-  }
-
-  /*!
-   * @brief Transfer a timer entry from the add-on to XBMC
-   * @param handle The handle parameter that XBMC used when requesting the timers list
-   * @param entry The entry to transfer to XBMC
-   */
-  void TransferTimerEntry(const ADDON_HANDLE handle, const PVR_TIMER* entry)
-  {
-    return m_Callbacks->toKodi.TransferTimerEntry(m_Callbacks->toKodi.kodiInstance, handle, entry);
-  }
-
-  /*!
-   * @brief Transfer a recording entry from the add-on to XBMC
-   * @param handle The handle parameter that XBMC used when requesting the recordings list
-   * @param entry The entry to transfer to XBMC
-   */
-  void TransferRecordingEntry(const ADDON_HANDLE handle, const PVR_RECORDING* entry)
-  {
-    return m_Callbacks->toKodi.TransferRecordingEntry(m_Callbacks->toKodi.kodiInstance, handle, entry);
-  }
-
-  /*!
-   * @brief Transfer a channel group from the add-on to XBMC. The group will be created if it doesn't exist.
-   * @param handle The handle parameter that XBMC used when requesting the channel groups list
-   * @param entry The entry to transfer to XBMC
-   */
-  void TransferChannelGroup(const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP* entry)
-  {
-    return m_Callbacks->toKodi.TransferChannelGroup(m_Callbacks->toKodi.kodiInstance, handle, entry);
-  }
-
-  /*!
-   * @brief Transfer a channel group member entry from the add-on to XBMC. The channel will be added to the group if the group can be found.
-   * @param handle The handle parameter that XBMC used when requesting the channel group members list
-   * @param entry The entry to transfer to XBMC
-   */
-  void TransferChannelGroupMember(const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP_MEMBER* entry)
-  {
-    return m_Callbacks->toKodi.TransferChannelGroupMember(m_Callbacks->toKodi.kodiInstance, handle, entry);
-  }
-
-  /*!
-   * @brief Add or replace a menu hook for the context menu for this add-on
-   * @param hook The hook to add
-   */
-  void AddMenuHook(PVR_MENUHOOK* hook)
-  {
-    return m_Callbacks->toKodi.AddMenuHook(m_Callbacks->toKodi.kodiInstance, hook);
-  }
-
-  /*!
-   * @brief Display a notification in XBMC that a recording started or stopped on the server
-   * @param strRecordingName The name of the recording to display
-   * @param strFileName The filename of the recording
-   * @param bOn True when recording started, false when it stopped
-   */
-  void Recording(const char* strRecordingName, const char* strFileName, bool bOn)
-  {
-    return m_Callbacks->toKodi.Recording(m_Callbacks->toKodi.kodiInstance, strRecordingName, strFileName, bOn);
-  }
-
-  /*!
-   * @brief Request XBMC to update it's list of timers
-   */
-  void TriggerTimerUpdate(void)
-  {
-    return m_Callbacks->toKodi.TriggerTimerUpdate(m_Callbacks->toKodi.kodiInstance);
-  }
-
-  /*!
-   * @brief Request XBMC to update it's list of recordings
-   */
-  void TriggerRecordingUpdate(void)
-  {
-    return m_Callbacks->toKodi.TriggerRecordingUpdate(m_Callbacks->toKodi.kodiInstance);
-  }
-
-  /*!
-   * @brief Request XBMC to update it's list of channels
-   */
-  void TriggerChannelUpdate(void)
-  {
-    return m_Callbacks->toKodi.TriggerChannelUpdate(m_Callbacks->toKodi.kodiInstance);
-  }
-
-  /*!
-   * @brief Schedule an EPG update for the given channel channel
-   * @param iChannelUid The unique id of the channel for this add-on
-   */
-  void TriggerEpgUpdate(unsigned int iChannelUid)
-  {
-    return m_Callbacks->toKodi.TriggerEpgUpdate(m_Callbacks->toKodi.kodiInstance, iChannelUid);
-  }
-
-  /*!
-   * @brief Request XBMC to update it's list of channel groups
-   */
-  void TriggerChannelGroupsUpdate(void)
-  {
-    return m_Callbacks->toKodi.TriggerChannelGroupsUpdate(m_Callbacks->toKodi.kodiInstance);
-  }
-
-#ifdef USE_DEMUX
-  /*!
-   * @brief Free a packet that was allocated with AllocateDemuxPacket
-   * @param pPacket The packet to free
-   */
-  void FreeDemuxPacket(DemuxPacket* pPacket)
-  {
-    return m_Callbacks->toKodi.FreeDemuxPacket(m_Callbacks->toKodi.kodiInstance, pPacket);
-  }
-
-  /*!
-   * @brief Allocate a demux packet. Free with FreeDemuxPacket
-   * @param iDataSize The size of the data that will go into the packet
-   * @return The allocated packet
-   */
-  DemuxPacket* AllocateDemuxPacket(int iDataSize)
-  {
-    return m_Callbacks->toKodi.AllocateDemuxPacket(m_Callbacks->toKodi.kodiInstance, iDataSize);
-  }
-#endif
-
-  /*!
-   * @brief Notify a state change for a PVR backend connection
-   * @param strConnectionString The connection string reported by the backend that can be displayed in the UI.
-   * @param newState The new state.
-   * @param strMessage A localized addon-defined string representing the new state, that can be displayed
-   *        in the UI or NULL if the Kodi-defined default string for the new state shall be displayed.
-   */
-  void ConnectionStateChange(const char *strConnectionString, PVR_CONNECTION_STATE newState, const char *strMessage)
-  {
-    return m_Callbacks->toKodi.ConnectionStateChange(m_Callbacks->toKodi.kodiInstance, strConnectionString, newState, strMessage);
-  }
-
-  /*!
-   * @brief Notify a state change for an EPG event
-   * @param tag The EPG event.
-   * @param newState The new state. For EPG_EVENT_CREATED and EPG_EVENT_UPDATED, tag must be filled with all available
-   *        event data, not just a delta. For EPG_EVENT_DELETED, it is sufficient to fill EPG_TAG.iUniqueBroadcastId
-   */
-  void EpgEventStateChange(EPG_TAG *tag, EPG_EVENT_STATE newState)
-  {
-    return m_Callbacks->toKodi.EpgEventStateChange(m_Callbacks->toKodi.kodiInstance, tag, newState);
-  }
-
-  /*!
-   * @brief Get the codec id used by XBMC
-   * @param strCodecName The name of the codec
-   * @return The codec_id, or a codec_id with 0 values when not supported
-   */
-  xbmc_codec_t GetCodecByName(const char* strCodecName)
-  {
-    return m_Callbacks->toKodi.GetCodecByName(m_Callbacks->toKodi.kodiInstance, strCodecName);
-  }
-
-private:
-  AddonCB* m_Handle;
-  AddonInstance_PVR *m_Callbacks;
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h
index aad3a28..ef2d728 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/platform/android/System.h
@@ -47,67 +47,68 @@ namespace kodi
 {
 namespace platform
 {
-  class CInterfaceAndroidSystem
+class ATTRIBUTE_HIDDEN CInterfaceAndroidSystem
+{
+public:
+  CInterfaceAndroidSystem()
+    : m_interface(static_cast<AddonToKodiFuncTable_android_system*>(
+          GetInterface(INTERFACE_ANDROID_SYSTEM_NAME, INTERFACE_ANDROID_SYSTEM_VERSION))){};
+
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_platform
+  /// @brief request an JNI env pointer for the calling thread.
+  /// JNI env has to be controlled by kodi because of the underlying
+  /// threading concep.
+  ///
+  /// @param[in]:
+  /// @return JNI env pointer for the calling thread
+  ///
+  inline void* GetJNIEnv()
   {
-  public:
-    CInterfaceAndroidSystem()
-     : m_interface(static_cast<AddonToKodiFuncTable_android_system*>(GetInterface(INTERFACE_ANDROID_SYSTEM_NAME, INTERFACE_ANDROID_SYSTEM_VERSION)))
-     {};
+    if (m_interface)
+      return m_interface->get_jni_env();
 
-    //============================================================================
-    ///
-    /// \ingroup cpp_kodi_platform
-    /// @brief request an JNI env pointer for the calling thread.
-    /// JNI env has to be controlled by kodi because of the underlying
-    /// threading concep.
-    ///
-    /// @param[in]:
-    /// @return JNI env pointer for the calling thread
-    ///
-    inline void * GetJNIEnv()
-    {
-      if (m_interface)
-        return m_interface->get_jni_env();
+    return nullptr;
+  }
+  //----------------------------------------------------------------------------
 
-      return nullptr;
-    }
-    //----------------------------------------------------------------------------
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_platform
+  /// @brief request the android sdk version to e.g. initialize JNIBase.
+  ///
+  /// @param[in]:
+  /// @return Android SDK version
+  ///
+  inline int GetSDKVersion()
+  {
+    if (m_interface)
+      return m_interface->get_sdk_version();
 
-    //============================================================================
-    ///
-    /// \ingroup cpp_kodi_platform
-    /// @brief request the android sdk version to e.g. initialize JNIBase.
-    ///
-    /// @param[in]:
-    /// @return Android SDK version
-    ///
-    inline int GetSDKVersion()
-    {
-      if (m_interface)
-        return m_interface->get_sdk_version();
+    return 0;
+  }
 
-      return 0;
-    }
+  //============================================================================
+  ///
+  /// \ingroup cpp_kodi_platform
+  /// @brief request the android main class name e.g. org.xbmc.kodi.
+  ///
+  /// @param[in]:
+  /// @return package class name
+  ///
+  inline std::string GetClassName()
+  {
+    if (m_interface)
+      return m_interface->get_class_name();
 
-    //============================================================================
-    ///
-    /// \ingroup cpp_kodi_platform
-    /// @brief request the android main class name e.g. org.xbmc.kodi.
-    ///
-    /// @param[in]:
-    /// @return package class name
-    ///
-    inline std::string GetClassName()
-    {
-      if (m_interface)
-        return m_interface->get_class_name();
+    return std::string();
+  }
 
-      return std::string();
-    }
+private:
+  AddonToKodiFuncTable_android_system* m_interface;
+};
+//----------------------------------------------------------------------------
 
-  private:
-    AddonToKodiFuncTable_android_system *m_interface;
-  };
-  //----------------------------------------------------------------------------
 } /* namespace platform */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/CMakeLists.txt
index ef2fa25..939585c 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/CMakeLists.txt
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(HEADERS DllHelper.h
-            Time.h)
+set(HEADERS DllHelper.h )
 
 if(NOT ENABLE_STATIC_LIBS)
   core_add_library(addons_kodi-addon-dev-kit_include_kodi_tools)
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/DllHelper.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/DllHelper.h
index 1ae1a0e..3cc9eea 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/DllHelper.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/DllHelper.h
@@ -8,24 +8,42 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include <string>
-#include <kodi/AddonBase.h>
 
-#ifdef _WIN32                   // windows
-#include <p8-platform/windows/dlfcn-win32.h>
-#else
-#include <dlfcn.h>              // linux+osx
-#endif
+#include <dlfcn.h>
+#include <kodi/AddonBase.h>
+#include <kodi/Filesystem.h>
 
+//==============================================================================
+/// @ingroup cpp_kodi_tools_CDllHelper
+/// @brief Macro to translate the given pointer value name of functions to
+/// requested function name.
+///
+/// @note This should always be used and does the work of
+/// @ref kodi::tools::CDllHelper::RegisterSymbol().
+///
 #define REGISTER_DLL_SYMBOL(functionPtr) \
-  CDllHelper::RegisterSymbol(functionPtr, #functionPtr)
+  kodi::tools::CDllHelper::RegisterSymbol(functionPtr, #functionPtr)
+//------------------------------------------------------------------------------
 
-/// @brief Class to help with load of shared library functions
-///
+namespace kodi
+{
+namespace tools
+{
+
+//==============================================================================
+/// @defgroup cpp_kodi_tools_CDllHelper class CDllHelper
+/// @ingroup cpp_kodi_tools
+/// @brief **Class to help with load of shared library functions**\n
 /// You can add them as parent to your class and to help with load of shared
 /// library functions.
 ///
-/// @note To use on Windows must you also include p8-platform on your addon!
+/// @note To use on Windows must you also include [dlfcn-win32](https://github.com/dlfcn-win32/dlfcn-win32)
+/// on your addon!\n\n
+/// Furthermore, this allows the use of Android where the required library is
+/// copied to an EXE useable folder.
 ///
 ///
 /// ----------------------------------------------------------------------------
@@ -37,22 +55,22 @@
 ///
 /// ...
 /// class CMyInstance : public kodi::addon::CInstanceAudioDecoder,
-///                     private CDllHelper
+///                     private kodi::tools::CDllHelper
 /// {
 /// public:
-///   CMyInstance(KODI_HANDLE instance);
+///   CMyInstance(KODI_HANDLE instance, const std::string& kodiVersion);
 ///   bool Start();
 ///
 ///   ...
 ///
-///   /* The pointers for on shared library exported functions */
+///   // The pointers for on shared library exported functions
 ///   int (*Init)();
 ///   void (*Cleanup)();
 ///   int (*GetLength)();
 /// };
 ///
-/// CMyInstance::CMyInstance(KODI_HANDLE instance)
-///   : CInstanceAudioDecoder(instance)
+/// CMyInstance::CMyInstance(KODI_HANDLE instance, const std::string& kodiVersion)
+///   : CInstanceAudioDecoder(instance, kodiVersion)
 /// {
 /// }
 ///
@@ -70,23 +88,80 @@
 /// ...
 /// ~~~~~~~~~~~~~
 ///
-class CDllHelper
+///@{
+class ATTRIBUTE_HIDDEN CDllHelper
 {
 public:
-  CDllHelper() : m_dll(nullptr) { }
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CDllHelper
+  /// @brief Class constructor.
+  ///
+  CDllHelper() = default;
+  //----------------------------------------------------------------------------
+
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CDllHelper
+  /// @brief Class destructor.
+  ///
   virtual ~CDllHelper()
   {
     if (m_dll)
       dlclose(m_dll);
   }
+  //----------------------------------------------------------------------------
 
-  /// @brief Function to load requested library
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CDllHelper
+  /// @brief Function to load requested library.
   ///
-  /// @param[in] path         The path with filename of shared library to load
-  /// @return                 true if load was successful done
+  /// @param[in] path The path with filename of shared library to load
+  /// @return true if load was successful done
   ///
-  bool LoadDll(const std::string& path)
+  bool LoadDll(std::string path)
   {
+#if defined(TARGET_ANDROID)
+    if (kodi::vfs::FileExists(path))
+    {
+      // Check already defined for "xbmcaltbinaddons", if yes no copy necassary.
+      std::string xbmcaltbinaddons =
+          kodi::vfs::TranslateSpecialProtocol("special://xbmcaltbinaddons/");
+      if (path.compare(0, xbmcaltbinaddons.length(), xbmcaltbinaddons) != 0)
+      {
+        bool doCopy = true;
+        std::string dstfile = xbmcaltbinaddons + kodi::vfs::GetFileName(path);
+
+        kodi::vfs::FileStatus dstFileStat;
+        if (kodi::vfs::StatFile(dstfile, dstFileStat))
+        {
+          kodi::vfs::FileStatus srcFileStat;
+          if (kodi::vfs::StatFile(path, srcFileStat))
+          {
+            if (dstFileStat.GetSize() == srcFileStat.GetSize() &&
+                dstFileStat.GetModificationTime() > srcFileStat.GetModificationTime())
+              doCopy = false;
+          }
+        }
+
+        if (doCopy)
+        {
+          kodi::Log(ADDON_LOG_DEBUG, "Caching '%s' to '%s'", path.c_str(), dstfile.c_str());
+          if (!kodi::vfs::CopyFile(path, dstfile))
+          {
+            kodi::Log(ADDON_LOG_ERROR, "Failed to cache '%s' to '%s'", path.c_str(),
+                      dstfile.c_str());
+            return false;
+          }
+        }
+
+        path = dstfile;
+      }
+    }
+    else
+    {
+      return false;
+    }
+#endif
+
     m_dll = dlopen(path.c_str(), RTLD_LAZY);
     if (m_dll == nullptr)
     {
@@ -95,11 +170,21 @@ public:
     }
     return true;
   }
+  //----------------------------------------------------------------------------
 
-  /// @brief Function to register requested library symbol
+  //============================================================================
+  /// @ingroup cpp_kodi_tools_CDllHelper
+  /// @brief Function to register requested library symbol.
+  ///
+  /// @warning This function should not be used, use instead the macro
+  /// @ref REGISTER_DLL_SYMBOL to register the symbol pointer.
   ///
-  /// @note This function should not be used, use instead the macro
-  /// REGISTER_DLL_SYMBOL to register the symbol pointer.
+  ///
+  /// Use this always via Macro, e.g.:
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// if (!REGISTER_DLL_SYMBOL(Init))
+  ///   return false;
+  /// ~~~~~~~~~~~~~
   ///
   template <typename T>
   bool RegisterSymbol(T& functionPtr, const char* strFunctionPtr)
@@ -112,7 +197,15 @@ public:
     }
     return true;
   }
+  //----------------------------------------------------------------------------
 
 private:
-  void* m_dll;
+  void* m_dll = nullptr;
 };
+///@}
+//------------------------------------------------------------------------------
+
+} /* namespace tools */
+} /* namespace kodi */
+
+#endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/Time.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/Time.h
deleted file mode 100644
index 31c29fd..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/Time.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#pragma once
-/*
- *  Copyright (C) 2005-2019 Team Kodi
- *  Copyright (C) 2011-2012 Pulse-Eight Limited.
- *  This file is part of Kodi - https://kodi.tv
- *
- *  SPDX-License-Identifier: GPL-2.0-or-later
- *  See LICENSES/README.md for more information.
- */
-
-#if defined(TARGET_DARWIN)
-#include <mach/mach_time.h>
-#include <CoreVideo/CVHostTime.h>
-#elif defined(TARGET_WINDOWS)
-#include <Windows.h>
-#include <time.h>
-#else
-#include <time.h>
-#endif
-
-namespace kodi
-{
-namespace time
-{
-
-//===============================================================================
-/// @brief Function to get current time in milliseconds
-///
-/// @return Current time in milliseconds as a double value
-///
-///
-/// -----------------------------------------------------------------------------
-///
-/// **Example:**
-/// ~~~~~~~~~~~~~{.cpp}
-///
-/// #include <kodi/tools/Time.h>
-///
-/// ...
-/// double time = kodi::time::GetTimeMs();
-/// ...
-/// ~~~~~~~~~~~~~
-///
-inline double GetTimeMs()
-{
-#if defined(TARGET_DARWIN)
-  return static_cast<double>(CVGetCurrentHostTime() / static_cast<double>(CVGetHostClockFrequency() * 0.001));
-#elif defined(TARGET_WINDOWS)
-  LARGE_INTEGER tickPerSecond;
-  LARGE_INTEGER tick;
-  if (QueryPerformanceFrequency(&tickPerSecond))
-  {
-    QueryPerformanceCounter(&tick);
-    return static_cast<double>(tick.QuadPart) / (tickPerSecond.QuadPart / 1000.0);
-  }
-  return 0.0;
-#else
-  timespec time;
-  clock_gettime(CLOCK_MONOTONIC, &time);
-  return static_cast<double>(time.tv_sec) * 1000.0 + time.tv_nsec / 1000000.0;
-#endif
-}
-//-------------------------------------------------------------------------------
-
-//===============================================================================
-/// @brief Function to get current time in seconds
-///
-/// @return Current time in seconds with the value type defined in the template
-///
-///
-/// -----------------------------------------------------------------------------
-///
-/// **Example:**
-/// ~~~~~~~~~~~~~{.cpp}
-///
-/// #include <kodi/tools/Time.h>
-///
-/// ...
-/// double time = kodi::time::GetTimeSec<double>();
-/// ...
-/// ~~~~~~~~~~~~~
-///
-template <class T>
-inline T GetTimeSec()
-{
-  return static_cast<T>(GetTimeMs()) / static_cast<T>(1000.0);
-}
-//-------------------------------------------------------------------------------
-
-} /* namespace time */
-} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
index a9f1798..041e22b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
@@ -30,105 +30,135 @@
  * overview.
  */
 
-#define ADDON_GLOBAL_VERSION_MAIN                     "1.0.14"
-#define ADDON_GLOBAL_VERSION_MAIN_MIN                 "1.0.12"
+// Ignore clang here, as this must be good in overview and as the main reason,
+// because cmake uses this area in this form to perform its addon dependency
+// check.
+// clang-format off
+#define ADDON_GLOBAL_VERSION_MAIN                     "1.2.4"
+#define ADDON_GLOBAL_VERSION_MAIN_MIN                 "1.2.0"
 #define ADDON_GLOBAL_VERSION_MAIN_XML_ID              "kodi.binary.global.main"
 #define ADDON_GLOBAL_VERSION_MAIN_DEPENDS             "AddonBase.h" \
-                                                      "xbmc_addon_dll.h" \
-                                                      "xbmc_addon_types.h" \
-                                                      "libXBMC_addon.h" \
-                                                      "addon-instance/"
+                                                      "addon-instance/" \
+                                                      "c-api/addon_base.h"
 
-#define ADDON_GLOBAL_VERSION_GENERAL                  "1.0.3"
-#define ADDON_GLOBAL_VERSION_GENERAL_MIN              "1.0.2"
+#define ADDON_GLOBAL_VERSION_GENERAL                  "1.0.5"
+#define ADDON_GLOBAL_VERSION_GENERAL_MIN              "1.0.4"
 #define ADDON_GLOBAL_VERSION_GENERAL_XML_ID           "kodi.binary.global.general"
 #define ADDON_GLOBAL_VERSION_GENERAL_DEPENDS          "General.h"
 
-#define ADDON_GLOBAL_VERSION_GUI                      "5.12.1"
-#define ADDON_GLOBAL_VERSION_GUI_MIN                  "5.10.0"
+#define ADDON_GLOBAL_VERSION_GUI                      "5.14.1"
+#define ADDON_GLOBAL_VERSION_GUI_MIN                  "5.14.0"
 #define ADDON_GLOBAL_VERSION_GUI_XML_ID               "kodi.binary.global.gui"
-#define ADDON_GLOBAL_VERSION_GUI_DEPENDS              "libKODI_guilib.h" \
+#define ADDON_GLOBAL_VERSION_GUI_DEPENDS              "ActionIDs.h" \
                                                       "gui/"
 
-#define ADDON_GLOBAL_VERSION_AUDIOENGINE              "1.0.1"
-#define ADDON_GLOBAL_VERSION_AUDIOENGINE_MIN          "1.0.1"
+#define ADDON_GLOBAL_VERSION_AUDIOENGINE              "1.1.1"
+#define ADDON_GLOBAL_VERSION_AUDIOENGINE_MIN          "1.1.0"
 #define ADDON_GLOBAL_VERSION_AUDIOENGINE_XML_ID       "kodi.binary.global.audioengine"
-#define ADDON_GLOBAL_VERSION_AUDIOENGINE_DEPENDS      "AudioEngine.h"
+#define ADDON_GLOBAL_VERSION_AUDIOENGINE_DEPENDS      "AudioEngine.h" \
+                                                      "c-api/audio_engine.h"
 
-#define ADDON_GLOBAL_VERSION_FILESYSTEM               "1.0.2"
-#define ADDON_GLOBAL_VERSION_FILESYSTEM_MIN           "1.0.2"
+#define ADDON_GLOBAL_VERSION_FILESYSTEM               "1.1.4"
+#define ADDON_GLOBAL_VERSION_FILESYSTEM_MIN           "1.1.0"
 #define ADDON_GLOBAL_VERSION_FILESYSTEM_XML_ID        "kodi.binary.global.filesystem"
-#define ADDON_GLOBAL_VERSION_FILESYSTEM_DEPENDS       "Filesystem.h"
+#define ADDON_GLOBAL_VERSION_FILESYSTEM_DEPENDS       "Filesystem.h" \
+                                                      "c-api/filesystem.h" \
+                                                      "gui/gl/Shader.h" \
+                                                      "tools/DllHelper.h"
 
-#define ADDON_GLOBAL_VERSION_NETWORK                  "1.0.0"
+#define ADDON_GLOBAL_VERSION_NETWORK                  "1.0.4"
 #define ADDON_GLOBAL_VERSION_NETWORK_MIN              "1.0.0"
 #define ADDON_GLOBAL_VERSION_NETWORK_XML_ID           "kodi.binary.global.network"
-#define ADDON_GLOBAL_VERSION_NETWORK_DEPENDS          "Network.h"
+#define ADDON_GLOBAL_VERSION_NETWORK_DEPENDS          "Network.h" \
+                                                      "c-api/network.h"
 
-#define ADDON_INSTANCE_VERSION_AUDIODECODER           "2.0.0"
-#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "2.0.0"
+#define ADDON_GLOBAL_VERSION_TOOLS                    "1.0.1"
+#define ADDON_GLOBAL_VERSION_TOOLS_MIN                "1.0.0"
+#define ADDON_GLOBAL_VERSION_TOOLS_XML_ID             "kodi.binary.global.tools"
+#define ADDON_GLOBAL_VERSION_TOOLS_DEPENDS            "tools/DllHelper.h"
+
+#define ADDON_INSTANCE_VERSION_AUDIODECODER           "2.0.2"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "2.0.1"
 #define ADDON_INSTANCE_VERSION_AUDIODECODER_XML_ID    "kodi.binary.instance.audiodecoder"
 #define ADDON_INSTANCE_VERSION_AUDIODECODER_DEPENDS   "addon-instance/AudioDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "2.0.0"
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "2.0.0"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "2.0.2"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "2.0.1"
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_XML_ID    "kodi.binary.instance.audioencoder"
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "addon-instance/AudioEncoder.h"
 
-#define ADDON_INSTANCE_VERSION_GAME                   "1.1.0"
-#define ADDON_INSTANCE_VERSION_GAME_MIN               "1.1.0"
+#define ADDON_INSTANCE_VERSION_GAME                   "2.0.2"
+#define ADDON_INSTANCE_VERSION_GAME_MIN               "2.0.1"
 #define ADDON_INSTANCE_VERSION_GAME_XML_ID            "kodi.binary.instance.game"
-#define ADDON_INSTANCE_VERSION_GAME_DEPENDS           "kodi_game_dll.h" \
-                                                      "kodi_game_types.h" \
-                                                      "libKODI_game.h"
+#define ADDON_INSTANCE_VERSION_GAME_DEPENDS           "addon-instance/Game.h"
 
-#define ADDON_INSTANCE_VERSION_IMAGEDECODER           "2.0.0"
-#define ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN       "2.0.0"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER           "2.1.1"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN       "2.1.0"
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_XML_ID    "kodi.binary.instance.imagedecoder"
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "addon-instance/ImageDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.0.8"
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "2.0.7"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.3.3"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "2.3.1"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID     "kodi.binary.instance.inputstream"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "addon-instance/Inputstream.h"
 
-#define ADDON_INSTANCE_VERSION_PERIPHERAL             "1.3.7"
-#define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "1.3.4"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL             "1.3.9"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "1.3.8"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_XML_ID      "kodi.binary.instance.peripheral"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "addon-instance/Peripheral.h" \
                                                       "addon-instance/PeripheralUtils.h"
 
-#define ADDON_INSTANCE_VERSION_PVR                    "6.0.0"
-#define ADDON_INSTANCE_VERSION_PVR_MIN                "6.0.0"
+#define ADDON_INSTANCE_VERSION_PVR                    "7.0.1"
+#define ADDON_INSTANCE_VERSION_PVR_MIN                "7.0.0"
 #define ADDON_INSTANCE_VERSION_PVR_XML_ID             "kodi.binary.instance.pvr"
-#define ADDON_INSTANCE_VERSION_PVR_DEPENDS            "xbmc_pvr_dll.h" \
-                                                      "xbmc_pvr_types.h" \
-                                                      "xbmc_epg_types.h" \
-                                                      "libXBMC_pvr.h"
-
-#define ADDON_INSTANCE_VERSION_SCREENSAVER            "2.0.0"
-#define ADDON_INSTANCE_VERSION_SCREENSAVER_MIN        "2.0.0"
+#define ADDON_INSTANCE_VERSION_PVR_DEPENDS            "c-api/addon-instance/pvr.h" \
+                                                      "c-api/addon-instance/pvr/pvr_channel_groups.h" \
+                                                      "c-api/addon-instance/pvr/pvr_channels.h" \
+                                                      "c-api/addon-instance/pvr/pvr_defines.h" \
+                                                      "c-api/addon-instance/pvr/pvr_edl.h" \
+                                                      "c-api/addon-instance/pvr/pvr_epg.h" \
+                                                      "c-api/addon-instance/pvr/pvr_general.h" \
+                                                      "c-api/addon-instance/pvr/pvr_menu_hook.h" \
+                                                      "c-api/addon-instance/pvr/pvr_recordings.h" \
+                                                      "c-api/addon-instance/pvr/pvr_stream.h" \
+                                                      "c-api/addon-instance/pvr/pvr_timers.h" \
+                                                      "addon-instance/PVR.h" \
+                                                      "addon-instance/pvr/ChannelGroups.h" \
+                                                      "addon-instance/pvr/Channels.h" \
+                                                      "addon-instance/pvr/EDL.h" \
+                                                      "addon-instance/pvr/EPG.h" \
+                                                      "addon-instance/pvr/General.h" \
+                                                      "addon-instance/pvr/MenuHook.h" \
+                                                      "addon-instance/pvr/Recordings.h" \
+                                                      "addon-instance/pvr/Stream.h" \
+                                                      "addon-instance/pvr/Timers.h"
+
+#define ADDON_INSTANCE_VERSION_SCREENSAVER            "2.0.2"
+#define ADDON_INSTANCE_VERSION_SCREENSAVER_MIN        "2.0.1"
 #define ADDON_INSTANCE_VERSION_SCREENSAVER_XML_ID     "kodi.binary.instance.screensaver"
 #define ADDON_INSTANCE_VERSION_SCREENSAVER_DEPENDS    "addon-instance/Screensaver.h"
 
-#define ADDON_INSTANCE_VERSION_VFS                    "2.0.0"
-#define ADDON_INSTANCE_VERSION_VFS_MIN                "2.0.0"
+#define ADDON_INSTANCE_VERSION_VFS                    "2.3.2"
+#define ADDON_INSTANCE_VERSION_VFS_MIN                "2.3.1"
 #define ADDON_INSTANCE_VERSION_VFS_XML_ID             "kodi.binary.instance.vfs"
 #define ADDON_INSTANCE_VERSION_VFS_DEPENDS            "addon-instance/VFS.h"
 
-#define ADDON_INSTANCE_VERSION_VISUALIZATION          "2.0.1"
-#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "2.0.0"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION          "2.0.4"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "2.0.3"
 #define ADDON_INSTANCE_VERSION_VISUALIZATION_XML_ID   "kodi.binary.instance.visualization"
 #define ADDON_INSTANCE_VERSION_VISUALIZATION_DEPENDS  "addon-instance/Visualization.h"
 
-#define ADDON_INSTANCE_VERSION_VIDEOCODEC             "1.0.1"
-#define ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN         "1.0.1"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC             "1.0.3"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN         "1.0.2"
 #define ADDON_INSTANCE_VERSION_VIDEOCODEC_XML_ID      "kodi.binary.instance.videocodec"
 #define ADDON_INSTANCE_VERSION_VIDEOCODEC_DEPENDS     "addon-instance/VideoCodec.h" \
                                                       "StreamCodec.h" \
                                                       "StreamCrypto.h"
+// clang-format on
 
+//==============================================================================
 ///
+/// @ingroup cpp_kodi_addon_addonbase
 /// The currently available instance types for Kodi add-ons
 ///
 /// \internal
@@ -145,21 +175,47 @@ typedef enum ADDON_TYPE
   ADDON_GLOBAL_GENERAL = 3,
   ADDON_GLOBAL_NETWORK = 4,
   ADDON_GLOBAL_FILESYSTEM = 5,
-  ADDON_GLOBAL_MAX = 5, // Last used global id, used in loops to check versions. Need to change if new global type becomes added.
+  ADDON_GLOBAL_TOOLS = 6,
+  // Last used global id, used in loops to check versions.
+  // Need to change if new global type becomes added!
+  ADDON_GLOBAL_MAX = 6,
 
   /* addon type instances */
+
+  /// Audio decoder instance, see \ref cpp_kodi_addon_audiodecoder "kodi::addon::CInstanceAudioDecoder"
   ADDON_INSTANCE_AUDIODECODER = 102,
+
+  /// Audio encoder instance, see \ref cpp_kodi_addon_audioencoder "kodi::addon::CInstanceAudioEncoder"
   ADDON_INSTANCE_AUDIOENCODER = 103,
+
+  /// Game instance, see \ref cpp_kodi_addon_game "kodi::addon::CInstanceGame"
   ADDON_INSTANCE_GAME = 104,
+
+  /// Input stream instance, see \ref cpp_kodi_addon_inputstream "kodi::addon::CInstanceInputStream"
   ADDON_INSTANCE_INPUTSTREAM = 105,
+
+  /// Peripheral instance, see \ref cpp_kodi_addon_peripheral "kodi::addon::CInstancePeripheral"
   ADDON_INSTANCE_PERIPHERAL = 106,
+
+  /// Game instance, see \ref cpp_kodi_addon_pvr "kodi::addon::CInstancePVRClient"
   ADDON_INSTANCE_PVR = 107,
+
+  /// PVR client instance, see \ref cpp_kodi_addon_screensaver "kodi::addon::CInstanceScreensaver"
   ADDON_INSTANCE_SCREENSAVER = 108,
+
+  /// Music visualization instance, see \ref cpp_kodi_addon_visualization "kodi::addon::CInstanceVisualization"
   ADDON_INSTANCE_VISUALIZATION = 109,
+
+  /// Virtual Filesystem (VFS) instance, see \ref cpp_kodi_addon_vfs "kodi::addon::CInstanceVFS"
   ADDON_INSTANCE_VFS = 110,
+
+  /// Image Decoder instance, see \ref cpp_kodi_addon_imagedecoder "kodi::addon::CInstanceImageDecoder"
   ADDON_INSTANCE_IMAGEDECODER = 111,
+
+  /// Video Decoder instance, see \ref cpp_kodi_addon_videocodec "kodi::addon::CInstanceVideoCodec"
   ADDON_INSTANCE_VIDEOCODEC = 112,
 } ADDON_TYPE;
+//------------------------------------------------------------------------------
 
 #ifdef __cplusplus
 extern "C" {
@@ -205,6 +261,10 @@ inline const char* GetTypeVersion(int type)
     case ADDON_GLOBAL_NETWORK:
       return ADDON_GLOBAL_VERSION_NETWORK;
 #endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_GLOBAL_VERSION_TOOLS_USED)
+    case ADDON_GLOBAL_TOOLS:
+      return ADDON_GLOBAL_VERSION_TOOLS;
+#endif
 
     /* addon type instances */
 #if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_AUDIODECODER_USED)
@@ -280,6 +340,8 @@ inline const char* GetTypeMinVersion(int type)
       return ADDON_GLOBAL_VERSION_FILESYSTEM_MIN;
     case ADDON_GLOBAL_NETWORK:
       return ADDON_GLOBAL_VERSION_NETWORK_MIN;
+    case ADDON_GLOBAL_TOOLS:
+      return ADDON_GLOBAL_VERSION_TOOLS_MIN;
 
     /* addon type instances */
     case ADDON_INSTANCE_AUDIODECODER:
@@ -332,6 +394,8 @@ inline const char* GetTypeName(int type)
       return "Filesystem";
     case ADDON_GLOBAL_NETWORK:
       return "Network";
+    case ADDON_GLOBAL_TOOLS:
+      return "Tools";
 
     /* addon type instances */
     case ADDON_INSTANCE_AUDIODECODER:
@@ -383,6 +447,8 @@ inline int GetTypeId(const char* name)
       return ADDON_GLOBAL_FILESYSTEM;
     else if (strcmp(name, "network") == 0)
       return ADDON_GLOBAL_NETWORK;
+    else if (strcmp(name, "tools") == 0)
+      return ADDON_GLOBAL_TOOLS;
     else if (strcmp(name, "audiodecoder") == 0)
       return ADDON_INSTANCE_AUDIODECODER;
     else if (strcmp(name, "audioencoder") == 0)
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h
deleted file mode 100644
index ce2bc98..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  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"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  ADDON_STATUS __declspec(dllexport) ADDON_Create(void *callbacks, void* props);
-  ADDON_STATUS __declspec(dllexport) ADDON_CreateEx(void *callbacks, const char* globalApiVersion, void* props);
-  void         __declspec(dllexport) ADDON_Destroy();
-  ADDON_STATUS __declspec(dllexport) ADDON_GetStatus();
-  ADDON_STATUS __declspec(dllexport) ADDON_SetSetting(const char *settingName, const void *settingValue);
-  __declspec(dllexport) const char* ADDON_GetTypeVersion(int type)
-  {
-    return kodi::addon::GetTypeVersion(type);
-  }
-  __declspec(dllexport) const char* ADDON_GetTypeMinVersion(int type)
-  {
-    return kodi::addon::GetTypeMinVersion(type);
-  }
-
-#ifdef __cplusplus
-};
-#endif
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h
deleted file mode 100644
index bfd85c2..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- *  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" // compatibility fallback
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h
deleted file mode 100644
index 30503d5..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  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 <string.h>
-#include <time.h>
-
-#undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN
-#undef PRAGMA_PACK_END
-
-#if defined(__GNUC__)
-#define ATTRIBUTE_PACKED __attribute__ ((packed))
-#define PRAGMA_PACK 0
-#endif
-
-#if !defined(ATTRIBUTE_PACKED)
-#define ATTRIBUTE_PACKED
-#define PRAGMA_PACK 1
-#endif
-
-/*! @name EPG entry content event types */
-//@{
-/* These IDs come from the DVB-SI EIT table "content descriptor"
- * Also known under the name "E-book genre assignments"
- */
-#define EPG_EVENT_CONTENTMASK_UNDEFINED                0x00
-#define EPG_EVENT_CONTENTMASK_MOVIEDRAMA               0x10
-#define EPG_EVENT_CONTENTMASK_NEWSCURRENTAFFAIRS       0x20
-#define EPG_EVENT_CONTENTMASK_SHOW                     0x30
-#define EPG_EVENT_CONTENTMASK_SPORTS                   0x40
-#define EPG_EVENT_CONTENTMASK_CHILDRENYOUTH            0x50
-#define EPG_EVENT_CONTENTMASK_MUSICBALLETDANCE         0x60
-#define EPG_EVENT_CONTENTMASK_ARTSCULTURE              0x70
-#define EPG_EVENT_CONTENTMASK_SOCIALPOLITICALECONOMICS 0x80
-#define EPG_EVENT_CONTENTMASK_EDUCATIONALSCIENCE       0x90
-#define EPG_EVENT_CONTENTMASK_LEISUREHOBBIES           0xA0
-#define EPG_EVENT_CONTENTMASK_SPECIAL                  0xB0
-#define EPG_EVENT_CONTENTMASK_USERDEFINED              0xF0
-//@}
-
-/* Set EPGTAG.iGenreType to EPG_GENRE_USE_STRING to transfer genre strings to Kodi */
-#define EPG_GENRE_USE_STRING                           0x100
-
-/* Separator to use in strings containing different tokens, for example writers, directors, actors of an event. */
-#define EPG_STRING_TOKEN_SEPARATOR ","
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  /* EPG_TAG.iFlags values */
-  const unsigned int EPG_TAG_FLAG_UNDEFINED = 0x00000000; /*!< @brief nothing special to say about this entry */
-  const unsigned int EPG_TAG_FLAG_IS_SERIES = 0x00000001; /*!< @brief this EPG entry is part of a series */
-
-  /* Special EPG_TAG.iUniqueBroadcastId value */
-
-  /*!
-   * @brief special EPG_TAG.iUniqueBroadcastId value to indicate that a tag has not a valid EPG event uid.
-   */
-  const unsigned int EPG_TAG_INVALID_UID = 0;
-
-  /*!
-   * @brief EPG event states. Used with EpgEventStateChange callback.
-   */
-  typedef enum
-  {
-    EPG_EVENT_CREATED = 0,  /*!< @brief event created */
-    EPG_EVENT_UPDATED = 1,  /*!< @brief event updated */
-    EPG_EVENT_DELETED = 2,  /*!< @brief event deleted */
-  } EPG_EVENT_STATE;
-
-  /*!
-   * @brief Representation of an EPG event.
-   */
-  typedef struct EPG_TAG {
-    unsigned int  iUniqueBroadcastId;  /*!< @brief (required) identifier for this event. Event uids must be unique for a channel. Valid uids must be greater than EPG_TAG_INVALID_UID. */
-    unsigned int  iUniqueChannelId;    /*!< @brief (required) unique identifier of the channel this event belongs to. */
-    const char *  strTitle;            /*!< @brief (required) this event's title */
-    time_t        startTime;           /*!< @brief (required) start time in UTC */
-    time_t        endTime;             /*!< @brief (required) end time in UTC */
-    const char *  strPlotOutline;      /*!< @brief (optional) plot outline */
-    const char *  strPlot;             /*!< @brief (optional) plot */
-    const char *  strOriginalTitle;    /*!< @brief (optional) originaltitle */
-    const char *  strCast;             /*!< @brief (optional) cast. Use EPG_STRING_TOKEN_SEPARATOR to separate different persons. */
-    const char *  strDirector;         /*!< @brief (optional) director(s). Use EPG_STRING_TOKEN_SEPARATOR to separate different persons. */
-    const char *  strWriter;           /*!< @brief (optional) writer(s). Use EPG_STRING_TOKEN_SEPARATOR to separate different persons. */
-    int           iYear;               /*!< @brief (optional) year */
-    const char *  strIMDBNumber;       /*!< @brief (optional) IMDBNumber */
-    const char *  strIconPath;         /*!< @brief (optional) icon path */
-    int           iGenreType;          /*!< @brief (optional) genre type */
-    int           iGenreSubType;       /*!< @brief (optional) genre sub type */
-    const char *  strGenreDescription; /*!< @brief (optional) genre. Will be used only when iGenreType == EPG_GENRE_USE_STRING. Use EPG_STRING_TOKEN_SEPARATOR to separate different genres. */
-    time_t        firstAired;          /*!< @brief (optional) first aired in UTC */
-    int           iParentalRating;     /*!< @brief (optional) parental rating */
-    int           iStarRating;         /*!< @brief (optional) star rating */
-    int           iSeriesNumber;       /*!< @brief (optional) series number */
-    int           iEpisodeNumber;      /*!< @brief (optional) episode number */
-    int           iEpisodePartNumber;  /*!< @brief (optional) episode part number */
-    const char *  strEpisodeName;      /*!< @brief (optional) episode name */
-    unsigned int  iFlags;              /*!< @brief (optional) bit field of independent flags associated with the EPG entry */
-    const char *  strSeriesLink;       /*!< @brief (optional) series link for this event */
-  } ATTRIBUTE_PACKED EPG_TAG;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
deleted file mode 100644
index 26e9099..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
+++ /dev/null
@@ -1,784 +0,0 @@
-/*
- *  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 "xbmc_addon_dll.h"
-#include "xbmc_pvr_types.h"
-
-/*!
- * Functions that the PVR client add-on must implement, but some can be empty.
- *
- * The 'remarks' field indicates which methods should be implemented, and which ones are optional.
- */
-
-extern "C"
-{
-  /*! @name PVR add-on methods */
-  //@{
-  /*!
-   * 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 pCapabilities The add-on's capabilities.
-   * @return PVR_ERROR_NO_ERROR if the properties were fetched successfully.
-   * @remarks Valid implementation required.
-   */
-  PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities);
-
-  /*!
-   * @return The name reported by the backend that will be displayed in the UI.
-   * @remarks Valid implementation required.
-   */
-  const char* GetBackendName(void);
-
-  /*!
-   * @return The version string reported by the backend that will be displayed in the UI.
-   * @remarks Valid implementation required.
-   */
-  const char* GetBackendVersion(void);
-
-  /*!
-   * @return The connection string reported by the backend that will be displayed in the UI.
-   * @remarks Valid implementation required.
-   */
-  const char* GetConnectionString(void);
-
-  /*!
-   * Get the disk space reported by the backend (if supported).
-   * @param iTotal The total disk space in bytes.
-   * @param iUsed The used disk space in bytes.
-   * @return PVR_ERROR_NO_ERROR if the drive space has been fetched successfully.
-   * @remarks Optional. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetDriveSpace(long long* iTotal, long long* iUsed);
-
-  /*!
-   * Call one of the menu hooks (if supported).
-   * Supported PVR_MENUHOOK instances have to be added in ADDON_Create(), by calling AddMenuHook() on the callback.
-   * @param menuhook The hook to call.
-   * @param item The selected item for which the hook was called.
-   * @return PVR_ERROR_NO_ERROR if the hook was called successfully.
-   * @remarks Optional. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR CallMenuHook(const PVR_MENUHOOK& menuhook, const PVR_MENUHOOK_DATA &item);
-  //@}
-
-  /*! @name PVR EPG methods
-   *  @remarks Only used by Kodi if bSupportsEPG is set to true.
-   */
-  //@{
-  /*!
-   * Request the EPG for a channel from the backend.
-   * EPG entries are added to Kodi by calling TransferEpgEntry() on the callback.
-   * @param handle Handle to pass to the callback method.
-   * @param iChannelUid The UID of the channel to get the EPG table for.
-   * @param iStart Get events after this time (UTC).
-   * @param iEnd Get events before this time (UTC).
-   * @return PVR_ERROR_NO_ERROR if the table has been fetched successfully.
-   * @remarks Required if bSupportsEPG is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetEPGForChannel(ADDON_HANDLE handle, int iChannelUid, time_t iStart, time_t iEnd);
-
-  /*
-   * Check if the given EPG tag can be recorded.
-   * @param tag the epg tag to check.
-   * @param [out] bIsRecordable Set to true if the tag can be recorded.
-   * @return PVR_ERROR_NO_ERROR if bIsRecordable has been set successfully.
-   * @remarks Optional, return PVR_ERROR_NOT_IMPLEMENTED to let Kodi decide.
-   */
-  PVR_ERROR IsEPGTagRecordable(const EPG_TAG* tag, bool* bIsRecordable);
-
-  /*
-   * Check if the given EPG tag can be played.
-   * @param tag the epg tag to check.
-   * @param [out] bIsPlayable Set to true if the tag can be played.
-   * @return PVR_ERROR_NO_ERROR if bIsPlayable has been set successfully.
-   * @remarks Required if add-on supports playing epg tags.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR IsEPGTagPlayable(const EPG_TAG* tag, bool* bIsPlayable);
-
-  /*!
-   * Retrieve the edit decision list (EDL) of an EPG tag on the backend.
-   * @param epgTag The EPG tag.
-   * @param edl out: The function has to write the EDL into this array.
-   * @param size in: The maximum size of the EDL, out: the actual size of the EDL.
-   * @return PVR_ERROR_NO_ERROR if the EDL was successfully read or no EDL exists.
-   * @remarks Required if bSupportsEpgEdl is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetEPGTagEdl(const EPG_TAG* epgTag, PVR_EDL_ENTRY edl[], int *size);
-
-  /*!
-   * Get the stream properties for an epg tag from the backend.
-   * @param[in] tag The epg tag to get the stream properties for.
-   * @param[inout] properties in: an array for the properties to return, out: the properties required to play the stream.
-   * @param[inout] iPropertiesCount in: the size of the properties array, out: the number of properties returned.
-   * @return PVR_ERROR_NO_ERROR if the stream is available.
-   * @remarks Required if add-on supports playing epg tags.
-   *          In this case your implementation must fill the property PVR_STREAM_PROPERTY_STREAMURL with the URL Kodi should resolve to playback the epg tag.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetEPGTagStreamProperties(const EPG_TAG* tag, PVR_NAMED_VALUE* properties, unsigned int* iPropertiesCount);
-
-  //@}
-
-  /*! @name PVR channel group methods
-   *  @remarks Only used by Kodi if bSupportsChannelGroups is set to true.
-   *           If a group or one of the group members changes after the initial import, or if a new one was added, then the add-on
-   *           should call TriggerChannelGroupsUpdate()
-   */
-  //@{
-  /*!
-   * Get the total amount of channel groups on the backend if it supports channel groups.
-   * @return The amount of channels, or -1 on error.
-   * @remarks Required if bSupportsChannelGroups is set to true.
-   *          Return -1 if this add-on won't provide this function.
-   */
-  int GetChannelGroupsAmount(void);
-
-  /*!
-   * Request the list of all channel groups from the backend if it supports channel groups.
-   * Channel group entries are added to Kodi by calling TransferChannelGroup() on the callback.
-   * @param handle Handle to pass to the callback method.
-   * @param bRadio True to get the radio channel groups, false to get the TV channel groups.
-   * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-   * @remarks Required if bSupportsChannelGroups is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetChannelGroups(ADDON_HANDLE handle, bool bRadio);
-
-  /*!
-   * Request the list of all group members of a group from the backend if it supports channel groups.
-   * Member entries are added to Kodi by calling TransferChannelGroupMember() on the callback.
-   * @param handle Handle to pass to the callback method.
-   * @param group The group to get the members for.
-   * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-   * @remarks Required if bSupportsChannelGroups is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetChannelGroupMembers(ADDON_HANDLE handle, const PVR_CHANNEL_GROUP& group);
-  //@}
-
-  /** @name PVR channel methods
-   *  @remarks Either bSupportsTV or bSupportsRadio is required to be set to true.
-   *           If a channel changes after the initial import, or if a new one was added, then the add-on
-   *           should call TriggerChannelUpdate()
-   */
-  //@{
-  /*!
-   * Show the channel scan dialog if this backend supports it.
-   * @return PVR_ERROR_NO_ERROR if the dialog was displayed successfully.
-   * @remarks Required if bSupportsChannelScan is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   * @note see libKODI_guilib.h about related parts
-   */
-  PVR_ERROR OpenDialogChannelScan(void);
-
-  /*!
-   * @return The total amount of channels on the backend, or -1 on error.
-   * @remarks Valid implementation required.
-   */
-  int GetChannelsAmount(void);
-
-  /*!
-   * Request the list of all channels from the backend.
-   * Channel entries are added to Kodi by calling TransferChannelEntry() on the callback.
-   * @param handle Handle to pass to the callback method.
-   * @param bRadio True to get the radio channels, false to get the TV channels.
-   * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-   * @remarks If bSupportsTV is set to true, a valid result set needs to be provided for bRadio = false.
-   *          If bSupportsRadio is set to true, a valid result set needs to be provided for bRadio = true.
-   *          At least one of these two must provide a valid result set.
-   */
-  PVR_ERROR GetChannels(ADDON_HANDLE handle, bool bRadio);
-
-  /*!
-   * Delete a channel from the backend.
-   * @param channel The channel to delete.
-   * @return PVR_ERROR_NO_ERROR if the channel has been deleted successfully.
-   * @remarks Required if bSupportsChannelSettings is set to true.
-   */
-  PVR_ERROR DeleteChannel(const PVR_CHANNEL& channel);
-
-  /*!
-   * Rename a channel on the backend.
-   * @param channel The channel to rename, containing the new channel name.
-   * @return PVR_ERROR_NO_ERROR if the channel has been renamed successfully.
-   * @remarks Optional, and only used if bSupportsChannelSettings is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR RenameChannel(const PVR_CHANNEL& channel);
-
-  /*!
-   * Show the channel settings dialog, if supported by the backend.
-   * @param channel The channel to show the dialog for.
-   * @return PVR_ERROR_NO_ERROR if the dialog has been displayed successfully.
-   * @remarks Required if bSupportsChannelSettings is set to true.
-   * @note see libKODI_guilib.h about related parts
-   */
-  PVR_ERROR OpenDialogChannelSettings(const PVR_CHANNEL& channel);
-
-  /*!
-   * Show the dialog to add a channel on the backend, if supported by the backend.
-   * @param channel The channel to add.
-   * @return PVR_ERROR_NO_ERROR if the channel has been added successfully.
-   * @remarks Required if bSupportsChannelSettings is set to true.
-   * @note see libKODI_guilib.h about related parts
-   */
-  PVR_ERROR OpenDialogChannelAdd(const PVR_CHANNEL& channel);
-  //@}
-
-  /** @name PVR recording methods
-   *  @remarks Only used by Kodi if bSupportsRecordings is set to true.
-   *           If a recording changes after the initial import, or if a new one was added,
-   *           then the add-on should call TriggerRecordingUpdate()
-   */
-  //@{
-  /*!
-   * @return The total amount of recordings on the backend or -1 on error.
-   * @param deleted if set return deleted recording (called if bSupportsRecordingsUndelete set to true)
-   * @remarks Required if bSupportsRecordings is set to true. Return -1 if this add-on won't provide this function.
-   */
-  int GetRecordingsAmount(bool deleted);
-
-  /*!
-   * Request the list of all recordings from the backend, if supported.
-   * Recording entries are added to Kodi by calling TransferRecordingEntry() on the callback.
-   * @param handle Handle to pass to the callback method.
-   * @param deleted if set return deleted recording (called if bSupportsRecordingsUndelete set to true)
-   * @return PVR_ERROR_NO_ERROR if the recordings have been fetched successfully.
-   * @remarks Required if bSupportsRecordings is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetRecordings(ADDON_HANDLE handle, bool deleted);
-
-  /*!
-   * Delete a recording on the backend.
-   * @param recording The recording to delete.
-   * @return PVR_ERROR_NO_ERROR if the recording has been deleted successfully.
-   * @remarks Optional, and only used if bSupportsRecordings is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR DeleteRecording(const PVR_RECORDING& recording);
-
-  /*!
-   * Undelete a recording on the backend.
-   * @param recording The recording to undelete.
-   * @return PVR_ERROR_NO_ERROR if the recording has been undeleted successfully.
-   * @remarks Optional, and only used if bSupportsRecordingsUndelete is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR UndeleteRecording(const PVR_RECORDING& recording);
-
-  /*!
-   * @brief Delete all recordings permanent which in the deleted folder on the backend.
-   * @return PVR_ERROR_NO_ERROR if the recordings has been deleted successfully.
-   */
-  PVR_ERROR DeleteAllRecordingsFromTrash();
-
-  /*!
-   * Rename a recording on the backend.
-   * @param recording The recording to rename, containing the new name.
-   * @return PVR_ERROR_NO_ERROR if the recording has been renamed successfully.
-   * @remarks Optional, and only used if bSupportsRecordings is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR RenameRecording(const PVR_RECORDING& recording);
-
-  /*!
-   * Set the lifetime of a recording on the backend.
-   * @param recording The recording to change the lifetime for. recording.iLifetime contains the new lieftime value.
-   * @return PVR_ERROR_NO_ERROR if the recording's lifetime has been set successfully.
-   * @remarks Required if bSupportsRecordingsLifetimeChange is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR SetRecordingLifetime(const PVR_RECORDING* recording);
-
-  /*!
-   * Set the play count of a recording on the backend.
-   * @param recording The recording to change the play count.
-   * @param count Play count.
-   * @return PVR_ERROR_NO_ERROR if the recording's play count has been set successfully.
-   * @remarks Required if bSupportsRecordingPlayCount is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR SetRecordingPlayCount(const PVR_RECORDING& recording, int count);
-
-  /*!
-   * Set the last watched position of a recording on the backend.
-   * @param recording The recording.
-   * @param lastplayedposition The last watched position in seconds
-   * @return PVR_ERROR_NO_ERROR if the position has been stored successfully.
-   * @remarks Required if bSupportsLastPlayedPosition is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR SetRecordingLastPlayedPosition(const PVR_RECORDING& recording, int lastplayedposition);
-
-  /*!
-   * Retrieve the last watched position of a recording on the backend.
-   * @param recording The recording.
-   * @return The last watched position in seconds or -1 on error
-   * @remarks Required if bSupportsRecordingPlayCount is set to true.
-   *          Return -1 if this add-on won't provide this function.
-   */
-  int GetRecordingLastPlayedPosition(const PVR_RECORDING& recording);
-
-  /*!
-   * Retrieve the edit decision list (EDL) of a recording on the backend.
-   * @param recording The recording.
-   * @param edl out: The function has to write the EDL into this array.
-   * @param size in: The maximum size of the EDL, out: the actual size of the EDL.
-   * @return PVR_ERROR_NO_ERROR if the EDL was successfully read or no EDL exists.
-   * @remarks Required if bSupportsRecordingEdl is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetRecordingEdl(const PVR_RECORDING& recording, PVR_EDL_ENTRY edl[], int *size);
-
-  /*!
-   * Retrieve the timer types supported by the backend.
-   * @param types out: The function has to write the definition of the supported timer types into this array.
-   * @param typesCount in: The maximum size of the list, out: the actual size of the list. default: PVR_ADDON_TIMERTYPE_ARRAY_SIZE
-   * @return PVR_ERROR_NO_ERROR if the types were successfully written to the array.
-   * @remarks Required if bSupportsTimers is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetTimerTypes(PVR_TIMER_TYPE types[], int *typesCount);
-
-  //@}
-  /** @name PVR timer methods
-   *  @remarks Only used by Kodi if bSupportsTimers is set to true.
-   *           If a timer changes after the initial import, or if a new one was added,
-   *           then the add-on should call TriggerTimerUpdate()
-   */
-  //@{
-  /*!
-   * @return The total amount of timers on the backend or -1 on error.
-   * @remarks Required if bSupportsTimers is set to true. Return -1 if this add-on won't provide this function.
-   */
-  int GetTimersAmount(void);
-
-  /*!
-   * Request the list of all timers from the backend if supported.
-   * Timer entries are added to Kodi by calling TransferTimerEntry() on the callback.
-   * @param handle Handle to pass to the callback method.
-   * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-   * @remarks Required if bSupportsTimers is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetTimers(ADDON_HANDLE handle);
-
-  /*!
-   * Add a timer on the backend.
-   * @param timer The timer to add.
-   * @return PVR_ERROR_NO_ERROR if the timer has been added successfully.
-   * @remarks Required if bSupportsTimers is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR AddTimer(const PVR_TIMER& timer);
-
-  /*!
-   * Delete a timer on the backend.
-   * @param timer The timer to delete.
-   * @param bForceDelete Set to true to delete a timer that is currently recording a program.
-   * @return PVR_ERROR_NO_ERROR if the timer has been deleted successfully.
-   * @remarks Required if bSupportsTimers is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR DeleteTimer(const PVR_TIMER& timer, bool bForceDelete);
-
-  /*!
-   * Update the timer information on the backend.
-   * @param timer The timer to update.
-   * @return PVR_ERROR_NO_ERROR if the timer has been updated successfully.
-   * @remarks Required if bSupportsTimers is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR UpdateTimer(const PVR_TIMER& timer);
-
-  //@}
-
-  /** @name PVR live stream methods, used to open and close a stream to a channel, and optionally perform read operations on the stream */
-  //@{
-  /*!
-   * Open a live stream on the backend.
-   * @param channel The channel to stream.
-   * @return True if the stream has been opened successfully, false otherwise.
-   * @remarks Required if bHandlesInputStream or bHandlesDemuxing is set to true.
-   *          CloseLiveStream() will always be called by Kodi prior to calling this function.
-   *          Return false if this add-on won't provide this function.
-   */
-  bool OpenLiveStream(const PVR_CHANNEL& channel);
-
-  /*!
-   * Close an open live stream.
-   * @remarks Required if bHandlesInputStream or bHandlesDemuxing is set to true.
-   */
-  void CloseLiveStream(void);
-
-  /*!
-   * Read from an open live stream.
-   * @param pBuffer The buffer to store the data in.
-   * @param iBufferSize The amount of bytes to read.
-   * @return The amount of bytes that were actually read from the stream.
-   * @remarks Required if bHandlesInputStream is set to true.
-   *          Return -1 if this add-on won't provide this function.
-   */
-  int ReadLiveStream(unsigned char* pBuffer, unsigned int iBufferSize);
-
-  /*!
-   * Seek in a live stream on a backend that supports timeshifting.
-   * @param iPosition The position to seek to.
-   * @param iWhence ?
-   * @return The new position.
-   * @remarks Optional, and only used if bHandlesInputStream is set to true.
-   *          Return -1 if this add-on won't provide this function.
-   */
-  long long SeekLiveStream(long long iPosition, int iWhence = SEEK_SET);
-
-  /*!
-   * 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 bHandlesInputStream is set to true.
-   *          Return -1 if this add-on won't provide this function.
-   */
-  long long LengthLiveStream(void);
-
-  /*!
-   * Get the signal status of the stream that's currently open.
-   * @param signalStatus The signal status.
-   * @return PVR_ERROR_NO_ERROR if the signal status has been read successfully, false otherwise.
-   * @remarks Optional, and only used if PVR_ADDON_CAPABILITIES::bHandlesInputStream or PVR_ADDON_CAPABILITIES::bHandlesDemuxing is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS& signalStatus);
-
-  /*!
-   * Get the descramble information of the stream that's currently open.
-   * @param [out] descrambleInfo The descramble information.
-   * @return PVR_ERROR_NO_ERROR if the descramble information has been read successfully, false otherwise.
-   * @remarks Optional, and only used if PVR_ADDON_CAPABILITIES::bSupportsDescrambleInfo is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetDescrambleInfo(PVR_DESCRAMBLE_INFO* descrambleInfo);
-
-  /*!
-   * Get the stream properties for a channel from the backend.
-   * @param[in] channel The channel to get the stream properties for.
-   * @param[inout] properties in: an array for the properties to return, out: the properties required to play the stream.
-   * @param[inout] iPropertiesCount in: the size of the properties array, out: the number of properties returned.
-   * @return PVR_ERROR_NO_ERROR if the stream is available.
-   * @remarks Required if PVR_ADDON_CAPABILITIES::bSupportsTV or PVR_ADDON_CAPABILITIES::bSupportsRadio are set to true and PVR_ADDON_CAPABILITIES::bHandlesInputStream is set to false.
-   *          In this case the implementation must fill the property PVR_STREAM_PROPERTY_STREAMURL with the URL Kodi should resolve to playback the channel.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetChannelStreamProperties(const PVR_CHANNEL* channel, PVR_NAMED_VALUE* properties, unsigned int* iPropertiesCount);
-
-  /*!
-   * Get the stream properties for a recording from the backend.
-   * @param[in] recording The recording to get the stream properties for.
-   * @param[inout] properties in: an array for the properties to return, out: the properties required to play the stream.
-   * @param[inout] iPropertiesCount in: the size of the properties array, out: the number of properties returned.
-   * @return PVR_ERROR_NO_ERROR if the stream is available.
-   * @remarks Required if PVR_ADDON_CAPABILITIES::bSupportsRecordings is set to true and the add-on does not implement recording stream functions (OpenRecordedStream, ...).
-   *          In this case your implementation must fill the property PVR_STREAM_PROPERTY_STREAMURL with the URL Kodi should resolve to playback the recording.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetRecordingStreamProperties(const PVR_RECORDING* recording, PVR_NAMED_VALUE* properties, unsigned int* iPropertiesCount);
-
-  /*!
-   * Get the stream properties of the stream that's currently being read.
-   * @param pProperties The properties of the currently playing stream.
-   * @return PVR_ERROR_NO_ERROR if the properties have been fetched successfully.
-   * @remarks Required if bHandlesDemuxing is set to true.
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR GetStreamProperties(PVR_STREAM_PROPERTIES* pProperties);
-  //@}
-
-  /** @name PVR recording stream methods, used to open and close a stream to a recording, and perform read operations on the stream.
-   *  @remarks This will only be used if the backend doesn't provide a direct URL in the recording tag.
-   */
-  //@{
-  /*!
-   * Obtain the chunk size to use when reading streams.
-   * @param chunksize must be filled with the chunk size in bytes.
-   * @return PVR_ERROR_NO_ERROR if the chunk size has been fetched successfully.
-   * @remarks Optional, and only used if not reading from demuxer (=> DemuxRead) and
-   *          PVR_ADDON_CAPABILITIES::bSupportsRecordings is true (=> ReadRecordedStream) or
-   *          PVR_ADDON_CAPABILITIES::bHandlesInputStream is true (=> ReadLiveStream).
-   *          Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function. In this case Kodi will decide on the chunk size to use.
-   */
-  PVR_ERROR GetStreamReadChunkSize(int* chunksize);
-
-  /*!
-   * Open a stream to a recording on the backend.
-   * @param recording The recording to open.
-   * @return True if the stream has been opened successfully, false otherwise.
-   * @remarks Optional, and only used if bSupportsRecordings is set to true.
-   *          CloseRecordedStream() will always be called by Kodi prior to calling this function.
-   *          Return false if this add-on won't provide this function.
-   */
-  bool OpenRecordedStream(const PVR_RECORDING& recording);
-
-  /*!
-   * Close an open stream from a recording.
-   * @remarks Optional, and only used if bSupportsRecordings is set to true.
-   */
-  void CloseRecordedStream(void);
-
-  /*!
-   * Read from a recording.
-   * @param pBuffer The buffer to store the data in.
-   * @param iBufferSize The amount of bytes to read.
-   * @return The amount of bytes that were actually read from the stream.
-   * @remarks Optional, and only used if bSupportsRecordings is set to true, but required if OpenRecordedStream() is implemented.
-   *          Return -1 if this add-on won't provide this function.
-   */
-  int ReadRecordedStream(unsigned char* pBuffer, unsigned int iBufferSize);
-
-  /*!
-   * Seek in a recorded stream.
-   * @param iPosition The position to seek to.
-   * @param iWhence ?
-   * @return The new position.
-   * @remarks Optional, and only used if bSupportsRecordings is set to true.
-   *          Return -1 if this add-on won't provide this function.
-   */
-  long long SeekRecordedStream(long long iPosition, int iWhence = SEEK_SET);
-
-  /*!
-   * 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 bSupportsRecordings is set to true.
-   *          Return -1 if this add-on won't provide this function.
-   */
-  long long LengthRecordedStream(void);
-
-  //@}
-
-  /** @name PVR demultiplexer methods
-   *  @remarks Only used by Kodi if bHandlesDemuxing is set to true.
-   */
-  //@{
-  /*!
-   * Reset the demultiplexer in the add-on.
-   * @remarks Required if bHandlesDemuxing is set to true.
-   */
-  void DemuxReset(void);
-
-  /*!
-   * Abort the demultiplexer thread in the add-on.
-   * @remarks Required if bHandlesDemuxing is set to true.
-   */
-  void DemuxAbort(void);
-
-  /*!
-   * Flush all data that's currently in the demultiplexer buffer in the add-on.
-   * @remarks Required if bHandlesDemuxing is set to true.
-   */
-  void DemuxFlush(void);
-
-  /*!
-   * 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 AllocateDemuxPacket(0) on the callback.
-   *         If the stream changed and Kodi's player needs to be reinitialised,
-   *         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.
-   * @remarks Required if bHandlesDemuxing is set to true.
-   *          Return NULL if this add-on won't provide this function.
-   */
-  DemuxPacket* DemuxRead(void);
-  //@}
-
-  /*!
-   * 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
-   */
-  bool CanPauseStream();
-
-  /*!
-   * 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
-   */
-  bool CanSeekStream();
-
-  /*!
-   * @brief Notify the pvr addon that Kodi (un)paused the currently playing stream
-   */
-  void PauseStream(bool bPaused);
-
-  /*!
-   * Notify the pvr addon/demuxer that Kodi wishes to seek the stream by time
-   * @param time The absolute time since stream start
-   * @param backwards True to seek to keyframe BEFORE time, else AFTER
-   * @param 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.
-   */
-  bool SeekTime(double time, bool backwards, double *startpts);
-
-  /*!
-   * Notify the pvr 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.
-   */
-  void SetSpeed(int speed);
-
-  /*!
-   * Notify the pvr addon/demuxer that Kodi wishes to fill demux queue
-   * @param mode The requested filling mode
-   * @remarks Optional, and only used if addon has its own demuxer.
-   */
-  void FillBuffer(bool mode);
-
-  /*!
-   *  Get the hostname of the pvr backend server
-   *  @return hostname as ip address or alias. If backend does not utilize a server, return empty string.
-   */
-  const char* GetBackendHostname();
-
-  /*!
-   *  Check for real-time streaming
-   *  @return true if current stream is real-time
-   */
-  bool IsRealTimeStream();
-
-  /*!
-   * Tell the client the time frame to use when notifying epg events back to Kodi. The client might push epg events asynchronously
-   * to Kodi using the callback function EpgEventStateChange. To be able to only push events that are actually of interest for Kodi,
-   * client needs to know about the epg time frame Kodi uses. Kodi supplies the current epg time frame value in PVR_PROPERTIES.iEpgMaxDays
-   * when creating the addon and calls SetEPGTimeFrame later whenever Kodi's epg time frame value changes.
-   * @param iDays number of days from "now". EPG_TIMEFRAME_UNLIMITED means that Kodi is interested in all epg events, regardless of event times.
-   * @return PVR_ERROR_NO_ERROR if new value was successfully set.
-   * @remarks Required if bSupportsEPG is set to true. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
-   */
-  PVR_ERROR SetEPGTimeFrame(int iDays);
-
-  /*!
-   * Notify the pvr addon for power management events
-   */
-  void OnSystemSleep();
-  void OnSystemWake();
-  void OnPowerSavingActivated();
-  void OnPowerSavingDeactivated();
-
-  /*!
-   * Get stream times.
-   * @param times A pointer to the data to be filled by the implementation.
-   * @return PVR_ERROR_NO_ERROR on success.
-   */
-  PVR_ERROR GetStreamTimes(PVR_STREAM_TIMES *times);
-
-  /*!
-   * Called by Kodi to assign the function pointers of this add-on to pClient.
-   * @param ptr The struct to assign the function pointers to.
-   */
-  void __declspec(dllexport) get_addon(void* ptr)
-  {
-    AddonInstance_PVR* pClient = static_cast<AddonInstance_PVR*>(ptr);
-
-    pClient->toAddon.addonInstance = nullptr; // used in future
-
-    pClient->toAddon.GetAddonCapabilities           = GetAddonCapabilities;
-    pClient->toAddon.GetStreamProperties            = GetStreamProperties;
-    pClient->toAddon.GetConnectionString            = GetConnectionString;
-    pClient->toAddon.GetBackendName                 = GetBackendName;
-    pClient->toAddon.GetBackendVersion              = GetBackendVersion;
-    pClient->toAddon.GetDriveSpace                  = GetDriveSpace;
-    pClient->toAddon.OpenDialogChannelScan          = OpenDialogChannelScan;
-    pClient->toAddon.MenuHook                       = CallMenuHook;
-
-    pClient->toAddon.GetEPGForChannel               = GetEPGForChannel;
-    pClient->toAddon.IsEPGTagRecordable             = IsEPGTagRecordable;
-    pClient->toAddon.IsEPGTagPlayable               = IsEPGTagPlayable;
-    pClient->toAddon.GetEPGTagEdl                   = GetEPGTagEdl;
-    pClient->toAddon.GetEPGTagStreamProperties      = GetEPGTagStreamProperties;
-
-    pClient->toAddon.GetChannelGroupsAmount         = GetChannelGroupsAmount;
-    pClient->toAddon.GetChannelGroups               = GetChannelGroups;
-    pClient->toAddon.GetChannelGroupMembers         = GetChannelGroupMembers;
-
-    pClient->toAddon.GetChannelsAmount              = GetChannelsAmount;
-    pClient->toAddon.GetChannels                    = GetChannels;
-    pClient->toAddon.DeleteChannel                  = DeleteChannel;
-    pClient->toAddon.RenameChannel                  = RenameChannel;
-    pClient->toAddon.OpenDialogChannelSettings      = OpenDialogChannelSettings;
-    pClient->toAddon.OpenDialogChannelAdd           = OpenDialogChannelAdd;
-
-    pClient->toAddon.GetRecordingsAmount            = GetRecordingsAmount;
-    pClient->toAddon.GetRecordings                  = GetRecordings;
-    pClient->toAddon.DeleteRecording                = DeleteRecording;
-    pClient->toAddon.UndeleteRecording              = UndeleteRecording;
-    pClient->toAddon.DeleteAllRecordingsFromTrash   = DeleteAllRecordingsFromTrash;
-    pClient->toAddon.RenameRecording                = RenameRecording;
-    pClient->toAddon.SetRecordingLifetime           = SetRecordingLifetime;
-    pClient->toAddon.SetRecordingPlayCount          = SetRecordingPlayCount;
-    pClient->toAddon.SetRecordingLastPlayedPosition = SetRecordingLastPlayedPosition;
-    pClient->toAddon.GetRecordingLastPlayedPosition = GetRecordingLastPlayedPosition;
-    pClient->toAddon.GetRecordingEdl                = GetRecordingEdl;
-
-    pClient->toAddon.GetTimerTypes                  = GetTimerTypes;
-    pClient->toAddon.GetTimersAmount                = GetTimersAmount;
-    pClient->toAddon.GetTimers                      = GetTimers;
-    pClient->toAddon.AddTimer                       = AddTimer;
-    pClient->toAddon.DeleteTimer                    = DeleteTimer;
-    pClient->toAddon.UpdateTimer                    = UpdateTimer;
-
-    pClient->toAddon.OpenLiveStream                 = OpenLiveStream;
-    pClient->toAddon.CloseLiveStream                = CloseLiveStream;
-    pClient->toAddon.ReadLiveStream                 = ReadLiveStream;
-    pClient->toAddon.SeekLiveStream                 = SeekLiveStream;
-    pClient->toAddon.LengthLiveStream               = LengthLiveStream;
-    pClient->toAddon.SignalStatus                   = SignalStatus;
-    pClient->toAddon.GetDescrambleInfo              = GetDescrambleInfo;
-    pClient->toAddon.GetChannelStreamProperties     = GetChannelStreamProperties;
-    pClient->toAddon.GetRecordingStreamProperties   = GetRecordingStreamProperties;
-    pClient->toAddon.CanPauseStream                 = CanPauseStream;
-    pClient->toAddon.PauseStream                    = PauseStream;
-    pClient->toAddon.CanSeekStream                  = CanSeekStream;
-    pClient->toAddon.SeekTime                       = SeekTime;
-    pClient->toAddon.SetSpeed                       = SetSpeed;
-    pClient->toAddon.FillBuffer                     = FillBuffer;
-
-    pClient->toAddon.OpenRecordedStream             = OpenRecordedStream;
-    pClient->toAddon.CloseRecordedStream            = CloseRecordedStream;
-    pClient->toAddon.ReadRecordedStream             = ReadRecordedStream;
-    pClient->toAddon.SeekRecordedStream             = SeekRecordedStream;
-    pClient->toAddon.LengthRecordedStream           = LengthRecordedStream;
-
-    pClient->toAddon.DemuxReset                     = DemuxReset;
-    pClient->toAddon.DemuxAbort                     = DemuxAbort;
-    pClient->toAddon.DemuxFlush                     = DemuxFlush;
-    pClient->toAddon.DemuxRead                      = DemuxRead;
-
-    pClient->toAddon.GetBackendHostname             = GetBackendHostname;
-
-    pClient->toAddon.IsRealTimeStream               = IsRealTimeStream;
-
-    pClient->toAddon.SetEPGTimeFrame                = SetEPGTimeFrame;
-
-    pClient->toAddon.OnSystemSleep                  = OnSystemSleep;
-    pClient->toAddon.OnSystemWake                   = OnSystemWake;
-    pClient->toAddon.OnPowerSavingActivated         = OnPowerSavingActivated;
-    pClient->toAddon.OnPowerSavingDeactivated       = OnPowerSavingDeactivated;
-    pClient->toAddon.GetStreamTimes                 = GetStreamTimes;
-
-    pClient->toAddon.GetStreamReadChunkSize         = GetStreamReadChunkSize;
-  };
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
deleted file mode 100644
index 999d3b3..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
+++ /dev/null
@@ -1,714 +0,0 @@
-/*
- *  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
-
-#ifndef TARGET_WINDOWS
-#ifndef __cdecl
-#define __cdecl
-#endif
-#ifndef __declspec
-#define __declspec(X)
-#endif
-#endif
-#include <string.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include "xbmc_addon_types.h"
-#include "xbmc_epg_types.h"
-
-/*! @note Define "USE_DEMUX" at compile time if demuxing in the PVR add-on is used.
- *        Also, "DVDDemuxPacket.h" file must be in the include path of the add-on,
- *        and the add-on should set bHandlesDemuxing to true.
- */
-#ifdef USE_DEMUX
-#include "DemuxPacket.h"
-#else
-struct DemuxPacket;
-#endif
-
-#undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN
-#undef PRAGMA_PACK_END
-
-#if defined(__GNUC__)
-#define ATTRIBUTE_PACKED __attribute__ ((packed))
-#define PRAGMA_PACK 0
-#endif
-
-#if !defined(ATTRIBUTE_PACKED)
-#define ATTRIBUTE_PACKED
-#define PRAGMA_PACK 1
-#endif
-
-#define PVR_ADDON_NAME_STRING_LENGTH          1024
-#define PVR_ADDON_URL_STRING_LENGTH           1024
-#define PVR_ADDON_DESC_STRING_LENGTH          1024
-#define PVR_ADDON_INPUT_FORMAT_STRING_LENGTH  32
-#define PVR_ADDON_EDL_LENGTH                  32
-#define PVR_ADDON_TIMERTYPE_ARRAY_SIZE        32
-#define PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE 512
-#define PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE_SMALL 128
-#define PVR_ADDON_TIMERTYPE_STRING_LENGTH     128
-#define PVR_ADDON_ATTRIBUTE_DESC_LENGTH       128
-#define PVR_ADDON_ATTRIBUTE_VALUES_ARRAY_SIZE 512
-#define PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH 64
-
-#define XBMC_INVALID_CODEC_ID   0
-#define XBMC_INVALID_CODEC      { XBMC_CODEC_TYPE_UNKNOWN, XBMC_INVALID_CODEC_ID }
-
-/* defines for GetChannelStreamProperties, GetRecordingStreamProperties and GetEPGTagStreamProperties */
-#define PVR_STREAM_MAX_PROPERTIES     20
-#define PVR_STREAM_PROPERTY_STREAMURL "streamurl" /*!< @brief the URL of the stream that should be played. */
-#define PVR_STREAM_PROPERTY_INPUTSTREAMADDON  "inputstreamaddon" /*!< @brief the name of the inputstream add-on that should be used by Kodi to play the stream denoted by PVR_STREAM_PROPERTY_STREAMURL. Leave blank to use Kodi's built-in playing capabilities. */
-#define PVR_STREAM_PROPERTY_MIMETYPE "mimetype" /*!< @brief the MIME type of the stream that should be played. */
-#define PVR_STREAM_PROPERTY_ISREALTIMESTREAM "isrealtimestream" /*!< @brief "true" to denote that the stream that should be played is a realtime stream. Any other value indicates that this is no realtime stream.*/
-
-/* using the default avformat's MAX_STREAMS value to be safe */
-#define PVR_STREAM_MAX_STREAMS 20
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  typedef unsigned int xbmc_codec_id_t;
-
-  typedef enum
-  {
-      XBMC_CODEC_TYPE_UNKNOWN = -1,
-      XBMC_CODEC_TYPE_VIDEO,
-      XBMC_CODEC_TYPE_AUDIO,
-      XBMC_CODEC_TYPE_DATA,
-      XBMC_CODEC_TYPE_SUBTITLE,
-      XBMC_CODEC_TYPE_RDS,
-      XBMC_CODEC_TYPE_NB
-  } xbmc_codec_type_t;
-
-  typedef struct
-  {
-    xbmc_codec_type_t codec_type;
-    xbmc_codec_id_t   codec_id;
-  } xbmc_codec_t;
-
-  /*!
-   * @brief numeric PVR timer type definitions (PVR_TIMER.iTimerType values)
-   */
-  const unsigned int PVR_TIMER_TYPE_NONE = 0; /*!< @brief "Null" value for a numeric timer type. */
-
-  /*!
-   * @brief special PVR_TIMER.iClientIndex value to indicate that a timer has not (yet) a valid client index.
-   */
-  const unsigned int PVR_TIMER_NO_CLIENT_INDEX = 0; /*!< @brief timer has not (yet) a valid client index. */
-
-  /*!
-   * @brief special PVR_TIMER.iParentClientIndex value to indicate that a timer has no parent.
-   */
-  const unsigned int PVR_TIMER_NO_PARENT = PVR_TIMER_NO_CLIENT_INDEX; /*!< @brief timer has no parent; it was not scheduled by a repeating timer. */
-
-  /*!
-   * @brief special PVR_TIMER.iEpgUid value to indicate that a timer has no EPG event uid.
-   */
-  const unsigned int PVR_TIMER_NO_EPG_UID = EPG_TAG_INVALID_UID; /*!< @brief timer has no EPG event uid. */
-
-  /*!
-   * @brief special PVR_TIMER.iClientChannelUid value to indicate "any channel". Useful for some repeating timer types.
-   */
-  const int PVR_TIMER_ANY_CHANNEL = -1; /*!< @brief denotes "any channel", not a specific one. */
-
-  /*!
-   * @brief PVR timer type attributes (PVR_TIMER_TYPE.iAttributes values)
-   */
-  const unsigned int PVR_TIMER_TYPE_ATTRIBUTE_NONE                    = 0x00000000;
-
-  const unsigned int PVR_TIMER_TYPE_IS_MANUAL                         = 0x00000001; /*!< @brief defines whether this is a type for manual (time-based) or epg-based timers */
-  const unsigned int PVR_TIMER_TYPE_IS_REPEATING                      = 0x00000002; /*!< @brief defines whether this is a type for repeating or one-shot timers */
-  const unsigned int PVR_TIMER_TYPE_IS_READONLY                       = 0x00000004; /*!< @brief timers of this type must not be edited by Kodi */
-  const unsigned int PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES             = 0x00000008; /*!< @brief timers of this type must not be created by Kodi. All other operations are allowed, though */
-
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE           = 0x00000010; /*!< @brief this type supports enabling/disabling of the timer (PVR_TIMER.state SCHEDULED|DISABLED) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_CHANNELS                 = 0x00000020; /*!< @brief this type supports channels (PVR_TIMER.iClientChannelUid) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_START_TIME               = 0x00000040; /*!< @brief this type supports a recording start time (PVR_TIMER.startTime) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH          = 0x00000080; /*!< @brief this type supports matching epg episode title using PVR_TIMER.strEpgSearchString */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_FULLTEXT_EPG_MATCH       = 0x00000100; /*!< @brief this type supports matching "more" epg data (not just episode title) using PVR_TIMER.strEpgSearchString. Setting FULLTEXT_EPG_MATCH implies TITLE_EPG_MATCH */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_FIRST_DAY                = 0x00000200; /*!< @brief this type supports a first day the timer gets active (PVR_TIMER.firstday) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_WEEKDAYS                 = 0x00000400; /*!< @brief this type supports weekdays for defining the recording schedule (PVR_TIMER.iWeekdays) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_RECORD_ONLY_NEW_EPISODES = 0x00000800; /*!< @brief this type supports the "record only new episodes" feature (PVR_TIMER.iPreventDuplicateEpisodes) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN         = 0x00001000; /*!< @brief this type supports pre and post record time (PVR_TIMER.iMarginStart, PVR_TIMER.iMarginEnd) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_PRIORITY                 = 0x00002000; /*!< @brief this type supports recording priority (PVR_TIMER.iPriority) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_LIFETIME                 = 0x00004000; /*!< @brief this type supports recording lifetime (PVR_TIMER.iLifetime) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS        = 0x00008000; /*!< @brief this type supports placing recordings in user defined folders (PVR_TIMER.strDirectory) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_RECORDING_GROUP          = 0x00010000; /*!< @brief this type supports a list of recording groups (PVR_TIMER.iRecordingGroup) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_END_TIME                 = 0x00020000; /*!< @brief this type supports a recording end time (PVR_TIMER.endTime) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_START_ANYTIME            = 0x00040000; /*!< @brief enables an 'Any Time' over-ride option for startTime (using PVR_TIMER.bStartAnyTime) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_END_ANYTIME              = 0x00080000; /*!< @brief enables a separate 'Any Time' over-ride for endTime (using PVR_TIMER.bEndAnyTime) */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_MAX_RECORDINGS           = 0x00100000; /*!< @brief this type supports specifying a maximum recordings setting' (PVR_TIMER.iMaxRecordings) */
-  const unsigned int PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE        = 0x00200000; /*!< @brief this type should not appear on any create menus which don't provide an associated EPG tag */
-  const unsigned int PVR_TIMER_TYPE_FORBIDS_EPG_TAG_ON_CREATE         = 0x00400000; /*!< @brief this type should not appear on any create menus which provide an associated EPG tag */
-  const unsigned int PVR_TIMER_TYPE_REQUIRES_EPG_SERIES_ON_CREATE     = 0x00800000; /*!< @brief this type should not appear on any create menus unless associated with an EPG tag with 'series' attributes (EPG_TAG.iFlags & EPG_TAG_FLAG_IS_SERIES || EPG_TAG.iSeriesNumber > 0 || EPG_TAG.iEpisodeNumber > 0 || EPG_TAG.iEpisodePartNumber > 0). Implies PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_ANY_CHANNEL              = 0x01000000; /*!< @brief this type supports 'any channel', for example when defining a timer rule that should match any channel instaed of a particular channel */
-  const unsigned int PVR_TIMER_TYPE_REQUIRES_EPG_SERIESLINK_ON_CREATE = 0x02000000; /*!< @brief this type should not appear on any create menus which don't provide an associated EPG tag with a series link */
-  const unsigned int PVR_TIMER_TYPE_SUPPORTS_READONLY_DELETE          = 0x04000000; /*!< @brief this type allows deletion of an otherwise read-only timer */
-  const unsigned int PVR_TIMER_TYPE_IS_REMINDER                       = 0x08000000; /*!< @brief timers of this type do trigger a reminder if time is up by calling the Kodi callback 'ReminderNotification'. */
-
-  /*!
-   * @brief PVR timer weekdays (PVR_TIMER.iWeekdays values)
-   */
-  const unsigned int PVR_WEEKDAY_NONE      = 0x00;
-  const unsigned int PVR_WEEKDAY_MONDAY    = 0x01;
-  const unsigned int PVR_WEEKDAY_TUESDAY   = 0x02;
-  const unsigned int PVR_WEEKDAY_WEDNESDAY = 0x04;
-  const unsigned int PVR_WEEKDAY_THURSDAY  = 0x08;
-  const unsigned int PVR_WEEKDAY_FRIDAY    = 0x10;
-  const unsigned int PVR_WEEKDAY_SATURDAY  = 0x20;
-  const unsigned int PVR_WEEKDAY_SUNDAY    = 0x40;
-  const unsigned int PVR_WEEKDAY_ALLDAYS   = PVR_WEEKDAY_MONDAY   | PVR_WEEKDAY_TUESDAY | PVR_WEEKDAY_WEDNESDAY |
-                                             PVR_WEEKDAY_THURSDAY | PVR_WEEKDAY_FRIDAY  | PVR_WEEKDAY_SATURDAY  |
-                                             PVR_WEEKDAY_SUNDAY;
-
-  /*!
-   * @brief timeframe value for use with SetEPGTimeFrame function to indicate "no timeframe".
-   */
-  const int EPG_TIMEFRAME_UNLIMITED = -1;
-
-  /*!
-   * @brief special PVR_TIMER.iClientChannelUid and PVR_RECORDING.iChannelUid value to indicate that no channel uid is available.
-   */
-  const int PVR_CHANNEL_INVALID_UID = -1; /*!< @brief denotes that no channel uid is available. */
-
-  /*!
-   * @brief special PVR_DESCRAMBLE_INFO value to indicate that a struct member's value is not available.
-   */
-  const int PVR_DESCRAMBLE_INFO_NOT_AVAILABLE = -1;
-
-  /*!
-   * @brief PVR add-on error codes
-   */
-  typedef enum
-  {
-    PVR_ERROR_NO_ERROR           = 0,  /*!< @brief no error occurred */
-    PVR_ERROR_UNKNOWN            = -1, /*!< @brief an unknown error occurred */
-    PVR_ERROR_NOT_IMPLEMENTED    = -2, /*!< @brief the method that Kodi called is not implemented by the add-on */
-    PVR_ERROR_SERVER_ERROR       = -3, /*!< @brief the backend reported an error, or the add-on isn't connected */
-    PVR_ERROR_SERVER_TIMEOUT     = -4, /*!< @brief the command was sent to the backend, but the response timed out */
-    PVR_ERROR_REJECTED           = -5, /*!< @brief the command was rejected by the backend */
-    PVR_ERROR_ALREADY_PRESENT    = -6, /*!< @brief the requested item can not be added, because it's already present */
-    PVR_ERROR_INVALID_PARAMETERS = -7, /*!< @brief the parameters of the method that was called are invalid for this operation */
-    PVR_ERROR_RECORDING_RUNNING  = -8, /*!< @brief a recording is running, so the timer can't be deleted without doing a forced delete */
-    PVR_ERROR_FAILED             = -9, /*!< @brief the command failed */
-  } PVR_ERROR;
-
-  /*!
-   * @brief PVR timer states
-   */
-  typedef enum
-  {
-    PVR_TIMER_STATE_NEW          = 0, /*!< @brief the timer was just created on the backend and is not yet active. This state must not be used for timers just created on the client side. */
-    PVR_TIMER_STATE_SCHEDULED    = 1, /*!< @brief the timer is scheduled for recording */
-    PVR_TIMER_STATE_RECORDING    = 2, /*!< @brief the timer is currently recordings */
-    PVR_TIMER_STATE_COMPLETED    = 3, /*!< @brief the recording completed successfully */
-    PVR_TIMER_STATE_ABORTED      = 4, /*!< @brief recording started, but was aborted */
-    PVR_TIMER_STATE_CANCELLED    = 5, /*!< @brief the timer was scheduled, but was canceled */
-    PVR_TIMER_STATE_CONFLICT_OK  = 6, /*!< @brief the scheduled timer conflicts with another one, but will be recorded */
-    PVR_TIMER_STATE_CONFLICT_NOK = 7, /*!< @brief the scheduled timer conflicts with another one and won't be recorded */
-    PVR_TIMER_STATE_ERROR        = 8, /*!< @brief the timer is scheduled, but can't be recorded for some reason */
-    PVR_TIMER_STATE_DISABLED     = 9, /*!< @brief the timer was disabled by the user, can be enabled via setting the state to PVR_TIMER_STATE_SCHEDULED */
-  } PVR_TIMER_STATE;
-
-  /*!
-   * @brief PVR menu hook categories
-   */
-  typedef enum
-  {
-    PVR_MENUHOOK_UNKNOWN           =-1, /*!< @brief unknown menu hook */
-    PVR_MENUHOOK_ALL               = 0, /*!< @brief all categories */
-    PVR_MENUHOOK_CHANNEL           = 1, /*!< @brief for channels */
-    PVR_MENUHOOK_TIMER             = 2, /*!< @brief for timers */
-    PVR_MENUHOOK_EPG               = 3, /*!< @brief for EPG */
-    PVR_MENUHOOK_RECORDING         = 4, /*!< @brief for recordings */
-    PVR_MENUHOOK_DELETED_RECORDING = 5, /*!< @brief for deleted recordings */
-    PVR_MENUHOOK_SETTING           = 6, /*!< @brief for settings */
-  } PVR_MENUHOOK_CAT;
-
-  /*!
-   * @brief PVR backend connection states. Used with ConnectionStateChange callback.
-   */
-  typedef enum
-  {
-    PVR_CONNECTION_STATE_UNKNOWN            = 0,  /*!< @brief unknown state (e.g. not yet tried to connect) */
-    PVR_CONNECTION_STATE_SERVER_UNREACHABLE = 1,  /*!< @brief backend server is not reachable (e.g. server not existing or network down)*/
-    PVR_CONNECTION_STATE_SERVER_MISMATCH    = 2,  /*!< @brief backend server is reachable, but there is not the expected type of server running (e.g. HTSP required, but FTP running at given server:port) */
-    PVR_CONNECTION_STATE_VERSION_MISMATCH   = 3,  /*!< @brief backend server is reachable, but server version does not match client requirements */
-    PVR_CONNECTION_STATE_ACCESS_DENIED      = 4,  /*!< @brief backend server is reachable, but denies client access (e.g. due to wrong credentials) */
-    PVR_CONNECTION_STATE_CONNECTED          = 5,  /*!< @brief connection to backend server is established */
-    PVR_CONNECTION_STATE_DISCONNECTED       = 6,  /*!< @brief no connection to backend server (e.g. due to network errors or client initiated disconnect)*/
-    PVR_CONNECTION_STATE_CONNECTING         = 7,  /*!< @brief connecting to backend */
-  } PVR_CONNECTION_STATE;
-
-  /*!
-   * @brief PVR recording channel types
-   */
-  typedef enum
-  {
-    PVR_RECORDING_CHANNEL_TYPE_UNKNOWN = 0, /*!< @brief unknown */
-    PVR_RECORDING_CHANNEL_TYPE_TV      = 1, /*!< @brief TV channel */
-    PVR_RECORDING_CHANNEL_TYPE_RADIO   = 2, /*!< @brief radio channel */
-  } PVR_RECORDING_CHANNEL_TYPE;
-
-  /*!
-   * @brief Representation of a named value
-   */
-  typedef struct PVR_NAMED_VALUE {
-    char  strName[PVR_ADDON_NAME_STRING_LENGTH];  /*!< @brief (required) name */
-    char  strValue[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (required) value */
-  } ATTRIBUTE_PACKED PVR_NAMED_VALUE;
-
-  /*!
-   * @brief Properties passed to the Create() method of an add-on.
-   */
-  typedef struct PVR_PROPERTIES
-  {
-    const char* strUserPath;           /*!< @brief path to the user profile */
-    const char* strClientPath;         /*!< @brief path to this add-on */
-    int iEpgMaxDays;                   /*!< @brief if > EPG_TIMEFRAME_UNLIMITED, in async epg mode, deliver only events in the range from 'end time > now' to 'start time < now + iEpgMaxDays. EPG_TIMEFRAME_UNLIMITED, notify all events. */
-  } PVR_PROPERTIES;
-
-  /*!
-   * @brief Representation of a general attribute integer value.
-   */
-  typedef struct PVR_ATTRIBUTE_INT_VALUE
-  {
-    int iValue;                                           /*!< @brief (required) an integer value for a certain attribute */
-    char strDescription[PVR_ADDON_ATTRIBUTE_DESC_LENGTH]; /*!< @brief (optional) a localized string describing the value. If left blank, Kodi will generate a suitable representation (like the integer value as string) */
-  } ATTRIBUTE_PACKED PVR_ATTRIBUTE_INT_VALUE;
-
-  /*!
-   * @brief PVR add-on capabilities. All capabilities are set to "false" or 0 as default
-   * If a capability is set to true, then the corresponding methods from xbmc_pvr_dll.h need to be implemented.
-   */
-  typedef struct PVR_ADDON_CAPABILITIES
-  {
-    bool bSupportsEPG;                  /*!< @brief true if the add-on provides EPG information */
-    bool bSupportsEPGEdl;               /*!< @brief true if the backend supports retrieving an edit decision list for an EPG tag. */
-    bool bSupportsTV;                   /*!< @brief true if this add-on provides TV channels */
-    bool bSupportsRadio;                /*!< @brief true if this add-on supports radio channels */
-    bool bSupportsRecordings;           /*!< @brief true if this add-on supports playback of recordings stored on the backend */
-    bool bSupportsRecordingsUndelete;   /*!< @brief true if this add-on supports undelete of recordings stored on the backend */
-    bool bSupportsTimers;               /*!< @brief true if this add-on supports the creation and editing of timers */
-    bool bSupportsChannelGroups;        /*!< @brief true if this add-on supports channel groups */
-    bool bSupportsChannelScan;          /*!< @brief true if this add-on support scanning for new channels on the backend */
-    bool bSupportsChannelSettings;      /*!< @brief true if this add-on supports the following functions: DeleteChannel, RenameChannel, DialogChannelSettings and DialogAddChannel */
-    bool bHandlesInputStream;           /*!< @brief true if this add-on provides an input stream. false if Kodi handles the stream. */
-    bool bHandlesDemuxing;              /*!< @brief true if this add-on demultiplexes packets. */
-    bool bSupportsRecordingPlayCount;   /*!< @brief true if the backend supports play count for recordings. */
-    bool bSupportsLastPlayedPosition;   /*!< @brief true if the backend supports store/retrieve of last played position for recordings. */
-    bool bSupportsRecordingEdl;         /*!< @brief true if the backend supports retrieving an edit decision list for recordings. */
-    bool bSupportsRecordingsRename;     /*!< @brief true if the backend supports renaming recordings. */
-    bool bSupportsRecordingsLifetimeChange; /*!< @brief true if the backend supports changing lifetime for recordings. */
-    bool bSupportsDescrambleInfo;       /*!< @brief true if the backend supports descramble information for playing channels. */
-    bool bSupportsAsyncEPGTransfer;     /*!< @brief true if this addon-on supports asynchronous transfer of epg events to Kodi using the callback function EpgEventStateChange. */
-
-    unsigned int iRecordingsLifetimesSize; /*!< @brief (required) Count of possible values for PVR_RECORDING.iLifetime. 0 means lifetime is not supported for recordings or no own value definition wanted, but to use Kodi defaults of 1..365. */
-    PVR_ATTRIBUTE_INT_VALUE recordingsLifetimeValues[PVR_ADDON_ATTRIBUTE_VALUES_ARRAY_SIZE]; /*!< @brief (optional) Array containing the possible values for PVR_RECORDING.iLifetime. Must be filled if iLifetimesSize > 0 */
-  } ATTRIBUTE_PACKED PVR_ADDON_CAPABILITIES;
-
-  /*!
-   * @brief PVR stream properties
-   */
-  typedef struct PVR_STREAM_PROPERTIES
-  {
-    unsigned int iStreamCount;
-    struct PVR_STREAM
-    {
-      unsigned int      iPID;               /*!< @brief (required) PID */
-      xbmc_codec_type_t iCodecType;         /*!< @brief (required) codec type this stream */
-      xbmc_codec_id_t   iCodecId;           /*!< @brief (required) codec id of this stream */
-      char              strLanguage[4];     /*!< @brief (required) language id */
-      int               iSubtitleInfo;      /*!< @brief (required) Subtitle Info */
-      int               iFPSScale;          /*!< @brief (required) scale of 1000 and a rate of 29970 will result in 29.97 fps */
-      int               iFPSRate;           /*!< @brief (required) FPS rate */
-      int               iHeight;            /*!< @brief (required) height of the stream reported by the demuxer */
-      int               iWidth;             /*!< @brief (required) width of the stream reported by the demuxer */
-      float             fAspect;            /*!< @brief (required) display aspect ratio of the stream */
-      int               iChannels;          /*!< @brief (required) amount of channels */
-      int               iSampleRate;        /*!< @brief (required) sample rate */
-      int               iBlockAlign;        /*!< @brief (required) block alignment */
-      int               iBitRate;           /*!< @brief (required) bit rate */
-      int               iBitsPerSample;     /*!< @brief (required) bits per sample */
-    } stream[PVR_STREAM_MAX_STREAMS];       /*!< @brief (required) the streams */
-  } ATTRIBUTE_PACKED PVR_STREAM_PROPERTIES;
-
-  /*!
-   * @brief Signal status information
-   */
-  typedef struct PVR_SIGNAL_STATUS
-  {
-    char   strAdapterName[PVR_ADDON_NAME_STRING_LENGTH];   /*!< @brief (optional) name of the adapter that's being used */
-    char   strAdapterStatus[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) status of the adapter that's being used */
-    char   strServiceName[PVR_ADDON_NAME_STRING_LENGTH];   /*!< @brief (optional) name of the current service */
-    char   strProviderName[PVR_ADDON_NAME_STRING_LENGTH];  /*!< @brief (optional) name of the current service's provider */
-    char   strMuxName[PVR_ADDON_NAME_STRING_LENGTH];       /*!< @brief (optional) name of the current mux */
-    int    iSNR;                                           /*!< @brief (optional) signal/noise ratio */
-    int    iSignal;                                        /*!< @brief (optional) signal strength */
-    long   iBER;                                           /*!< @brief (optional) bit error rate */
-    long   iUNC;                                           /*!< @brief (optional) uncorrected blocks */
-  } ATTRIBUTE_PACKED PVR_SIGNAL_STATUS;
-
-  /*!
-   * @brief descramble information
-   */
-  typedef struct PVR_DESCRAMBLE_INFO
-  {
-    int iPid;     /*!< @brief (optional) pid; PVR_DESCRAMBLE_INFO_NOT_AVAILABLE if not available */
-    int iCaid;    /*!< @brief (optional) caid; PVR_DESCRAMBLE_INFO_NOT_AVAILABLE if not available */
-    int iProvid;  /*!< @brief (optional) provid; PVR_DESCRAMBLE_INFO_NOT_AVAILABLE if not available */
-    int iEcmTime; /*!< @brief (optional) ecm time; PVR_DESCRAMBLE_INFO_NOT_AVAILABLE if not available */
-    int iHops;    /*!< @brief (optional) hops; PVR_DESCRAMBLE_INFO_NOT_AVAILABLE if not available */
-    char strCardSystem[PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH];  /*!< @brief (optional); empty string if not available */
-    char strReader[PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH];      /*!< @brief (optional); empty string if not available */
-    char strFrom[PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH];        /*!< @brief (optional); empty string if not available */
-    char strProtocol[PVR_ADDON_DESCRAMBLE_INFO_STRING_LENGTH];    /*!< @brief (optional); empty string if not available */
-  } ATTRIBUTE_PACKED PVR_DESCRAMBLE_INFO;
-
-  /*!
-   * @brief Menu hooks that are available in the context menus while playing a stream via this add-on.
-   * And in the Live TV settings dialog
-   */
-  typedef struct PVR_MENUHOOK
-  {
-    unsigned int     iHookId;              /*!< @brief (required) this hook's identifier */
-    unsigned int     iLocalizedStringId;   /*!< @brief (required) the id of the label for this hook in g_localizeStrings */
-    PVR_MENUHOOK_CAT category;             /*!< @brief (required) category of menu hook */
-  } ATTRIBUTE_PACKED PVR_MENUHOOK;
-
-  /*!
-   * @brief Representation of a TV or radio channel.
-   */
-  typedef struct PVR_CHANNEL
-  {
-    unsigned int iUniqueId;                                            /*!< @brief (required) unique identifier for this channel */
-    bool         bIsRadio;                                             /*!< @brief (required) true if this is a radio channel, false if it's a TV channel */
-    unsigned int iChannelNumber;                                       /*!< @brief (optional) channel number of this channel on the backend */
-    unsigned int iSubChannelNumber;                                    /*!< @brief (optional) sub channel number of this channel on the backend (ATSC) */
-    char         strChannelName[PVR_ADDON_NAME_STRING_LENGTH];         /*!< @brief (optional) channel name given to this channel */
-    char         strInputFormat[PVR_ADDON_INPUT_FORMAT_STRING_LENGTH]; /*!< @brief (optional) input format type. types can be found in ffmpeg/libavformat/allformats.c
-                                                                                   leave empty if unknown */
-    unsigned int iEncryptionSystem;                                    /*!< @brief (optional) the encryption ID or CaID of this channel */
-    char         strIconPath[PVR_ADDON_URL_STRING_LENGTH];             /*!< @brief (optional) path to the channel icon (if present) */
-    bool         bIsHidden;                                            /*!< @brief (optional) true if this channel is marked as hidden */
-    bool         bHasArchive;                                          /*!< @brief (optional) true if this channel has a server-side back buffer */
-  } ATTRIBUTE_PACKED PVR_CHANNEL;
-
-  typedef struct PVR_CHANNEL_GROUP
-  {
-    char         strGroupName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (required) name of this channel group */
-    bool         bIsRadio;                                   /*!< @brief (required) true if this is a radio channel group, false otherwise. */
-    unsigned int iPosition;                                  /*!< @brief (optional) sort position of the group (0 indicates that the backend doesn't support sorting of groups) */
-  } ATTRIBUTE_PACKED PVR_CHANNEL_GROUP;
-
-  typedef struct PVR_CHANNEL_GROUP_MEMBER
-  {
-    char         strGroupName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (required) name of the channel group to add the channel to */
-    unsigned int iChannelUniqueId;                           /*!< @brief (required) unique id of the member */
-    unsigned int iChannelNumber;                             /*!< @brief (optional) channel number within the group */
-    unsigned int iSubChannelNumber;                          /*!< @brief (optional) sub channel number within the group (ATSC) */
-  } ATTRIBUTE_PACKED PVR_CHANNEL_GROUP_MEMBER;
-
-  /*!
-   * @brief Representation of a timer type's attribute integer value.
-   */
-  typedef PVR_ATTRIBUTE_INT_VALUE PVR_TIMER_TYPE_ATTRIBUTE_INT_VALUE;
-
-  /*!
-   * @brief Representation of a timer type.
-   */
-  typedef struct PVR_TIMER_TYPE
-  {
-    unsigned int iId;                                       /*!< @brief (required) this type's identifier. Ids must be > PVR_TIMER_TYPE_NONE. */
-    unsigned int iAttributes;                               /*!< @brief (required) defines the attributes for this type (PVR_TIMER_TYPE_* constants). */
-    char strDescription[PVR_ADDON_TIMERTYPE_STRING_LENGTH]; /*!< @brief (optional) 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." */
-    /* priority value definitions */
-    unsigned int iPrioritiesSize;                           /*!< @brief (required) Count of possible values for PVR_TMER.iPriority. 0 means priority
-                                                              is not supported by this timer type or no own value definition wanted, but to use Kodi defaults
-                                                              of 1..100. */
-    PVR_TIMER_TYPE_ATTRIBUTE_INT_VALUE
-      priorities[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE];    /*!< @brief (optional) Array containing the possible values for PVR_TMER.iPriority. Must be
-                                                              filled if iPrioritiesSize > 0 */
-    int          iPrioritiesDefault;                        /*!< @brief (optional) The default value for PVR_TMER.iPriority. Must be filled if iPrioritiesSize > 0 */
-
-    /* lifetime value definitions */
-    unsigned int iLifetimesSize;                            /*!< @brief (required) Count of possible values for PVR_TMER.iLifetime. 0 means lifetime
-                                                              is not supported by this timer type or no own value definition wanted, but to use Kodi defaults
-                                                              of 1..365. */
-    PVR_TIMER_TYPE_ATTRIBUTE_INT_VALUE
-      lifetimes[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE];     /*!< @brief (optional) Array containing the possible values for PVR_TMER.iLifetime. Must be
-                                                              filled if iLifetimesSize > 0 */
-    int          iLifetimesDefault;                         /*!< @brief (optional) The default value for PVR_TMER.iLifetime. Must be filled if iLifetimesSize > 0 */
-
-    /* prevent duplicate episodes value definitions */
-    unsigned int iPreventDuplicateEpisodesSize;             /*!< @brief (required) Count of possible values for PVR_TMER.iPreventDuplicateEpisodes. 0 means duplicate
-                                                              episodes prevention is not supported by this timer type or no own value definition wanted, but to use
-                                                              Kodi defaults. */
-    PVR_TIMER_TYPE_ATTRIBUTE_INT_VALUE
-      preventDuplicateEpisodes[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE];
-                                                            /*!< @brief (optional) Array containing the possible values for PVR_TMER.iPreventDuplicateEpisodes.. Must
-                                                              be filled if iPreventDuplicateEpisodesSize > 0 */
-    unsigned int iPreventDuplicateEpisodesDefault;          /*!< @brief (optional) The default value for PVR_TMER.iPreventDuplicateEpisodesSize. Must be filled if iPreventDuplicateEpisodesSize > 0 */
-
-    /* recording folder list value definitions */
-    unsigned int iRecordingGroupSize;                       /*!< @brief (required) Count of possible values of PVR_TIMER.iRecordingGroup. 0 means folder lists are not supported by this timer type */
-    PVR_TIMER_TYPE_ATTRIBUTE_INT_VALUE
-      recordingGroup[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE];
-                                                            /*!< @brief (optional) Array containing the possible values of PVR_TMER.iRecordingGroup. Must be filled if iRecordingGroupSize > 0 */
-    unsigned int iRecordingGroupDefault;                    /*!< @brief (optional) The default value for PVR_TIMER.iRecordingGroup. Must be filled in if PVR_TIMER.iRecordingGroupSize > 0 */
-
-    /* max recordings value definitions */
-    unsigned int iMaxRecordingsSize;                        /*!< @brief (required) Count of possible values of PVR_TIMER.iMaxRecordings. 0 means max recordings are not supported by this timer type */
-    PVR_TIMER_TYPE_ATTRIBUTE_INT_VALUE
-      maxRecordings[PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE_SMALL];
-                                                            /*!< @brief (optional) Array containing the possible values of PVR_TMER.iMaxRecordings. */
-    int iMaxRecordingsDefault;                              /*!< @brief (optional) The default value for PVR_TIMER.iMaxRecordings. Must be filled in if PVR_TIMER.iMaxRecordingsSize > 0 */
-
-  } ATTRIBUTE_PACKED PVR_TIMER_TYPE;
-
-  /*!
-   * @brief Representation of a timer event.
-   */
-  typedef struct PVR_TIMER {
-    unsigned int    iClientIndex;                              /*!< @brief (required) the index of this timer given by the client. 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 PVR_TIMER_NO_CLIENT_INDEX. */
-    unsigned int    iParentClientIndex;                        /*!< @brief (optional) for timers scheduled by a repeating timer, the index of the repeating timer that scheduled this timer (it's PVR_TIMER.iClientIndex value). Use PVR_TIMER_NO_PARENT
-                                                                    to indicate that this timer was no scheduled by a repeating timer. */
-    int             iClientChannelUid;                         /*!< @brief (optional) unique identifier of the channel to record on. PVR_TIMER_ANY_CHANNEL will denote "any channel", not a specific one. PVR_CHANNEL_INVALID_UID denotes that channel uid is not available.*/
-    time_t          startTime;                                 /*!< @brief (optional) 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.*/
-    time_t          endTime;                                   /*!< @brief (optional) end time of the recording in UTC. */
-    bool            bStartAnyTime;                             /*!< @brief (optional) for EPG based (not Manual) timers indicates startTime does not apply. Default = false */
-    bool            bEndAnyTime;                               /*!< @brief (optional) for EPG based (not Manual) timers indicates endTime does not apply. Default = false */
-    PVR_TIMER_STATE state;                                     /*!< @brief (required) the state of this timer */
-    unsigned int    iTimerType;                                /*!< @brief (required) 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 PVR_TIMER_TYPE_NONE.
-                                                                    Kodi does not interpret this value (except for checking for PVR_TIMER_TYPE_NONE), but will pass the right id to the addon with every PVR_TIMER instance, thus the addon easily can determine
-                                                                    the timer type. */
-    char            strTitle[PVR_ADDON_NAME_STRING_LENGTH];    /*!< @brief (required) a title for this timer */
-    char            strEpgSearchString[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) a string used to search epg data for repeating epg-based timers. Format is backend-dependent, for example regexp */
-    bool            bFullTextEpgSearch;                        /*!< @brief (optional) indicates, whether strEpgSearchString is to match against the epg episode title only or also against "other" epg data (backend-dependent) */
-    char            strDirectory[PVR_ADDON_URL_STRING_LENGTH]; /*!< @brief (optional) the (relative) directory where the recording will be stored in */
-    char            strSummary[PVR_ADDON_DESC_STRING_LENGTH];  /*!< @brief (optional) the summary for this timer */
-    int             iPriority;                                 /*!< @brief (optional) the priority of this timer */
-    int             iLifetime;                                 /*!< @brief (optional) lifetime of recordings created by this timer. > 0 days after which recordings will be deleted by the backend, < 0 addon defined integer list reference, == 0 disabled */
-    int             iMaxRecordings;                            /*!< @brief (optional) maximum number of recordings this timer shall create. > 0 number of recordings, < 0 addon defined integer list reference, == 0 disabled */
-    unsigned int    iRecordingGroup;                           /*!< @brief (optional) integer ref to addon/backend defined list of recording groups*/
-    time_t          firstDay;                                  /*!< @brief (optional) the first day this timer is active, for repeating timers */
-    unsigned int    iWeekdays;                                 /*!< @brief (optional) week days, for repeating timers (see PVR_WEEKDAY_* constant values) */
-    unsigned int    iPreventDuplicateEpisodes;                 /*!< @brief (optional) 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.*/
-    unsigned int    iEpgUid;                                   /*!< @brief (optional) EPG event id associated with this timer. Event ids must be unique for a channel. Valid ids must be greater than EPG_TAG_INVALID_UID. */
-    unsigned int    iMarginStart;                              /*!< @brief (optional) if set, the backend starts the recording iMarginStart minutes before startTime. */
-    unsigned int    iMarginEnd;                                /*!< @brief (optional) if set, the backend ends the recording iMarginEnd minutes after endTime. */
-    int             iGenreType;                                /*!< @brief (optional) genre type */
-    int             iGenreSubType;                             /*!< @brief (optional) genre sub type */
-    char            strSeriesLink[PVR_ADDON_URL_STRING_LENGTH]; /*!< @brief (optional) series link for this timer. If set for an epg-based timer rule, matching events will be found by checking strSeriesLink instead of strTitle (and bFullTextEpgSearch) */
-
-  } ATTRIBUTE_PACKED PVR_TIMER;
-
-  /*!
-   * @brief Representation of a recording.
-   */
-  typedef struct PVR_RECORDING {
-    char   strRecordingId[PVR_ADDON_NAME_STRING_LENGTH];  /*!< @brief (required) unique id of the recording on the client. */
-    char   strTitle[PVR_ADDON_NAME_STRING_LENGTH];        /*!< @brief (required) the title of this recording */
-    char   strEpisodeName[PVR_ADDON_NAME_STRING_LENGTH];  /*!< @brief (optional) episode name (also known as subtitle) */
-    int    iSeriesNumber;                                 /*!< @brief (optional) series number (usually called season). Set to "0" for specials/pilot. For 'invalid' see iEpisodeNumber or set to -1 */
-    int    iEpisodeNumber;                                /*!< @brief (optional) episode number within the "iSeriesNumber" season. For 'invalid' set to -1 or iSeriesNumber=iEpisodeNumber=0 to show both are invalid */
-    int    iYear;                                         /*!< @brief (optional) year of first release (use to identify a specific movie re-make) / first airing for TV shows. Set to '0' for invalid. */
-    char   strDirectory[PVR_ADDON_URL_STRING_LENGTH];     /*!< @brief (optional) directory of this recording on the client */
-    char   strPlotOutline[PVR_ADDON_DESC_STRING_LENGTH];  /*!< @brief (optional) plot outline */
-    char   strPlot[PVR_ADDON_DESC_STRING_LENGTH];         /*!< @brief (optional) plot */
-    char   strGenreDescription[PVR_ADDON_DESC_STRING_LENGTH]; /*!< @brief (optional) genre. Will be used only when iGenreType = EPG_GENRE_USE_STRING */
-    char   strChannelName[PVR_ADDON_NAME_STRING_LENGTH];  /*!< @brief (optional) channel name */
-    char   strIconPath[PVR_ADDON_URL_STRING_LENGTH];      /*!< @brief (optional) channel logo (icon) path */
-    char   strThumbnailPath[PVR_ADDON_URL_STRING_LENGTH]; /*!< @brief (optional) thumbnail path */
-    char   strFanartPath[PVR_ADDON_URL_STRING_LENGTH];    /*!< @brief (optional) fanart path */
-    time_t recordingTime;                                 /*!< @brief (optional) start time of the recording */
-    int    iDuration;                                     /*!< @brief (optional) duration of the recording in seconds */
-    int    iPriority;                                     /*!< @brief (optional) priority of this recording (from 0 - 100) */
-    int    iLifetime;                                     /*!< @brief (optional) life time in days of this recording */
-    int    iGenreType;                                    /*!< @brief (optional) genre type */
-    int    iGenreSubType;                                 /*!< @brief (optional) genre sub type */
-    int    iPlayCount;                                    /*!< @brief (optional) play count of this recording on the client */
-    int    iLastPlayedPosition;                           /*!< @brief (optional) last played position of this recording on the client */
-    bool   bIsDeleted;                                    /*!< @brief (optional) shows this recording is deleted and can be undelete */
-    unsigned int iEpgEventId;                             /*!< @brief (optional) EPG event id associated with this recording. Valid ids must be greater than EPG_TAG_INVALID_UID. */
-    int    iChannelUid;                                   /*!< @brief (optional) unique identifier of the channel for this recording. PVR_CHANNEL_INVALID_UID denotes that channel uid is not available. */
-    PVR_RECORDING_CHANNEL_TYPE channelType;               /*!< @brief (optional) channel type. Set to PVR_RECORDING_CHANNEL_TYPE_UNKNOWN if the type cannot be determined. */
-  } ATTRIBUTE_PACKED PVR_RECORDING;
-
-  /*!
-   * @brief Edit definition list (EDL)
-   */
-  typedef enum
-  {
-    PVR_EDL_TYPE_CUT      = 0, /*!< @brief cut (completely remove content) */
-    PVR_EDL_TYPE_MUTE     = 1, /*!< @brief mute audio */
-    PVR_EDL_TYPE_SCENE    = 2, /*!< @brief scene markers (chapter seeking) */
-    PVR_EDL_TYPE_COMBREAK = 3  /*!< @brief commercial breaks */
-  } PVR_EDL_TYPE;
-
-  typedef struct PVR_EDL_ENTRY
-  {
-    int64_t start;     // ms
-    int64_t end;       // ms
-    PVR_EDL_TYPE type;
-  } ATTRIBUTE_PACKED PVR_EDL_ENTRY;
-
-  /*!
-   * @brief PVR menu hook data
-   */
-  typedef struct PVR_MENUHOOK_DATA
-  {
-    PVR_MENUHOOK_CAT cat;
-    union data {
-      int iEpgUid;
-      PVR_CHANNEL channel;
-      PVR_TIMER timer;
-      PVR_RECORDING recording;
-    } data;
-  } ATTRIBUTE_PACKED PVR_MENUHOOK_DATA;
-
-  /*!
-   * @brief times of playing stream (Live TV and recordings)
-   */
-  typedef struct PVR_STREAM_TIMES
-  {
-    time_t startTime; /*!< @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. */
-    int64_t ptsStart; /*!< @brief the pts of startTime */
-    int64_t ptsBegin; /*!< @brief earliest pts player can seek back. Value is in micro seconds, relative to ptsStart. 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. */
-    int64_t ptsEnd;   /*!< @brief latest pts player can seek forward. Value is in micro seconds, relative to ptsStart. 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. */
-  } ATTRIBUTE_PACKED PVR_STREAM_TIMES;
-
-  typedef struct AddonToKodiFuncTable_PVR
-  {
-    KODI_HANDLE kodiInstance;
-
-    void (*TransferEpgEntry)(void* kodiInstance, const ADDON_HANDLE handle, const EPG_TAG *epgentry);
-    void (*TransferChannelEntry)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_CHANNEL *chan);
-    void (*TransferTimerEntry)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_TIMER *timer);
-    void (*TransferRecordingEntry)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_RECORDING *recording);
-    void (*AddMenuHook)(void* kodiInstance, PVR_MENUHOOK *hook);
-    void (*Recording)(void* kodiInstance, const char *Name, const char *FileName, bool On);
-    void (*TriggerChannelUpdate)(void* kodiInstance);
-    void (*TriggerTimerUpdate)(void* kodiInstance);
-    void (*TriggerRecordingUpdate)(void* kodiInstance);
-    void (*TriggerChannelGroupsUpdate)(void* kodiInstance);
-    void (*TriggerEpgUpdate)(void* kodiInstance, unsigned int iChannelUid);
-
-    void (*TransferChannelGroup)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP *group);
-    void (*TransferChannelGroupMember)(void* kodiInstance, const ADDON_HANDLE handle, const PVR_CHANNEL_GROUP_MEMBER *member);
-
-    void (*FreeDemuxPacket)(void* kodiInstance, DemuxPacket* pPacket);
-    DemuxPacket* (*AllocateDemuxPacket)(void* kodiInstance, int iDataSize);
-
-    void (*ConnectionStateChange)(void* kodiInstance, const char* strConnectionString, PVR_CONNECTION_STATE newState, const char *strMessage);
-    void (*EpgEventStateChange)(void* kodiInstance, EPG_TAG* tag, EPG_EVENT_STATE newState);
-
-    xbmc_codec_t (*GetCodecByName)(const void* kodiInstance, const char* strCodecName);
-  } AddonToKodiFuncTable_PVR;
-
-  /*!
-   * @brief Structure to transfer the methods from xbmc_pvr_dll.h to Kodi
-   */
-  typedef struct KodiToAddonFuncTable_PVR
-  {
-    KODI_HANDLE addonInstance;
-
-    PVR_ERROR (__cdecl* GetAddonCapabilities)(PVR_ADDON_CAPABILITIES*);
-    PVR_ERROR (__cdecl* GetStreamProperties)(PVR_STREAM_PROPERTIES*);
-    const char* (__cdecl* GetBackendName)(void);
-    const char* (__cdecl* GetBackendVersion)(void);
-    const char* (__cdecl* GetConnectionString)(void);
-    PVR_ERROR (__cdecl* GetDriveSpace)(long long*, long long*);
-    PVR_ERROR (__cdecl* MenuHook)(const PVR_MENUHOOK&, const PVR_MENUHOOK_DATA&);
-    PVR_ERROR (__cdecl* GetEPGForChannel)(ADDON_HANDLE, int, time_t, time_t);
-    PVR_ERROR (__cdecl* IsEPGTagRecordable)(const EPG_TAG*, bool*);
-    PVR_ERROR (__cdecl* IsEPGTagPlayable)(const EPG_TAG*, bool*);
-    PVR_ERROR (__cdecl* GetEPGTagEdl)(const EPG_TAG*, PVR_EDL_ENTRY[], int*);
-    PVR_ERROR (__cdecl* GetEPGTagStreamProperties)(const EPG_TAG*, PVR_NAMED_VALUE*, unsigned int*);
-    int (__cdecl* GetChannelGroupsAmount)(void);
-    PVR_ERROR (__cdecl* GetChannelGroups)(ADDON_HANDLE, bool);
-    PVR_ERROR (__cdecl* GetChannelGroupMembers)(ADDON_HANDLE, const PVR_CHANNEL_GROUP&);
-    PVR_ERROR (__cdecl* OpenDialogChannelScan)(void);
-    int (__cdecl* GetChannelsAmount)(void);
-    PVR_ERROR (__cdecl* GetChannels)(ADDON_HANDLE, bool);
-    PVR_ERROR (__cdecl* DeleteChannel)(const PVR_CHANNEL&);
-    PVR_ERROR (__cdecl* RenameChannel)(const PVR_CHANNEL&);
-    PVR_ERROR (__cdecl* MoveChannel)(const PVR_CHANNEL&);
-    PVR_ERROR (__cdecl* OpenDialogChannelSettings)(const PVR_CHANNEL&);
-    PVR_ERROR (__cdecl* OpenDialogChannelAdd)(const PVR_CHANNEL&);
-    int (__cdecl* GetRecordingsAmount)(bool);
-    PVR_ERROR (__cdecl* GetRecordings)(ADDON_HANDLE, bool);
-    PVR_ERROR (__cdecl* DeleteRecording)(const PVR_RECORDING&);
-    PVR_ERROR (__cdecl* UndeleteRecording)(const PVR_RECORDING&);
-    PVR_ERROR (__cdecl* DeleteAllRecordingsFromTrash)(void);
-    PVR_ERROR (__cdecl* RenameRecording)(const PVR_RECORDING&);
-    PVR_ERROR (__cdecl* SetRecordingLifetime)(const PVR_RECORDING*);
-    PVR_ERROR (__cdecl* SetRecordingPlayCount)(const PVR_RECORDING&, int);
-    PVR_ERROR (__cdecl* SetRecordingLastPlayedPosition)(const PVR_RECORDING&, int);
-    int (__cdecl* GetRecordingLastPlayedPosition)(const PVR_RECORDING&);
-    PVR_ERROR (__cdecl* GetRecordingEdl)(const PVR_RECORDING&, PVR_EDL_ENTRY[], int*);
-    PVR_ERROR (__cdecl* GetTimerTypes)(PVR_TIMER_TYPE[], int*);
-    int (__cdecl* GetTimersAmount)(void);
-    PVR_ERROR (__cdecl* GetTimers)(ADDON_HANDLE);
-    PVR_ERROR (__cdecl* AddTimer)(const PVR_TIMER&);
-    PVR_ERROR (__cdecl* DeleteTimer)(const PVR_TIMER&, bool);
-    PVR_ERROR (__cdecl* UpdateTimer)(const PVR_TIMER&);
-    bool (__cdecl* OpenLiveStream)(const PVR_CHANNEL&);
-    void (__cdecl* CloseLiveStream)(void);
-    int (__cdecl* ReadLiveStream)(unsigned char*, unsigned int);
-    long long (__cdecl* SeekLiveStream)(long long, int);
-    long long (__cdecl* LengthLiveStream)(void);
-    PVR_ERROR (__cdecl* SignalStatus)(PVR_SIGNAL_STATUS&);
-    PVR_ERROR (__cdecl* GetDescrambleInfo)(PVR_DESCRAMBLE_INFO*);
-    PVR_ERROR  (__cdecl* GetChannelStreamProperties)(const PVR_CHANNEL*, PVR_NAMED_VALUE*, unsigned int*);
-    PVR_ERROR  (__cdecl* GetRecordingStreamProperties)(const PVR_RECORDING*, PVR_NAMED_VALUE*, unsigned int*);
-    bool (__cdecl* OpenRecordedStream)(const PVR_RECORDING&);
-    void (__cdecl* CloseRecordedStream)(void);
-    int (__cdecl* ReadRecordedStream)(unsigned char*, unsigned int);
-    long long (__cdecl* SeekRecordedStream)(long long, int);
-    long long (__cdecl* LengthRecordedStream)(void);
-    void (__cdecl* DemuxReset)(void);
-    void (__cdecl* DemuxAbort)(void);
-    void (__cdecl* DemuxFlush)(void);
-    DemuxPacket* (__cdecl* DemuxRead)(void);
-    bool (__cdecl* CanPauseStream)(void);
-    void (__cdecl* PauseStream)(bool);
-    bool (__cdecl* CanSeekStream)(void);
-    bool (__cdecl* SeekTime)(double, bool, double*);
-    void (__cdecl* SetSpeed)(int);
-    void (__cdecl* FillBuffer)(bool);
-    const char* (__cdecl* GetBackendHostname)(void);
-    bool (__cdecl* IsRealTimeStream)(void);
-    PVR_ERROR (__cdecl* SetEPGTimeFrame)(int);
-    void (__cdecl* OnSystemSleep)(void);
-    void (__cdecl* OnSystemWake)(void);
-    void (__cdecl* OnPowerSavingActivated)(void);
-    void (__cdecl* OnPowerSavingDeactivated)(void);
-    PVR_ERROR (__cdecl* GetStreamTimes)(PVR_STREAM_TIMES*);
-    PVR_ERROR (__cdecl* GetStreamReadChunkSize)(int*);
-  } KodiToAddonFuncTable_PVR;
-
-  typedef struct AddonInstance_PVR
-  {
-    PVR_PROPERTIES props;
-    AddonToKodiFuncTable_PVR toKodi;
-    KodiToAddonFuncTable_PVR toAddon;
-  } AddonInstance_PVR;
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h
index b48ef34..416e159 100644
--- a/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h
@@ -13,11 +13,12 @@
 
 //CryptoSession is usually obtained once per stream, but could change if an key expires
 
-enum CryptoSessionSystem :uint8_t
+enum CryptoSessionSystem : uint8_t
 {
   CRYPTO_SESSION_SYSTEM_NONE,
   CRYPTO_SESSION_SYSTEM_WIDEVINE,
-  CRYPTO_SESSION_SYSTEM_PLAYREADY
+  CRYPTO_SESSION_SYSTEM_PLAYREADY,
+  CRYPTO_SESSION_SYSTEM_WISEPLAY,
 };
 
 struct DemuxCryptoSession
diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
index f8ceab2..6da4838 100644
--- a/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h
@@ -9,32 +9,43 @@
 #pragma once
 
 #include "TimingConstants.h"
+
 #include <cstdint>
 #include <memory>
 
 #define DMX_SPECIALID_STREAMINFO    -10
 #define DMX_SPECIALID_STREAMCHANGE  -11
 
-struct DemuxCryptoInfo;
-
-typedef struct DemuxPacket
+#ifdef __cplusplus
+extern "C"
 {
-  DemuxPacket() = default;
+#endif /* __cplusplus */
+
+  struct DemuxCryptoInfo;
+
+  typedef struct DemuxPacket
+  {
+    DemuxPacket() = default;
+
+    uint8_t* pData = nullptr;
+    int iSize = 0;
+    int iStreamId = -1;
+    int64_t demuxerId = -1; // id of the demuxer that created the packet
+    int iGroupId =
+        -1; // the group this data belongs to, used to group data from different streams together
 
-  uint8_t *pData = nullptr;
-  int iSize = 0;
-  int iStreamId = -1;
-  int64_t demuxerId = -1; // id of the demuxer that created the packet
-  int iGroupId = -1; // the group this data belongs to, used to group data from different streams together
+    void* pSideData = nullptr;
+    int iSideDataElems = 0;
 
-  void *pSideData = nullptr;
-  int iSideDataElems = 0;
+    double pts = DVD_NOPTS_VALUE;
+    double dts = DVD_NOPTS_VALUE;
+    double duration = 0; // duration in DVD_TIME_BASE if available
+    int dispTime = 0;
+    bool recoveryPoint = false;
 
-  double pts = DVD_NOPTS_VALUE;
-  double dts = DVD_NOPTS_VALUE;
-  double duration = 0; // duration in DVD_TIME_BASE if available
-  int dispTime = 0;
-  bool recoveryPoint = false;
+    std::shared_ptr<DemuxCryptoInfo> cryptoInfo;
+  } DemuxPacket;
 
-  std::shared_ptr<DemuxCryptoInfo> cryptoInfo;
-} DemuxPacket;
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/InputStreamConstants.h b/xbmc/cores/VideoPlayer/Interface/Addon/InputStreamConstants.h
new file mode 100644
index 0000000..ff4dbea
--- /dev/null
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/InputStreamConstants.h
@@ -0,0 +1,50 @@
+/*
+ *  Copyright (C) 2017-2019 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
+
+/*!
+ * @brief the name of the inputstream add-on that should be used by Kodi to
+ * play the stream denoted by STREAM_PROPERTY_STREAMURL. Leave blank to use
+ * Kodi's built-in playing capabilities or to allow ffmpeg to handle directly
+ * set to STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG.
+ */
+#define STREAM_PROPERTY_INPUTSTREAM "inputstream"
+
+/*!
+ * @brief Identification string for an input stream.
+ *
+ * This value can be used in addition to @ref STREAM_PROPERTY_INPUTSTREAM. It is
+ * used to provide the respective inpustream addon with additional
+ * identification.
+ *
+ * The difference between this and other stream properties is that it is also
+ * passed in the associated @ref kodi::addon::CAddonBase::CreateInstance call.
+ *
+ * This makes it possible to select different processing classes within the
+ * associated add-on.
+ */
+#define STREAM_PROPERTY_INPUTSTREAM_INSTANCE_ID "inputstream-instance-id"
+
+/*!
+ * @brief "true" to denote that the stream that should be played is a
+ * realtime stream. Any other value indicates that this is not a realtime
+ * stream.
+ */
+#define STREAM_PROPERTY_ISREALTIMESTREAM "isrealtimestream"
+
+/*!
+ * @brief special value for STREAM_PROPERTY_INPUTSTREAM to use
+ * ffmpeg to directly play a stream URL.
+ */
+#define STREAM_PROPERTY_VALUE_INPUTSTREAMFFMPEG "inputstream.ffmpeg"
+
+/*!
+ * @brief Max number of properties that can be sent to an Inputstream addon
+ */
+#define STREAM_MAX_PROPERTY_COUNT 30
diff --git a/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h b/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h
index 0672002..c94e255 100644
--- a/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h
+++ b/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h
@@ -11,9 +11,15 @@
 #define DVD_TIME_BASE 1000000
 #define DVD_NOPTS_VALUE 0xFFF0000000000000
 
+#ifdef __cplusplus
 constexpr int DVD_TIME_TO_MSEC(double x) { return static_cast<int>(x * 1000 / DVD_TIME_BASE); }
 constexpr double DVD_SEC_TO_TIME(double x) { return x * DVD_TIME_BASE; }
 constexpr double DVD_MSEC_TO_TIME(double x) { return x * DVD_TIME_BASE / 1000; }
+#else
+#define DVD_TIME_TO_MSEC(x) ((int)((double)(x) * 1000 / DVD_TIME_BASE))
+#define DVD_SEC_TO_TIME(x) ((double)(x) * DVD_TIME_BASE)
+#define DVD_MSEC_TO_TIME(x) ((double)(x) * DVD_TIME_BASE / 1000)
+#endif
 
 #define DVD_PLAYSPEED_PAUSE       0       // frame stepping
 #define DVD_PLAYSPEED_NORMAL      1000
diff --git a/xbmc/input/XBMC_vkeys.h b/xbmc/input/XBMC_vkeys.h
index 496f336..833d2da 100644
--- a/xbmc/input/XBMC_vkeys.h
+++ b/xbmc/input/XBMC_vkeys.h
@@ -18,256 +18,256 @@
 // Non-printing keypresses get a value in the range 0x80 - 0xFF.
 // Note that the vkey is a byte value so it cannot be greater than 0xFF.
 
-typedef enum {
-  XBMCVK_BACK           = 0x08,
-  XBMCVK_TAB            = 0x09,
-  XBMCVK_RETURN         = 0x0D,
-  XBMCVK_ESCAPE         = 0x1B,
+typedef enum
+{
+  XBMCVK_BACK = 0x08,
+  XBMCVK_TAB = 0x09,
+  XBMCVK_RETURN = 0x0D,
+  XBMCVK_ESCAPE = 0x1B,
 
-  XBMCVK_SPACE          = 0x20,
-  XBMCVK_EXCLAIM        = 0x21,
-  XBMCVK_QUOTEDBL       = 0x22,
-  XBMCVK_HASH           = 0x23,
-  XBMCVK_DOLLAR         = 0x24,
-  XBMCVK_PERCENT        = 0x25,
-  XBMCVK_AMPERSAND      = 0x26,
-  XBMCVK_QUOTE          = 0x27,
-  XBMCVK_LEFTPAREN      = 0x28,
-  XBMCVK_RIGHTPAREN     = 0x29,
-  XBMCVK_ASTERISK       = 0x2A,
-  XBMCVK_PLUS           = 0x2B,
-  XBMCVK_COMMA          = 0x2C,
-  XBMCVK_MINUS          = 0x2D,
-  XBMCVK_PERIOD         = 0x2E,
-  XBMCVK_SLASH          = 0x2F,
+  XBMCVK_SPACE = 0x20,
+  XBMCVK_EXCLAIM = 0x21,
+  XBMCVK_QUOTEDBL = 0x22,
+  XBMCVK_HASH = 0x23,
+  XBMCVK_DOLLAR = 0x24,
+  XBMCVK_PERCENT = 0x25,
+  XBMCVK_AMPERSAND = 0x26,
+  XBMCVK_QUOTE = 0x27,
+  XBMCVK_LEFTPAREN = 0x28,
+  XBMCVK_RIGHTPAREN = 0x29,
+  XBMCVK_ASTERISK = 0x2A,
+  XBMCVK_PLUS = 0x2B,
+  XBMCVK_COMMA = 0x2C,
+  XBMCVK_MINUS = 0x2D,
+  XBMCVK_PERIOD = 0x2E,
+  XBMCVK_SLASH = 0x2F,
 
-  XBMCVK_0              = 0x30,
-  XBMCVK_1              = 0x31,
-  XBMCVK_2              = 0x32,
-  XBMCVK_3              = 0x33,
-  XBMCVK_4              = 0x34,
-  XBMCVK_5              = 0x35,
-  XBMCVK_6              = 0x36,
-  XBMCVK_7              = 0x37,
-  XBMCVK_8              = 0x38,
-  XBMCVK_9              = 0x39,
+  XBMCVK_0 = 0x30,
+  XBMCVK_1 = 0x31,
+  XBMCVK_2 = 0x32,
+  XBMCVK_3 = 0x33,
+  XBMCVK_4 = 0x34,
+  XBMCVK_5 = 0x35,
+  XBMCVK_6 = 0x36,
+  XBMCVK_7 = 0x37,
+  XBMCVK_8 = 0x38,
+  XBMCVK_9 = 0x39,
 
-  XBMCVK_COLON          = 0x3A,
-  XBMCVK_SEMICOLON      = 0x3B,
-  XBMCVK_LESS           = 0x3C,
-  XBMCVK_EQUALS         = 0x3D,
-  XBMCVK_GREATER        = 0x3E,
-  XBMCVK_QUESTION       = 0x3F,
-  XBMCVK_AT             = 0x40,
+  XBMCVK_COLON = 0x3A,
+  XBMCVK_SEMICOLON = 0x3B,
+  XBMCVK_LESS = 0x3C,
+  XBMCVK_EQUALS = 0x3D,
+  XBMCVK_GREATER = 0x3E,
+  XBMCVK_QUESTION = 0x3F,
+  XBMCVK_AT = 0x40,
 
-  XBMCVK_A              = 0x41,
-  XBMCVK_B              = 0x42,
-  XBMCVK_C              = 0x43,
-  XBMCVK_D              = 0x44,
-  XBMCVK_E              = 0x45,
-  XBMCVK_F              = 0x46,
-  XBMCVK_G              = 0x47,
-  XBMCVK_H              = 0x48,
-  XBMCVK_I              = 0x49,
-  XBMCVK_J              = 0x4A,
-  XBMCVK_K              = 0x4B,
-  XBMCVK_L              = 0x4C,
-  XBMCVK_M              = 0x4D,
-  XBMCVK_N              = 0x4E,
-  XBMCVK_O              = 0x4F,
-  XBMCVK_P              = 0x50,
-  XBMCVK_Q              = 0x51,
-  XBMCVK_R              = 0x52,
-  XBMCVK_S              = 0x53,
-  XBMCVK_T              = 0x54,
-  XBMCVK_U              = 0x55,
-  XBMCVK_V              = 0x56,
-  XBMCVK_W              = 0x57,
-  XBMCVK_X              = 0x58,
-  XBMCVK_Y              = 0x59,
-  XBMCVK_Z              = 0x5A,
+  XBMCVK_A = 0x41,
+  XBMCVK_B = 0x42,
+  XBMCVK_C = 0x43,
+  XBMCVK_D = 0x44,
+  XBMCVK_E = 0x45,
+  XBMCVK_F = 0x46,
+  XBMCVK_G = 0x47,
+  XBMCVK_H = 0x48,
+  XBMCVK_I = 0x49,
+  XBMCVK_J = 0x4A,
+  XBMCVK_K = 0x4B,
+  XBMCVK_L = 0x4C,
+  XBMCVK_M = 0x4D,
+  XBMCVK_N = 0x4E,
+  XBMCVK_O = 0x4F,
+  XBMCVK_P = 0x50,
+  XBMCVK_Q = 0x51,
+  XBMCVK_R = 0x52,
+  XBMCVK_S = 0x53,
+  XBMCVK_T = 0x54,
+  XBMCVK_U = 0x55,
+  XBMCVK_V = 0x56,
+  XBMCVK_W = 0x57,
+  XBMCVK_X = 0x58,
+  XBMCVK_Y = 0x59,
+  XBMCVK_Z = 0x5A,
 
-  XBMCVK_LEFTBRACKET    = 0x5B,
-  XBMCVK_BACKSLASH      = 0x5C,
-  XBMCVK_RIGHTBRACKET   = 0x5D,
-  XBMCVK_CARET          = 0x5E,
-  XBMCVK_UNDERSCORE     = 0x5F,
-  XBMCVK_BACKQUOTE      = 0x60,
+  XBMCVK_LEFTBRACKET = 0x5B,
+  XBMCVK_BACKSLASH = 0x5C,
+  XBMCVK_RIGHTBRACKET = 0x5D,
+  XBMCVK_CARET = 0x5E,
+  XBMCVK_UNDERSCORE = 0x5F,
+  XBMCVK_BACKQUOTE = 0x60,
 
-// Lowercase letters 0x61 - 0x7a have the same vkey as uppercase, so
-// use this block for the numpad keys
-  XBMCVK_NUMPADDIVIDE   = 0x61,
-  XBMCVK_NUMPADTIMES    = 0x62,
-  XBMCVK_NUMPADMINUS    = 0x63,
-  XBMCVK_NUMPADPLUS     = 0x64,
-  XBMCVK_NUMPADENTER    = 0x65,
-  XBMCVK_NUMPADPERIOD   = 0x66,
-  XBMCVK_NUMPAD0        = 0x70,
-  XBMCVK_NUMPAD1        = 0x71,
-  XBMCVK_NUMPAD2        = 0x72,
-  XBMCVK_NUMPAD3        = 0x73,
-  XBMCVK_NUMPAD4        = 0x74,
-  XBMCVK_NUMPAD5        = 0x75,
-  XBMCVK_NUMPAD6        = 0x76,
-  XBMCVK_NUMPAD7        = 0x77,
-  XBMCVK_NUMPAD8        = 0x78,
-  XBMCVK_NUMPAD9        = 0x79,
+  // Lowercase letters 0x61 - 0x7a have the same vkey as uppercase, so
+  // use this block for the numpad keys
+  XBMCVK_NUMPADDIVIDE = 0x61,
+  XBMCVK_NUMPADTIMES = 0x62,
+  XBMCVK_NUMPADMINUS = 0x63,
+  XBMCVK_NUMPADPLUS = 0x64,
+  XBMCVK_NUMPADENTER = 0x65,
+  XBMCVK_NUMPADPERIOD = 0x66,
+  XBMCVK_NUMPAD0 = 0x70,
+  XBMCVK_NUMPAD1 = 0x71,
+  XBMCVK_NUMPAD2 = 0x72,
+  XBMCVK_NUMPAD3 = 0x73,
+  XBMCVK_NUMPAD4 = 0x74,
+  XBMCVK_NUMPAD5 = 0x75,
+  XBMCVK_NUMPAD6 = 0x76,
+  XBMCVK_NUMPAD7 = 0x77,
+  XBMCVK_NUMPAD8 = 0x78,
+  XBMCVK_NUMPAD9 = 0x79,
 
-  XBMCVK_LEFTBRACE      = 0x7B,
-  XBMCVK_PIPE           = 0x7C,
-  XBMCVK_RIGHTBRACE     = 0x7D,
-  XBMCVK_TILDE          = 0x7E,
+  XBMCVK_LEFTBRACE = 0x7B,
+  XBMCVK_PIPE = 0x7C,
+  XBMCVK_RIGHTBRACE = 0x7D,
+  XBMCVK_TILDE = 0x7E,
 
-// Non-printing characters
+  // Non-printing characters
 
-  XBMCVK_UP             = 0x80,
-  XBMCVK_DOWN           = 0x81,
-  XBMCVK_LEFT           = 0x82,
-  XBMCVK_RIGHT          = 0x83,
-  XBMCVK_PAGEUP         = 0x84,
-  XBMCVK_PAGEDOWN       = 0x85,
-  XBMCVK_INSERT         = 0x86,
-  XBMCVK_DELETE         = 0x87,
-  XBMCVK_HOME           = 0x88,
-  XBMCVK_END            = 0x89,
+  XBMCVK_UP = 0x80,
+  XBMCVK_DOWN = 0x81,
+  XBMCVK_LEFT = 0x82,
+  XBMCVK_RIGHT = 0x83,
+  XBMCVK_PAGEUP = 0x84,
+  XBMCVK_PAGEDOWN = 0x85,
+  XBMCVK_INSERT = 0x86,
+  XBMCVK_DELETE = 0x87,
+  XBMCVK_HOME = 0x88,
+  XBMCVK_END = 0x89,
 
-  XBMCVK_F1             = 0x90,
-  XBMCVK_F2             = 0x91,
-  XBMCVK_F3             = 0x92,
-  XBMCVK_F4             = 0x93,
-  XBMCVK_F5             = 0x94,
-  XBMCVK_F6             = 0x95,
-  XBMCVK_F7             = 0x96,
-  XBMCVK_F8             = 0x97,
-  XBMCVK_F9             = 0x98,
-  XBMCVK_F10            = 0x99,
-  XBMCVK_F11            = 0x9A,
-  XBMCVK_F12            = 0x9B,
-  XBMCVK_F13            = 0x9C,
-  XBMCVK_F14            = 0x9D,
-  XBMCVK_F15            = 0x9E,
-  XBMCVK_F16            = 0x9F,
-  XBMCVK_F17            = 0xA0,
-  XBMCVK_F18            = 0xA1,
-  XBMCVK_F19            = 0xA2,
-  XBMCVK_F20            = 0xA3,
-  XBMCVK_F21            = 0xA4,
-  XBMCVK_F22            = 0xA5,
-  XBMCVK_F23            = 0xA6,
-  XBMCVK_F24            = 0xA7,
+  XBMCVK_F1 = 0x90,
+  XBMCVK_F2 = 0x91,
+  XBMCVK_F3 = 0x92,
+  XBMCVK_F4 = 0x93,
+  XBMCVK_F5 = 0x94,
+  XBMCVK_F6 = 0x95,
+  XBMCVK_F7 = 0x96,
+  XBMCVK_F8 = 0x97,
+  XBMCVK_F9 = 0x98,
+  XBMCVK_F10 = 0x99,
+  XBMCVK_F11 = 0x9A,
+  XBMCVK_F12 = 0x9B,
+  XBMCVK_F13 = 0x9C,
+  XBMCVK_F14 = 0x9D,
+  XBMCVK_F15 = 0x9E,
+  XBMCVK_F16 = 0x9F,
+  XBMCVK_F17 = 0xA0,
+  XBMCVK_F18 = 0xA1,
+  XBMCVK_F19 = 0xA2,
+  XBMCVK_F20 = 0xA3,
+  XBMCVK_F21 = 0xA4,
+  XBMCVK_F22 = 0xA5,
+  XBMCVK_F23 = 0xA6,
+  XBMCVK_F24 = 0xA7,
 
-  XBMCVK_BROWSER_BACK        = 0xB0,
-  XBMCVK_BROWSER_FORWARD     = 0xB1,
-  XBMCVK_BROWSER_REFRESH     = 0xB2,
-  XBMCVK_BROWSER_STOP        = 0xB3,
-  XBMCVK_BROWSER_SEARCH      = 0xB4,
-  XBMCVK_BROWSER_FAVORITES   = 0xB5,
-  XBMCVK_BROWSER_HOME        = 0xB6,
-  XBMCVK_VOLUME_MUTE         = 0xB7,
-  XBMCVK_VOLUME_DOWN         = 0xB8,
-  XBMCVK_VOLUME_UP           = 0xB9,
-  XBMCVK_MEDIA_NEXT_TRACK    = 0xBA,
-  XBMCVK_MEDIA_PREV_TRACK    = 0xBB,
-  XBMCVK_MEDIA_STOP          = 0xBC,
-  XBMCVK_MEDIA_PLAY_PAUSE    = 0xBD,
-  XBMCVK_LAUNCH_MAIL         = 0xBE,
+  XBMCVK_BROWSER_BACK = 0xB0,
+  XBMCVK_BROWSER_FORWARD = 0xB1,
+  XBMCVK_BROWSER_REFRESH = 0xB2,
+  XBMCVK_BROWSER_STOP = 0xB3,
+  XBMCVK_BROWSER_SEARCH = 0xB4,
+  XBMCVK_BROWSER_FAVORITES = 0xB5,
+  XBMCVK_BROWSER_HOME = 0xB6,
+  XBMCVK_VOLUME_MUTE = 0xB7,
+  XBMCVK_VOLUME_DOWN = 0xB8,
+  XBMCVK_VOLUME_UP = 0xB9,
+  XBMCVK_MEDIA_NEXT_TRACK = 0xBA,
+  XBMCVK_MEDIA_PREV_TRACK = 0xBB,
+  XBMCVK_MEDIA_STOP = 0xBC,
+  XBMCVK_MEDIA_PLAY_PAUSE = 0xBD,
+  XBMCVK_LAUNCH_MAIL = 0xBE,
   XBMCVK_LAUNCH_MEDIA_SELECT = 0xBF,
-  XBMCVK_LAUNCH_APP1         = 0xC0,
-  XBMCVK_LAUNCH_APP2         = 0xC1,
+  XBMCVK_LAUNCH_APP1 = 0xC0,
+  XBMCVK_LAUNCH_APP2 = 0xC1,
   XBMCVK_LAUNCH_FILE_BROWSER = 0xC2,
   XBMCVK_LAUNCH_MEDIA_CENTER = 0xC3,
-  XBMCVK_MEDIA_REWIND        = 0xC4,
-  XBMCVK_MEDIA_FASTFORWARD   = 0xC5,
-  XBMCVK_MEDIA_RECORD        = 0xC6,
+  XBMCVK_MEDIA_REWIND = 0xC4,
+  XBMCVK_MEDIA_FASTFORWARD = 0xC5,
+  XBMCVK_MEDIA_RECORD = 0xC6,
 
-  XBMCVK_LCONTROL       = 0xD0,
-  XBMCVK_RCONTROL       = 0xD1,
-  XBMCVK_LSHIFT         = 0xD2,
-  XBMCVK_RSHIFT         = 0xD3,
-  XBMCVK_LMENU          = 0xD4,
-  XBMCVK_RMENU          = 0xD5,
-  XBMCVK_LWIN           = 0xD6,
-  XBMCVK_RWIN           = 0xD7,
-  XBMCVK_MENU           = 0xD8,
-  XBMCVK_CAPSLOCK       = 0xD9,
-  XBMCVK_NUMLOCK        = 0xDA,
+  XBMCVK_LCONTROL = 0xD0,
+  XBMCVK_RCONTROL = 0xD1,
+  XBMCVK_LSHIFT = 0xD2,
+  XBMCVK_RSHIFT = 0xD3,
+  XBMCVK_LMENU = 0xD4,
+  XBMCVK_RMENU = 0xD5,
+  XBMCVK_LWIN = 0xD6,
+  XBMCVK_RWIN = 0xD7,
+  XBMCVK_MENU = 0xD8,
+  XBMCVK_CAPSLOCK = 0xD9,
+  XBMCVK_NUMLOCK = 0xDA,
 
-  XBMCVK_PRINTSCREEN    = 0xDB,
-  XBMCVK_SCROLLLOCK     = 0xDC,
-  XBMCVK_PAUSE          = 0XDD,
-  XBMCVK_POWER          = 0XDE,
-  XBMCVK_SLEEP          = 0XDF,
-  XBMCVK_GUIDE          = 0xE0,
-  XBMCVK_SETTINGS       = 0xE1,
-  XBMCVK_INFO           = 0xE2,
-  XBMCVK_RED            = 0xE3,
-  XBMCVK_GREEN          = 0xE4,
-  XBMCVK_YELLOW         = 0xE5,
-  XBMCVK_BLUE           = 0xE6,
-  XBMCVK_ZOOM           = 0xE7,
-  XBMCVK_TEXT           = 0xE8,
-  XBMCVK_FAVORITES      = 0xE9,
-  XBMCVK_HOMEPAGE       = 0xEA,
-  XBMCVK_CONFIG         = 0xEB,
-  XBMCVK_EPG            = 0xEC,
+  XBMCVK_PRINTSCREEN = 0xDB,
+  XBMCVK_SCROLLLOCK = 0xDC,
+  XBMCVK_PAUSE = 0XDD,
+  XBMCVK_POWER = 0XDE,
+  XBMCVK_SLEEP = 0XDF,
+  XBMCVK_GUIDE = 0xE0,
+  XBMCVK_SETTINGS = 0xE1,
+  XBMCVK_INFO = 0xE2,
+  XBMCVK_RED = 0xE3,
+  XBMCVK_GREEN = 0xE4,
+  XBMCVK_YELLOW = 0xE5,
+  XBMCVK_BLUE = 0xE6,
+  XBMCVK_ZOOM = 0xE7,
+  XBMCVK_TEXT = 0xE8,
+  XBMCVK_FAVORITES = 0xE9,
+  XBMCVK_HOMEPAGE = 0xEA,
+  XBMCVK_CONFIG = 0xEB,
+  XBMCVK_EPG = 0xEC,
 
-  XBMCVK_LAST           = 0xFF
+  XBMCVK_LAST = 0xFF
 } XBMCVKey;
 
 // These should be in winuser.h. Not sure why they have been defined here
 #ifndef VK_0
-#define VK_0    '0'
-#define VK_1    '1'
-#define VK_2    '2'
-#define VK_3    '3'
-#define VK_4    '4'
-#define VK_5    '5'
-#define VK_6    '6'
-#define VK_7    '7'
-#define VK_8    '8'
-#define VK_9    '9'
-#define VK_A    'A'
-#define VK_B    'B'
-#define VK_C    'C'
-#define VK_D    'D'
-#define VK_E    'E'
-#define VK_F    'F'
-#define VK_G    'G'
-#define VK_H    'H'
-#define VK_I    'I'
-#define VK_J    'J'
-#define VK_K    'K'
-#define VK_L    'L'
-#define VK_M    'M'
-#define VK_N    'N'
-#define VK_O    'O'
-#define VK_P    'P'
-#define VK_Q    'Q'
-#define VK_R    'R'
-#define VK_S    'S'
-#define VK_T    'T'
-#define VK_U    'U'
-#define VK_V    'V'
-#define VK_W    'W'
-#define VK_X    'X'
-#define VK_Y    'Y'
-#define VK_Z    'Z'
+#define VK_0 '0'
+#define VK_1 '1'
+#define VK_2 '2'
+#define VK_3 '3'
+#define VK_4 '4'
+#define VK_5 '5'
+#define VK_6 '6'
+#define VK_7 '7'
+#define VK_8 '8'
+#define VK_9 '9'
+#define VK_A 'A'
+#define VK_B 'B'
+#define VK_C 'C'
+#define VK_D 'D'
+#define VK_E 'E'
+#define VK_F 'F'
+#define VK_G 'G'
+#define VK_H 'H'
+#define VK_I 'I'
+#define VK_J 'J'
+#define VK_K 'K'
+#define VK_L 'L'
+#define VK_M 'M'
+#define VK_N 'N'
+#define VK_O 'O'
+#define VK_P 'P'
+#define VK_Q 'Q'
+#define VK_R 'R'
+#define VK_S 'S'
+#define VK_T 'T'
+#define VK_U 'U'
+#define VK_V 'V'
+#define VK_W 'W'
+#define VK_X 'X'
+#define VK_Y 'Y'
+#define VK_Z 'Z'
 #endif /* VK_0 */
 
 /* These keys haven't been defined, but were experimentally determined */
 #ifndef VK_SEMICOLON
-#define VK_SEMICOLON    0xBA
-#define VK_EQUALS       0xBB
-#define VK_COMMA        0xBC
-#define VK_MINUS        0xBD
-#define VK_PERIOD       0xBE
-#define VK_SLASH        0xBF
-#define VK_GRAVE        0xC0
-#define VK_LBRACKET     0xDB
-#define VK_BACKSLASH    0xDC
-#define VK_RBRACKET     0xDD
-#define VK_APOSTROPHE   0xDE
-#define VK_BACKTICK     0xDF
-#define VK_OEM_102      0xE2
+#define VK_SEMICOLON 0xBA
+#define VK_EQUALS 0xBB
+#define VK_COMMA 0xBC
+#define VK_MINUS 0xBD
+#define VK_PERIOD 0xBE
+#define VK_SLASH 0xBF
+#define VK_GRAVE 0xC0
+#define VK_LBRACKET 0xDB
+#define VK_BACKSLASH 0xDC
+#define VK_RBRACKET 0xDD
+#define VK_APOSTROPHE 0xDE
+#define VK_BACKTICK 0xDF
+#define VK_OEM_102 0xE2
 #endif
-
diff --git a/xbmc/input/actions/ActionIDs.h b/xbmc/input/actions/ActionIDs.h
index 9fd9d80..760228d 100644
--- a/xbmc/input/actions/ActionIDs.h
+++ b/xbmc/input/actions/ActionIDs.h
@@ -15,298 +15,369 @@
  * @{
  * @brief Actions that we have defined.
  */
-#define ACTION_NONE                    0
-#define ACTION_MOVE_LEFT               1
-#define ACTION_MOVE_RIGHT              2
-#define ACTION_MOVE_UP                 3
-#define ACTION_MOVE_DOWN               4
-#define ACTION_PAGE_UP                 5
-#define ACTION_PAGE_DOWN               6
-#define ACTION_SELECT_ITEM             7
-#define ACTION_HIGHLIGHT_ITEM          8
-#define ACTION_PARENT_DIR              9
-#define ACTION_PREVIOUS_MENU          10
-#define ACTION_SHOW_INFO              11
-
-#define ACTION_PAUSE                  12
-#define ACTION_STOP                   13
-#define ACTION_NEXT_ITEM              14
-#define ACTION_PREV_ITEM              15
-#define ACTION_FORWARD                16 //!< Can be used to specify specific action in a window, Playback control is handled in ACTION_PLAYER_*
-#define ACTION_REWIND                 17 //!< Can be used to specify specific action in a window, Playback control is handled in ACTION_PLAYER_*
-
-#define ACTION_SHOW_GUI               18 //!< toggle between GUI and movie or GUI and visualisation.
-#define ACTION_ASPECT_RATIO           19 //!< toggle quick-access zoom modes. Can b used in videoFullScreen.zml window id=2005
-#define ACTION_STEP_FORWARD           20 //!< seek +1% in the movie. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_STEP_BACK              21 //!< seek -1% in the movie. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_BIG_STEP_FORWARD       22 //!< seek +10% in the movie. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_BIG_STEP_BACK          23 //!< seek -10% in the movie. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_SHOW_OSD               24 //!< show/hide OSD. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_SHOW_SUBTITLES         25 //!< turn subtitles on/off. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_NEXT_SUBTITLE          26 //!< switch to next subtitle of movie. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_BROWSE_SUBTITLE       247 //!< Browse for subtitle. Can be used in videofullscreen
-#define ACTION_PLAYER_DEBUG           27 //!< show debug info for VideoPlayer
-#define ACTION_NEXT_PICTURE           28 //!< show next picture of slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_PREV_PICTURE           29 //!< show previous picture of slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_OUT               30 //!< zoom in picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_IN                31 //!< zoom out picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_TOGGLE_SOURCE_DEST     32 //!< used to toggle between source view and destination view. Can be used in myfiles.xml window id=3
-#define ACTION_SHOW_PLAYLIST          33 //!< used to toggle between current view and playlist view. Can b used in all mymusic xml files
-#define ACTION_QUEUE_ITEM             34 //!< used to queue a item to the playlist. Can b used in all mymusic xml files
-#define ACTION_REMOVE_ITEM            35 //!< not used anymore
-#define ACTION_SHOW_FULLSCREEN        36 //!< not used anymore
-#define ACTION_ZOOM_LEVEL_NORMAL      37 //!< zoom 1x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_1           38 //!< zoom 2x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_2           39 //!< zoom 3x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_3           40 //!< zoom 4x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_4           41 //!< zoom 5x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_5           42 //!< zoom 6x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_6           43 //!< zoom 7x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_7           44 //!< zoom 8x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_8           45 //!< zoom 9x picture during slideshow. Can b used in slideshow.xml window id=2007
-#define ACTION_ZOOM_LEVEL_9           46 //!< zoom 10x picture during slideshow. Can b used in slideshow.xml window id=2007
-
-#define ACTION_CALIBRATE_SWAP_ARROWS  47 //!< select next arrow. Can b used in: settingsScreenCalibration.xml windowid=11
-#define ACTION_CALIBRATE_RESET        48 //!< reset calibration to defaults. Can b used in: `settingsScreenCalibration.xml` windowid=11/settingsUICalibration.xml windowid=10
-#define ACTION_ANALOG_MOVE            49 //!< analog thumbstick move. Can b used in: `slideshow.xml` windowid=2007/settingsScreenCalibration.xml windowid=11/settingsUICalibration.xml windowid=10
-                                         //!< @note see also ACTION_ANALOG_MOVE_X_LEFT, ACTION_ANALOG_MOVE_X_RIGHT, ACTION_ANALOG_MOVE_Y_UP, ACTION_ANALOG_MOVE_Y_DOWN
-#define ACTION_ROTATE_PICTURE_CW      50 //!< rotate current picture clockwise during slideshow. Can be used in slideshow.xml window id=2007
-#define ACTION_ROTATE_PICTURE_CCW     51 //!< rotate current picture counterclockwise during slideshow. Can be used in slideshow.xml window id=2007
-
-#define ACTION_SUBTITLE_DELAY_MIN     52 //!< Decrease subtitle/movie Delay.  Can b used in videoFullScreen.xml window id=2005
-#define ACTION_SUBTITLE_DELAY_PLUS    53 //!< Increase subtitle/movie Delay.  Can b used in videoFullScreen.xml window id=2005
-#define ACTION_AUDIO_DELAY_MIN        54 //!< Increase avsync delay.  Can b used in videoFullScreen.xml window id=2005
-#define ACTION_AUDIO_DELAY_PLUS       55 //!< Decrease avsync delay.  Can b used in videoFullScreen.xml window id=2005
-#define ACTION_AUDIO_NEXT_LANGUAGE    56 //!< Select next language in movie.  Can b used in videoFullScreen.xml window id=2005
-#define ACTION_CHANGE_RESOLUTION      57 //!< switch 2 next resolution. Can b used during screen calibration settingsScreenCalibration.xml windowid=11
-
-#define REMOTE_0                      58  //!< remote keys 0-9. are used by multiple windows
-#define REMOTE_1                      59  //!< for example in videoFullScreen.xml window id=2005 you can
-#define REMOTE_2                      60  //!< enter time (mmss) to jump to particular point in the movie
-#define REMOTE_3                      61
-#define REMOTE_4                      62  //!< with spincontrols you can enter 3digit number to quickly set
-#define REMOTE_5                      63  //!< spincontrol to desired value
-#define REMOTE_6                      64
-#define REMOTE_7                      65
-#define REMOTE_8                      66
-#define REMOTE_9                      67
-
-#define ACTION_PLAYER_PROCESS_INFO    69 //!< show player process info (video decoder, pixel format, pvr signal strength and the like
-#define ACTION_PLAYER_PROGRAM_SELECT  70
-#define ACTION_PLAYER_RESOLUTION_SELECT  71
-#define ACTION_SMALL_STEP_BACK        76  //!< jumps a few seconds back during playback of movie. Can b used in videoFullScreen.xml window id=2005
-
-#define ACTION_PLAYER_FORWARD         77  //!< FF in current file played. global action, can be used anywhere
-#define ACTION_PLAYER_REWIND          78  //!< RW in current file played. global action, can be used anywhere
-#define ACTION_PLAYER_PLAY            79  //!< Play current song. Unpauses song and sets playspeed to 1x. global action, can be used anywhere
-
-#define ACTION_DELETE_ITEM            80  //!< delete current selected item. Can be used in myfiles.xml window id=3 and in myvideoTitle.xml window id=25
-#define ACTION_COPY_ITEM              81  //!< copy current selected item. Can be used in myfiles.xml window id=3
-#define ACTION_MOVE_ITEM              82  //!< move current selected item. Can be used in myfiles.xml window id=3
-#define ACTION_TAKE_SCREENSHOT        85  //!< take a screenshot
-#define ACTION_RENAME_ITEM            87  //!< rename item
-
-#define ACTION_VOLUME_UP            88
-#define ACTION_VOLUME_DOWN          89
-#define ACTION_VOLAMP               90
-#define ACTION_MUTE                 91
-#define ACTION_NAV_BACK             92
-#define ACTION_VOLAMP_UP            93
-#define ACTION_VOLAMP_DOWN          94
-
-#define ACTION_CREATE_EPISODE_BOOKMARK 95 //!< Creates an episode bookmark on the currently playing video file containing more than one episode
-#define ACTION_CREATE_BOOKMARK         96 //!< Creates a bookmark of the currently playing video file
-
-#define ACTION_CHAPTER_OR_BIG_STEP_FORWARD       97 //!< Goto the next chapter, if not available perform a big step forward
-#define ACTION_CHAPTER_OR_BIG_STEP_BACK          98 //!< Goto the previous chapter, if not available perform a big step back
-
-#define ACTION_CYCLE_SUBTITLE         99 //!< switch to next subtitle of movie, but will not enable/disable the subtitles. Can be used in videoFullScreen.xml window id=2005
-
-#define ACTION_MOUSE_START            100
-#define ACTION_MOUSE_LEFT_CLICK       100
-#define ACTION_MOUSE_RIGHT_CLICK      101
-#define ACTION_MOUSE_MIDDLE_CLICK     102
-#define ACTION_MOUSE_DOUBLE_CLICK     103
-#define ACTION_MOUSE_WHEEL_UP         104
-#define ACTION_MOUSE_WHEEL_DOWN       105
-#define ACTION_MOUSE_DRAG             106
-#define ACTION_MOUSE_MOVE             107
-#define ACTION_MOUSE_LONG_CLICK       108
-#define ACTION_MOUSE_END              109
-
-#define ACTION_BACKSPACE          110
-#define ACTION_SCROLL_UP          111
-#define ACTION_SCROLL_DOWN        112
-#define ACTION_ANALOG_FORWARD     113
-#define ACTION_ANALOG_REWIND      114
-
-#define ACTION_MOVE_ITEM_UP       115  //!< move item up in playlist
-#define ACTION_MOVE_ITEM_DOWN     116  //!< move item down in playlist
-#define ACTION_CONTEXT_MENU       117  //!< pops up the context menu
+#define ACTION_NONE 0
+#define ACTION_MOVE_LEFT 1
+#define ACTION_MOVE_RIGHT 2
+#define ACTION_MOVE_UP 3
+#define ACTION_MOVE_DOWN 4
+#define ACTION_PAGE_UP 5
+#define ACTION_PAGE_DOWN 6
+#define ACTION_SELECT_ITEM 7
+#define ACTION_HIGHLIGHT_ITEM 8
+#define ACTION_PARENT_DIR 9
+#define ACTION_PREVIOUS_MENU 10
+#define ACTION_SHOW_INFO 11
+
+#define ACTION_PAUSE 12
+#define ACTION_STOP 13
+#define ACTION_NEXT_ITEM 14
+#define ACTION_PREV_ITEM 15
+#define ACTION_FORWARD \
+  16 //!< Can be used to specify specific action in a window, Playback control is handled in
+     //!< ACTION_PLAYER_*
+#define ACTION_REWIND \
+  17 //!< Can be used to specify specific action in a window, Playback control is handled in
+     //!< ACTION_PLAYER_*
+
+#define ACTION_SHOW_GUI 18 //!< toggle between GUI and movie or GUI and visualisation.
+#define ACTION_ASPECT_RATIO \
+  19 //!< toggle quick-access zoom modes. Can b used in videoFullScreen.zml window id=2005
+#define ACTION_STEP_FORWARD \
+  20 //!< seek +1% in the movie. Can b used in videoFullScreen.xml window id=2005
+#define ACTION_STEP_BACK \
+  21 //!< seek -1% in the movie. Can b used in videoFullScreen.xml window id=2005
+#define ACTION_BIG_STEP_FORWARD \
+  22 //!< seek +10% in the movie. Can b used in videoFullScreen.xml window id=2005
+#define ACTION_BIG_STEP_BACK \
+  23 //!< seek -10% in the movie. Can b used in videoFullScreen.xml window id=2005
+#define ACTION_SHOW_OSD 24 //!< show/hide OSD. Can b used in videoFullScreen.xml window id=2005
+#define ACTION_SHOW_SUBTITLES \
+  25 //!< turn subtitles on/off. Can b used in videoFullScreen.xml window id=2005
+#define ACTION_NEXT_SUBTITLE \
+  26 //!< switch to next subtitle of movie. Can b used in videoFullScreen.xml window id=2005
+#define ACTION_BROWSE_SUBTITLE 247 //!< Browse for subtitle. Can be used in videofullscreen
+#define ACTION_PLAYER_DEBUG 27 //!< show debug info for VideoPlayer
+#define ACTION_NEXT_PICTURE \
+  28 //!< show next picture of slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_PREV_PICTURE \
+  29 //!< show previous picture of slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_OUT \
+  30 //!< zoom in picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_IN \
+  31 //!< zoom out picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_TOGGLE_SOURCE_DEST \
+  32 //!< used to toggle between source view and destination view. Can be used in myfiles.xml window
+     //!< id=3
+#define ACTION_SHOW_PLAYLIST \
+  33 //!< used to toggle between current view and playlist view. Can b used in all mymusic xml files
+#define ACTION_QUEUE_ITEM \
+  34 //!< used to queue a item to the playlist. Can b used in all mymusic xml files
+#define ACTION_REMOVE_ITEM 35 //!< not used anymore
+#define ACTION_SHOW_FULLSCREEN 36 //!< not used anymore
+#define ACTION_ZOOM_LEVEL_NORMAL \
+  37 //!< zoom 1x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_1 \
+  38 //!< zoom 2x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_2 \
+  39 //!< zoom 3x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_3 \
+  40 //!< zoom 4x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_4 \
+  41 //!< zoom 5x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_5 \
+  42 //!< zoom 6x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_6 \
+  43 //!< zoom 7x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_7 \
+  44 //!< zoom 8x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_8 \
+  45 //!< zoom 9x picture during slideshow. Can b used in slideshow.xml window id=2007
+#define ACTION_ZOOM_LEVEL_9 \
+  46 //!< zoom 10x picture during slideshow. Can b used in slideshow.xml window id=2007
+
+#define ACTION_CALIBRATE_SWAP_ARROWS \
+  47 //!< select next arrow. Can b used in: settingsScreenCalibration.xml windowid=11
+#define ACTION_CALIBRATE_RESET \
+  48 //!< reset calibration to defaults. Can b used in: `settingsScreenCalibration.xml`
+     //!< windowid=11/settingsUICalibration.xml windowid=10
+#define ACTION_ANALOG_MOVE \
+  49 //!< analog thumbstick move. Can b used in: `slideshow.xml`
+     //!< windowid=2007/settingsScreenCalibration.xml windowid=11/settingsUICalibration.xml
+     //!< windowid=10
+     //!< @note see also ACTION_ANALOG_MOVE_X_LEFT, ACTION_ANALOG_MOVE_X_RIGHT,
+     //!< ACTION_ANALOG_MOVE_Y_UP, ACTION_ANALOG_MOVE_Y_DOWN
+#define ACTION_ROTATE_PICTURE_CW \
+  50 //!< rotate current picture clockwise during slideshow. Can be used in slideshow.xml window
+     //!< id=2007
+#define ACTION_ROTATE_PICTURE_CCW \
+  51 //!< rotate current picture counterclockwise during slideshow. Can be used in slideshow.xml
+     //!< window id=2007
+
+#define ACTION_SUBTITLE_DELAY_MIN \
+  52 //!< Decrease subtitle/movie Delay.  Can b used in videoFullScreen.xml window id=2005
+#define ACTION_SUBTITLE_DELAY_PLUS \
+  53 //!< Increase subtitle/movie Delay.  Can b used in videoFullScreen.xml window id=2005
+#define ACTION_AUDIO_DELAY_MIN \
+  54 //!< Increase avsync delay.  Can b used in videoFullScreen.xml window id=2005
+#define ACTION_AUDIO_DELAY_PLUS \
+  55 //!< Decrease avsync delay.  Can b used in videoFullScreen.xml window id=2005
+#define ACTION_AUDIO_NEXT_LANGUAGE \
+  56 //!< Select next language in movie.  Can b used in videoFullScreen.xml window id=2005
+#define ACTION_CHANGE_RESOLUTION \
+  57 //!< switch 2 next resolution. Can b used during screen calibration
+     //!< settingsScreenCalibration.xml windowid=11
+
+#define REMOTE_0 58 //!< remote keys 0-9. are used by multiple windows
+#define REMOTE_1 59 //!< for example in videoFullScreen.xml window id=2005 you can
+#define REMOTE_2 60 //!< enter time (mmss) to jump to particular point in the movie
+#define REMOTE_3 61
+#define REMOTE_4 62 //!< with spincontrols you can enter 3digit number to quickly set
+#define REMOTE_5 63 //!< spincontrol to desired value
+#define REMOTE_6 64
+#define REMOTE_7 65
+#define REMOTE_8 66
+#define REMOTE_9 67
+
+#define ACTION_PLAYER_PROCESS_INFO \
+  69 //!< show player process info (video decoder, pixel format, pvr signal strength and the like
+#define ACTION_PLAYER_PROGRAM_SELECT 70
+#define ACTION_PLAYER_RESOLUTION_SELECT 71
+#define ACTION_SMALL_STEP_BACK \
+  76 //!< jumps a few seconds back during playback of movie. Can b used in videoFullScreen.xml
+     //!< window id=2005
+
+#define ACTION_PLAYER_FORWARD 77 //!< FF in current file played. global action, can be used anywhere
+#define ACTION_PLAYER_REWIND 78 //!< RW in current file played. global action, can be used anywhere
+#define ACTION_PLAYER_PLAY \
+  79 //!< Play current song. Unpauses song and sets playspeed to 1x. global action, can be used
+     //!< anywhere
+
+#define ACTION_DELETE_ITEM \
+  80 //!< delete current selected item. Can be used in myfiles.xml window id=3 and in
+     //!< myvideoTitle.xml window id=25
+#define ACTION_COPY_ITEM 81 //!< copy current selected item. Can be used in myfiles.xml window id=3
+#define ACTION_MOVE_ITEM 82 //!< move current selected item. Can be used in myfiles.xml window id=3
+#define ACTION_TAKE_SCREENSHOT 85 //!< take a screenshot
+#define ACTION_RENAME_ITEM 87 //!< rename item
+
+#define ACTION_VOLUME_UP 88
+#define ACTION_VOLUME_DOWN 89
+#define ACTION_VOLAMP 90
+#define ACTION_MUTE 91
+#define ACTION_NAV_BACK 92
+#define ACTION_VOLAMP_UP 93
+#define ACTION_VOLAMP_DOWN 94
+
+#define ACTION_CREATE_EPISODE_BOOKMARK \
+  95 //!< Creates an episode bookmark on the currently playing video file containing more than one
+     //!< episode
+#define ACTION_CREATE_BOOKMARK 96 //!< Creates a bookmark of the currently playing video file
+
+#define ACTION_CHAPTER_OR_BIG_STEP_FORWARD \
+  97 //!< Goto the next chapter, if not available perform a big step forward
+#define ACTION_CHAPTER_OR_BIG_STEP_BACK \
+  98 //!< Goto the previous chapter, if not available perform a big step back
+
+#define ACTION_CYCLE_SUBTITLE \
+  99 //!< switch to next subtitle of movie, but will not enable/disable the subtitles. Can be used
+     //!< in videoFullScreen.xml window id=2005
+
+#define ACTION_MOUSE_START 100
+#define ACTION_MOUSE_LEFT_CLICK 100
+#define ACTION_MOUSE_RIGHT_CLICK 101
+#define ACTION_MOUSE_MIDDLE_CLICK 102
+#define ACTION_MOUSE_DOUBLE_CLICK 103
+#define ACTION_MOUSE_WHEEL_UP 104
+#define ACTION_MOUSE_WHEEL_DOWN 105
+#define ACTION_MOUSE_DRAG 106
+#define ACTION_MOUSE_MOVE 107
+#define ACTION_MOUSE_LONG_CLICK 108
+#define ACTION_MOUSE_DRAG_END 109
+#define ACTION_MOUSE_END 109
+
+#define ACTION_BACKSPACE 110
+#define ACTION_SCROLL_UP 111
+#define ACTION_SCROLL_DOWN 112
+#define ACTION_ANALOG_FORWARD 113
+#define ACTION_ANALOG_REWIND 114
+
+#define ACTION_MOVE_ITEM_UP 115 //!< move item up in playlist
+#define ACTION_MOVE_ITEM_DOWN 116 //!< move item down in playlist
+#define ACTION_CONTEXT_MENU 117 //!< pops up the context menu
 
 // stuff for virtual keyboard shortcuts
-#define ACTION_SHIFT              118 //!< stuff for virtual keyboard shortcuts
-#define ACTION_SYMBOLS            119 //!< stuff for virtual keyboard shortcuts
-#define ACTION_CURSOR_LEFT        120 //!< stuff for virtual keyboard shortcuts
-#define ACTION_CURSOR_RIGHT       121 //!< stuff for virtual keyboard shortcuts
-
-#define ACTION_BUILT_IN_FUNCTION  122
-
-#define ACTION_SHOW_OSD_TIME      123 //!< displays current time, can be used in videoFullScreen.xml window id=2005
-#define ACTION_ANALOG_SEEK_FORWARD  124 //!< seeks forward, and displays the seek bar.
-#define ACTION_ANALOG_SEEK_BACK     125 //!< seeks backward, and displays the seek bar.
-
-#define ACTION_VIS_PRESET_SHOW        126
-#define ACTION_VIS_PRESET_NEXT        128
-#define ACTION_VIS_PRESET_PREV        129
-#define ACTION_VIS_PRESET_LOCK        130
-#define ACTION_VIS_PRESET_RANDOM      131
-#define ACTION_VIS_RATE_PRESET_PLUS   132
-#define ACTION_VIS_RATE_PRESET_MINUS  133
-
-#define ACTION_SHOW_VIDEOMENU         134
-#define ACTION_ENTER                  135
-
-#define ACTION_INCREASE_RATING        136
-#define ACTION_DECREASE_RATING        137
-
-#define ACTION_NEXT_SCENE             138 //!< switch to next scene/cutpoint in movie
-#define ACTION_PREV_SCENE             139 //!< switch to previous scene/cutpoint in movie
-
-#define ACTION_NEXT_LETTER            140 //!< jump through a list or container by letter
-#define ACTION_PREV_LETTER            141
-
-#define ACTION_JUMP_SMS2              142 //!< jump direct to a particular letter using SMS-style input
-#define ACTION_JUMP_SMS3              143
-#define ACTION_JUMP_SMS4              144
-#define ACTION_JUMP_SMS5              145
-#define ACTION_JUMP_SMS6              146
-#define ACTION_JUMP_SMS7              147
-#define ACTION_JUMP_SMS8              148
-#define ACTION_JUMP_SMS9              149
-
-#define ACTION_FILTER_CLEAR           150
-#define ACTION_FILTER_SMS2            151
-#define ACTION_FILTER_SMS3            152
-#define ACTION_FILTER_SMS4            153
-#define ACTION_FILTER_SMS5            154
-#define ACTION_FILTER_SMS6            155
-#define ACTION_FILTER_SMS7            156
-#define ACTION_FILTER_SMS8            157
-#define ACTION_FILTER_SMS9            158
-
-#define ACTION_FIRST_PAGE             159
-#define ACTION_LAST_PAGE              160
-
-#define ACTION_AUDIO_DELAY            161
-#define ACTION_SUBTITLE_DELAY         162
-#define ACTION_MENU                   163
-
-#define ACTION_SET_RATING             164
-
-#define ACTION_RECORD                 170
-
-#define ACTION_PASTE                  180
-#define ACTION_NEXT_CONTROL           181
-#define ACTION_PREV_CONTROL           182
-#define ACTION_CHANNEL_SWITCH         183
-#define ACTION_CHANNEL_UP             184
-#define ACTION_CHANNEL_DOWN           185
-#define ACTION_NEXT_CHANNELGROUP      186
-#define ACTION_PREVIOUS_CHANNELGROUP  187
-#define ACTION_PVR_PLAY               188
-#define ACTION_PVR_PLAY_TV            189
-#define ACTION_PVR_PLAY_RADIO         190
-#define ACTION_PVR_SHOW_TIMER_RULE    191
-#define ACTION_CHANNEL_NUMBER_SEP     192
+#define ACTION_SHIFT 118 //!< stuff for virtual keyboard shortcuts
+#define ACTION_SYMBOLS 119 //!< stuff for virtual keyboard shortcuts
+#define ACTION_CURSOR_LEFT 120 //!< stuff for virtual keyboard shortcuts
+#define ACTION_CURSOR_RIGHT 121 //!< stuff for virtual keyboard shortcuts
+
+#define ACTION_BUILT_IN_FUNCTION 122
+
+#define ACTION_SHOW_OSD_TIME \
+  123 //!< displays current time, can be used in videoFullScreen.xml window id=2005
+#define ACTION_ANALOG_SEEK_FORWARD 124 //!< seeks forward, and displays the seek bar.
+#define ACTION_ANALOG_SEEK_BACK 125 //!< seeks backward, and displays the seek bar.
+
+#define ACTION_VIS_PRESET_SHOW 126
+#define ACTION_VIS_PRESET_NEXT 128
+#define ACTION_VIS_PRESET_PREV 129
+#define ACTION_VIS_PRESET_LOCK 130
+#define ACTION_VIS_PRESET_RANDOM 131
+#define ACTION_VIS_RATE_PRESET_PLUS 132
+#define ACTION_VIS_RATE_PRESET_MINUS 133
+
+#define ACTION_SHOW_VIDEOMENU 134
+#define ACTION_ENTER 135
+
+#define ACTION_INCREASE_RATING 136
+#define ACTION_DECREASE_RATING 137
+
+#define ACTION_NEXT_SCENE 138 //!< switch to next scene/cutpoint in movie
+#define ACTION_PREV_SCENE 139 //!< switch to previous scene/cutpoint in movie
+
+#define ACTION_NEXT_LETTER 140 //!< jump through a list or container by letter
+#define ACTION_PREV_LETTER 141
+
+#define ACTION_JUMP_SMS2 142 //!< jump direct to a particular letter using SMS-style input
+#define ACTION_JUMP_SMS3 143
+#define ACTION_JUMP_SMS4 144
+#define ACTION_JUMP_SMS5 145
+#define ACTION_JUMP_SMS6 146
+#define ACTION_JUMP_SMS7 147
+#define ACTION_JUMP_SMS8 148
+#define ACTION_JUMP_SMS9 149
+
+#define ACTION_FILTER_CLEAR 150
+#define ACTION_FILTER_SMS2 151
+#define ACTION_FILTER_SMS3 152
+#define ACTION_FILTER_SMS4 153
+#define ACTION_FILTER_SMS5 154
+#define ACTION_FILTER_SMS6 155
+#define ACTION_FILTER_SMS7 156
+#define ACTION_FILTER_SMS8 157
+#define ACTION_FILTER_SMS9 158
+
+#define ACTION_FIRST_PAGE 159
+#define ACTION_LAST_PAGE 160
+
+#define ACTION_AUDIO_DELAY 161
+#define ACTION_SUBTITLE_DELAY 162
+#define ACTION_MENU 163
+
+#define ACTION_SET_RATING 164
+
+#define ACTION_RECORD 170
+
+#define ACTION_PASTE 180
+#define ACTION_NEXT_CONTROL 181
+#define ACTION_PREV_CONTROL 182
+#define ACTION_CHANNEL_SWITCH 183
+#define ACTION_CHANNEL_UP 184
+#define ACTION_CHANNEL_DOWN 185
+#define ACTION_NEXT_CHANNELGROUP 186
+#define ACTION_PREVIOUS_CHANNELGROUP 187
+#define ACTION_PVR_PLAY 188
+#define ACTION_PVR_PLAY_TV 189
+#define ACTION_PVR_PLAY_RADIO 190
+#define ACTION_PVR_SHOW_TIMER_RULE 191
+#define ACTION_CHANNEL_NUMBER_SEP 192
 #define ACTION_PVR_ANNOUNCE_REMINDERS 193
 
-#define ACTION_TOGGLE_FULLSCREEN      199 //!< switch 2 desktop resolution
-#define ACTION_TOGGLE_WATCHED         200 //!< Toggle watched status (videos)
-#define ACTION_SCAN_ITEM              201 //!< scan item
-#define ACTION_TOGGLE_DIGITAL_ANALOG  202 //!< switch digital <-> analog
-#define ACTION_RELOAD_KEYMAPS         203 //!< reloads CButtonTranslator's keymaps
-#define ACTION_GUIPROFILE_BEGIN       204 //!< start the GUIControlProfiler running
+#define ACTION_TOGGLE_FULLSCREEN 199 //!< switch 2 desktop resolution
+#define ACTION_TOGGLE_WATCHED 200 //!< Toggle watched status (videos)
+#define ACTION_SCAN_ITEM 201 //!< scan item
+#define ACTION_TOGGLE_DIGITAL_ANALOG 202 //!< switch digital <-> analog
+#define ACTION_RELOAD_KEYMAPS 203 //!< reloads CButtonTranslator's keymaps
+#define ACTION_GUIPROFILE_BEGIN 204 //!< start the GUIControlProfiler running
 
-#define ACTION_TELETEXT_RED           215 //!< Teletext Color button <b>Red</b> to control TopText
-#define ACTION_TELETEXT_GREEN         216 //!< Teletext Color button <b>Green</b> to control TopText
-#define ACTION_TELETEXT_YELLOW        217 //!< Teletext Color button <b>Yellow</b> to control TopText
-#define ACTION_TELETEXT_BLUE          218 //!< Teletext Color button <b>Blue</b> to control TopText
+#define ACTION_TELETEXT_RED 215 //!< Teletext Color button <b>Red</b> to control TopText
+#define ACTION_TELETEXT_GREEN 216 //!< Teletext Color button <b>Green</b> to control TopText
+#define ACTION_TELETEXT_YELLOW 217 //!< Teletext Color button <b>Yellow</b> to control TopText
+#define ACTION_TELETEXT_BLUE 218 //!< Teletext Color button <b>Blue</b> to control TopText
 
-#define ACTION_INCREASE_PAR           219
-#define ACTION_DECREASE_PAR           220
+#define ACTION_INCREASE_PAR 219
+#define ACTION_DECREASE_PAR 220
 
-#define ACTION_VSHIFT_UP              227 //!< shift up video image in VideoPlayer
-#define ACTION_VSHIFT_DOWN            228 //!< shift down video image in VideoPlayer
+#define ACTION_VSHIFT_UP 227 //!< shift up video image in VideoPlayer
+#define ACTION_VSHIFT_DOWN 228 //!< shift down video image in VideoPlayer
 
-#define ACTION_PLAYER_PLAYPAUSE       229 //!< Play/pause. If playing it pauses, if paused it plays.
+#define ACTION_PLAYER_PLAYPAUSE 229 //!< Play/pause. If playing it pauses, if paused it plays.
 
-#define ACTION_SUBTITLE_VSHIFT_UP     230 //!< shift up subtitles in VideoPlayer
-#define ACTION_SUBTITLE_VSHIFT_DOWN   231 //!< shift down subtitles in VideoPlayer
-#define ACTION_SUBTITLE_ALIGN         232 //!< toggle vertical alignment of subtitles
+#define ACTION_SUBTITLE_VSHIFT_UP 230 //!< shift up subtitles in VideoPlayer
+#define ACTION_SUBTITLE_VSHIFT_DOWN 231 //!< shift down subtitles in VideoPlayer
+#define ACTION_SUBTITLE_ALIGN 232 //!< toggle vertical alignment of subtitles
 
-#define ACTION_FILTER                 233
+#define ACTION_FILTER 233
 
-#define ACTION_SWITCH_PLAYER          234
+#define ACTION_SWITCH_PLAYER 234
 
-#define ACTION_STEREOMODE_NEXT        235
-#define ACTION_STEREOMODE_PREVIOUS    236
-#define ACTION_STEREOMODE_TOGGLE      237 //!< turns 3d mode on/off
-#define ACTION_STEREOMODE_SELECT      238
-#define ACTION_STEREOMODE_TOMONO      239
-#define ACTION_STEREOMODE_SET         240
+#define ACTION_STEREOMODE_NEXT 235
+#define ACTION_STEREOMODE_PREVIOUS 236
+#define ACTION_STEREOMODE_TOGGLE 237 //!< turns 3d mode on/off
+#define ACTION_STEREOMODE_SELECT 238
+#define ACTION_STEREOMODE_TOMONO 239
+#define ACTION_STEREOMODE_SET 240
 
-#define ACTION_SETTINGS_RESET         241
-#define ACTION_SETTINGS_LEVEL_CHANGE  242
+#define ACTION_SETTINGS_RESET 241
+#define ACTION_SETTINGS_LEVEL_CHANGE 242
 
-#define ACTION_TRIGGER_OSD            243 //!< show autoclosing OSD. Can b used in videoFullScreen.xml window id=2005
-#define ACTION_INPUT_TEXT             244
-#define ACTION_VOLUME_SET             245
-#define ACTION_TOGGLE_COMMSKIP        246
+#define ACTION_TRIGGER_OSD \
+  243 //!< show autoclosing OSD. Can b used in videoFullScreen.xml window id=2005
+#define ACTION_INPUT_TEXT 244
+#define ACTION_VOLUME_SET 245
+#define ACTION_TOGGLE_COMMSKIP 246
 
-#define ACTION_PLAYER_RESET           248 //!< Send a reset command to the active game
+#define ACTION_HDR_TOGGLE 247 //!< Toggle display HDR on/off
 
-#define ACTION_TOGGLE_FONT            249 //!< Toggle font. Used in TextViewer dialog
+#define ACTION_PLAYER_RESET 248 //!< Send a reset command to the active game
 
-#define ACTION_VIDEO_NEXT_STREAM      250 //!< Cycle video streams. Used in videofullscreen.
-#define ACTION_QUEUE_ITEM_NEXT        251 //!< used to queue an item to the next position in the playlist
+#define ACTION_TOGGLE_FONT 249 //!< Toggle font. Used in TextViewer dialog
+
+#define ACTION_VIDEO_NEXT_STREAM 250 //!< Cycle video streams. Used in videofullscreen.
+#define ACTION_QUEUE_ITEM_NEXT 251 //!< used to queue an item to the next position in the playlist
 
 // Voice actions
-#define ACTION_VOICE_RECOGNIZE        300
+#define ACTION_VOICE_RECOGNIZE 300
 
 // Touch actions
-#define ACTION_TOUCH_TAP              401 //!< touch actions
-#define ACTION_TOUCH_TAP_TEN          410 //!< touch actions
-#define ACTION_TOUCH_LONGPRESS        411 //!< touch actions
-#define ACTION_TOUCH_LONGPRESS_TEN    420 //!< touch actions
-
-#define ACTION_GESTURE_NOTIFY         500
-#define ACTION_GESTURE_BEGIN          501
-#define ACTION_GESTURE_ZOOM           502 //!< sendaction with point and currentPinchScale (fingers together < 1.0 -> fingers apart > 1.0)
-#define ACTION_GESTURE_ROTATE         503
-#define ACTION_GESTURE_PAN            504
-#define ACTION_GESTURE_ABORT          505 //!< gesture was interrupted in unspecified state
-
-#define ACTION_GESTURE_SWIPE_LEFT       511
-#define ACTION_GESTURE_SWIPE_LEFT_TEN   520
-#define ACTION_GESTURE_SWIPE_RIGHT      521
-#define ACTION_GESTURE_SWIPE_RIGHT_TEN  530
-#define ACTION_GESTURE_SWIPE_UP         531
-#define ACTION_GESTURE_SWIPE_UP_TEN     540
-#define ACTION_GESTURE_SWIPE_DOWN       541
-#define ACTION_GESTURE_SWIPE_DOWN_TEN   550
+#define ACTION_TOUCH_TAP 401 //!< touch actions
+#define ACTION_TOUCH_TAP_TEN 410 //!< touch actions
+#define ACTION_TOUCH_LONGPRESS 411 //!< touch actions
+#define ACTION_TOUCH_LONGPRESS_TEN 420 //!< touch actions
+
+#define ACTION_GESTURE_NOTIFY 500
+#define ACTION_GESTURE_BEGIN 501
+#define ACTION_GESTURE_ZOOM \
+  502 //!< sendaction with point and currentPinchScale (fingers together < 1.0 -> fingers apart
+      //!< > 1.0)
+#define ACTION_GESTURE_ROTATE 503
+#define ACTION_GESTURE_PAN 504
+#define ACTION_GESTURE_ABORT 505 //!< gesture was interrupted in unspecified state
+
+#define ACTION_GESTURE_SWIPE_LEFT 511
+#define ACTION_GESTURE_SWIPE_LEFT_TEN 520
+#define ACTION_GESTURE_SWIPE_RIGHT 521
+#define ACTION_GESTURE_SWIPE_RIGHT_TEN 530
+#define ACTION_GESTURE_SWIPE_UP 531
+#define ACTION_GESTURE_SWIPE_UP_TEN 540
+#define ACTION_GESTURE_SWIPE_DOWN 541
+#define ACTION_GESTURE_SWIPE_DOWN_TEN 550
 // 5xx is reserved for additional gesture actions
-#define ACTION_GESTURE_END            599
+#define ACTION_GESTURE_END 599
 
 // other, non-gesture actions
-#define ACTION_ANALOG_MOVE_X_LEFT       601 //!< analog thumbstick move, horizontal axis, left; see ACTION_ANALOG_MOVE
-#define ACTION_ANALOG_MOVE_X_RIGHT      602 //!< analog thumbstick move, horizontal axis, right; see ACTION_ANALOG_MOVE
-#define ACTION_ANALOG_MOVE_Y_UP         603 //!< analog thumbstick move, vertical axis, up; see ACTION_ANALOG_MOVE
-#define ACTION_ANALOG_MOVE_Y_DOWN       604 //!< analog thumbstick move, vertical axis, down; see ACTION_ANALOG_MOVE
+#define ACTION_ANALOG_MOVE_X_LEFT \
+  601 //!< analog thumbstick move, horizontal axis, left; see ACTION_ANALOG_MOVE
+#define ACTION_ANALOG_MOVE_X_RIGHT \
+  602 //!< analog thumbstick move, horizontal axis, right; see ACTION_ANALOG_MOVE
+#define ACTION_ANALOG_MOVE_Y_UP \
+  603 //!< analog thumbstick move, vertical axis, up; see ACTION_ANALOG_MOVE
+#define ACTION_ANALOG_MOVE_Y_DOWN \
+  604 //!< analog thumbstick move, vertical axis, down; see ACTION_ANALOG_MOVE
 //@}
 
 // The NOOP action can be specified to disable an input event. This is
 // useful in user keyboard.xml etc to disable actions specified in the
 // system mappings. ERROR action is used to play an error sound
-#define ACTION_ERROR                  998
-#define ACTION_NOOP                   999
+#define ACTION_ERROR 998
+#define ACTION_NOOP 999
diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt
index a028c7d..6fb712b 100644
--- a/xbmc/interfaces/json-rpc/schema/version.txt
+++ b/xbmc/interfaces/json-rpc/schema/version.txt
@@ -1 +1 @@
-JSONRPC_VERSION 10.5.0
+JSONRPC_VERSION 11.11.0