74 files changed, 9597 insertions, 3751 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
index 184b34e..729f159 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.9.1
+# Doxyfile 1.8.13
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -44,7 +44,7 @@ PROJECT_NUMBER         = 17.0
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "for Binary (API Level 2) and Script based Add-Ons"
+PROJECT_BRIEF          = "for Binary and Script based Add-Ons"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -245,9 +245,11 @@ ALIASES                = "table_start=<table width= 100% style= border bgcolor=
                          "table_h3{3}=<tr bgcolor= 576f9f><th width= 30% align=left>\1</th><th width= 10% align=left>\2</th><th width= 60% align=left>\3</th></tr>" \
                          "table_row3{3}=<tr bgcolor=white><td width= 30% align=left>\1</td><td width= 10% align=left>\2</td><td width= 60% align=left>\3</td></tr>" \
                          "python_func{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Function: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
-                         "python_func_with_rev{2}=\htmlonly <h4><code><span style=\"font-style: italic;\">Function: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code><span style="float:right;"><small>\2</small></span></h4> \endhtmlonly" \
+                         "python_func_with_rev{2}=\htmlonly <h4><code><span style=\"font-style: italic;\">Function: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code><span style= float:right;><small>\2</small></span></h4> \endhtmlonly" \
                          "python_class{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
-                         "python_class_with_rev{2}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code><span style="float:right;"><small>\2</small></span></h4> \endhtmlonly" \
+                         "python_class_with_rev{2}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code><span style= float:right;><small>\2</small></span></h4> \endhtmlonly" \
+                         "cpp_class{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Class: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
+                         "cpp_namespace{1}=\htmlonly <h4><code><span style=\"font-style: italic;\">Namespace: </span><span style=\"font-style: bold;\"><font color=31363b><big>\1</big></font></span></code></h4> \endhtmlonly" \
                          "doc_header{1}=\htmlonly <h3><span style=\"text-decoration: underline;\"><span  style=\"font-style: italic;\"><span style=\"color: rgb(102, 102, 102);\">\1</span></span></span></h3> \endhtmlonly" \
                          "python_v12=\xrefitem python_v12 \"v12 Python API changes\" \"\"" \
                          "python_v13=\xrefitem python_v13 \"v13 Python API changes\" \"\"" \
@@ -320,6 +322,15 @@ EXTENSION_MAPPING      =
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -370,6 +381,13 @@ IDL_PROPERTY_SUPPORT   = YES
 
 DISTRIBUTE_GROUP_DOC   = YES
 
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
 # Set the SUBGROUPING tag to YES to allow class member groups of the same type
 # (for instance a group of public functions) to be put as a subgroup of that
 # type (e.g. under the Public Functions section). Set it to NO to prevent
@@ -398,7 +416,7 @@ INLINE_GROUPED_CLASSES = NO
 # Man pages) or section (for LaTeX and RTF).
 # The default value is: NO.
 
-INLINE_SIMPLE_STRUCTS  = NO
+INLINE_SIMPLE_STRUCTS  = YES
 
 # When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
 # enum is documented as struct, union, or enum with the name of the typedef. So
@@ -759,6 +777,12 @@ WARN_IF_DOC_ERROR      = YES
 
 WARN_NO_PARAMDOC       = NO
 
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
@@ -782,7 +806,7 @@ WARN_LOGFILE           =
 # The INPUT tag is used to specify the files and/or directories that contain
 # documented source files. You may enter file names like myfile.cpp or
 # directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = main.txt \
@@ -791,6 +815,7 @@ INPUT                  = main.txt \
                          ../../../../CODING_GUIDELINES.dox \
                          ../../../GUIInfoManager.cpp \
                          Modules/modules_general.dox \
+                         Modules/modules_cpp.dox \
                          Modules/modules_python.dox \
                          Skin/skin.dox \
                          ../../../guilib/GUIRenderingControl.dox \
@@ -863,7 +888,8 @@ INPUT                  = main.txt \
                          ../../../interfaces/legacy/wsgi/WsgiInputStream.h \
                          ../../../interfaces/legacy/wsgi/WsgiResponseBody.h \
                          ../../../interfaces/legacy/wsgi/WsgiResponse.h \
-                         ../../../pictures/PictureInfoTag.cpp
+                         ../../../pictures/PictureInfoTag.cpp \
+                         ../include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -876,12 +902,17 @@ INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
 
 FILE_PATTERNS          = *.c \
                          *.cc \
@@ -1009,6 +1040,10 @@ IMAGE_PATH             = .
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 INPUT_FILTER           = 
 
@@ -1018,6 +1053,10 @@ INPUT_FILTER           =
 # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 FILTER_PATTERNS        = 
 
@@ -1135,7 +1174,7 @@ VERBATIM_HEADERS       = YES
 # rich C++ code for which doxygen's built-in parser lacks the necessary type
 # information.
 # Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
+# generated with the -Duse-libclang=ON option for CMake.
 # The default value is: NO.
 
 CLANG_ASSISTED_PARSING = NO
@@ -1321,7 +1360,7 @@ HTML_DYNAMIC_SECTIONS  = NO
 # Minimum value: 0, maximum value: 9999, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_INDEX_NUM_ENTRIES = 100
+HTML_INDEX_NUM_ENTRIES = 30
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
@@ -1572,7 +1611,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
@@ -1771,9 +1810,12 @@ COMPACT_LATEX          = NO
 PAPER_TYPE             = a4
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1876,6 +1918,14 @@ LATEX_SOURCE_CODE      = NO
 
 LATEX_BIB_STYLE        = plain
 
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -2375,7 +2425,8 @@ INCLUDED_BY_GRAPH      = YES
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2386,7 +2437,8 @@ CALL_GRAPH             = NO
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2409,13 +2461,17 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
 # Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
 # png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2466,6 +2522,11 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      = 
 
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      = 
+
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-cpp.png b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-cpp.png
new file mode 100644
index 0000000..870065e
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-cpp.png
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-python.png b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-python.png
index 26867b0..179a2ae 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-python.png
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/logo-python.png
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_cpp.dox b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_cpp.dox
new file mode 100644
index 0000000..fcb21c0
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_cpp.dox
@@ -0,0 +1,85 @@
+/*!
+
+\defgroup cpp C++
+\image html logo-cpp.png
+\brief \htmlonly
+      <h3><span  style="text-decoration: underline;"><span  style="font-style: italic;"><span
+               style="color: rgb(102, 102, 102);">C++ Binary Add-On Development</span></span></span></h3>
+       \endhtmlonly
+*/
+/*!
+\defgroup cpp_kodi Interface - kodi
+\ingroup cpp
+\brief **General addon interface functions**
+*/
+  /*!
+  \defgroup cpp_kodi_Defs Definitions, structures and enumerators
+  \ingroup cpp_kodi
+  @brief **General definition values**
+  */
+/*!
+\defgroup cpp_kodi_addon Interface - kodi::addon
+\ingroup cpp
+\brief **Addon type interface functions and classes**
+*/
+  /*!
+  \defgroup cpp_kodi_addon_addonbase class CAddonBase
+  \ingroup cpp_kodi_addon
+  */
+  /*!
+  \defgroup cpp_kodi_addon_instances Addon type instances
+  \ingroup cpp_kodi_addon
+  */
+    /*!
+    \defgroup cpp_kodi_addon_audiodsp Audio DSP
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_audiodecoder Audio Decoder
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_audioencoder Audio Encoder
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_game Game
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_imagedecoder Image Decoder
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_inputstream Inputstream
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_peripheral Peripheral
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_pvr PVR
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_screensaver Screensaver
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_vfs VFS
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_videocodec Video Codec
+    \ingroup cpp_kodi_addon_instances
+    */
+    /*!
+    \defgroup cpp_kodi_addon_visualization Visualization
+    \ingroup cpp_kodi_addon_instances
+    */
+/*!
+\defgroup cpp_kodi_gui Interface - kodi::gui
+\ingroup cpp
+\brief **Graphical functions for Windows and Dialogs to show**
+*/
diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/kodi-dev.png b/xbmc/addons/kodi-addon-dev-kit/doxygen/kodi-dev.png
index e513ef2..315a13b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/doxygen/kodi-dev.png
+++ b/xbmc/addons/kodi-addon-dev-kit/doxygen/kodi-dev.png
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/NOTE b/xbmc/addons/kodi-addon-dev-kit/include/NOTE
index c375cd8..41a7b47 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/NOTE
+++ b/xbmc/addons/kodi-addon-dev-kit/include/NOTE
@@ -10,6 +10,3 @@ change.
 
 The current PVR API version can be found in xbmc_pvr_types.h:
 XBMC_PVR_API_VERSION
-
-The current audio DSP API version can be found in kodi_adsp_types.h:
-KODI_AE_DSP_API_VERSION
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 fdf030b..07fd8ce 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/AddonBase.h
@@ -82,9 +82,6 @@ typedef enum ADDON_STATUS
   ///
   ADDON_STATUS_UNKNOWN,
 
-  ///
-  ADDON_STATUS_NEED_SAVEDSETTINGS,
-
   /// permanent failure, like failing to resolve methods
   ADDON_STATUS_PERMANENT_FAILURE,
 
@@ -159,8 +156,16 @@ typedef struct AddonToKodiFuncTable_Addon
   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)(void* kodiBase, const char* settingName, void *settingValue);
-  bool (*set_setting)(void* kodiBase, const char* settingName, const char* settingValue);
+
+  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;
@@ -432,8 +437,8 @@ namespace kodi {
 ///
 inline bool CheckSettingString(const std::string& settingName, std::string& settingValue)
 {
-  char * buffer = nullptr;
-  bool ret = ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &buffer);
+  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);
   if (buffer)
   {
     if (ret)
@@ -462,7 +467,7 @@ namespace kodi {
 ///
 inline void SetSettingString(const std::string& settingName, const std::string& settingValue)
 {
-  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue.c_str());
+  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting_string(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue.c_str());
 }
 } /* namespace kodi */
 //----------------------------------------------------------------------------
@@ -472,7 +477,7 @@ namespace kodi {
 ///
 inline bool CheckSettingInt(const std::string& settingName, int& settingValue)
 {
-  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting_int(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
 }
 } /* namespace kodi */
 //----------------------------------------------------------------------------
@@ -494,9 +499,7 @@ namespace kodi {
 ///
 inline void SetSettingInt(const std::string& settingName, int settingValue)
 {
-  char buffer[33];
-  snprintf(buffer, sizeof(buffer), "%i", settingValue);
-  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), buffer);
+  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting_int(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue);
 }
 } /* namespace kodi */
 //----------------------------------------------------------------------------
@@ -506,7 +509,7 @@ namespace kodi {
 ///
 inline bool CheckSettingBoolean(const std::string& settingName, bool& settingValue)
 {
-  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting_bool(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
 }
 } /* namespace kodi */
 //----------------------------------------------------------------------------
@@ -528,7 +531,7 @@ namespace kodi {
 ///
 inline void SetSettingBoolean(const std::string& settingName, bool settingValue)
 {
-  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue ? "true" : "false");
+  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting_bool(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue);
 }
 } /* namespace kodi */
 //----------------------------------------------------------------------------
@@ -538,7 +541,7 @@ namespace kodi {
 ///
 inline bool CheckSettingFloat(const std::string& settingName, float& settingValue)
 {
-  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
+  return ::kodi::addon::CAddonBase::m_interface->toKodi->get_setting_float(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), &settingValue);
 }
 } /* namespace kodi */
 //----------------------------------------------------------------------------
@@ -560,9 +563,7 @@ namespace kodi {
 ///
 inline void SetSettingFloat(const std::string& settingName, float settingValue)
 {
-  char buffer[50];
-  snprintf(buffer, sizeof(buffer), "%f", settingValue);
-  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), buffer);
+  ::kodi::addon::CAddonBase::m_interface->toKodi->set_setting_float(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, settingName.c_str(), settingValue);
 }
 } /* namespace kodi */
 //----------------------------------------------------------------------------
@@ -584,8 +585,6 @@ inline std::string TranslateAddonStatus(ADDON_STATUS status)
       return "Need Settings";
     case ADDON_STATUS_UNKNOWN:
       return "Unknown error";
-    case ADDON_STATUS_NEED_SAVEDSETTINGS:
-      return "Need saved settings";
     case ADDON_STATUS_PERMANENT_FAILURE:
       return "Permanent failure";
     case ADDON_STATUS_NOT_IMPLEMENTED:
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 3222e8b..76210cf 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
@@ -119,14 +119,26 @@ extern "C"
 } /* extern "C" */
 
 //==============================================================================
-/// \defgroup cpp_kodi_vfs_CFile_Defs Definitions, structures and enumerators
-/// \ingroup cpp_kodi_vfs_CFile
+///
+/// \defgroup cpp_kodi_vfs  Interface - kodi::vfs
+/// \ingroup cpp
+/// @brief **Virtual filesystem functions**
+///
+///
+/// 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**
 //------------------------------------------------------------------------------
 
 //==============================================================================
 ///
-/// @ingroup cpp_kodi_vfs_CFile_Defs
+/// @ingroup cpp_kodi_vfs_Defs
 /// Flags to define way how file becomes opened with kodi::vfs::CFile::OpenFile()
 ///
 /// The values can be used together, e.g. <b>`file.Open("myfile", READ_TRUNCATED | READ_CHUNKED);`</b>
@@ -166,7 +178,7 @@ typedef enum OpenFileFlags
 //------------------------------------------------------------------------------
 
 //==============================================================================
-/// \ingroup cpp_kodi_vfs_CFile_Defs
+/// \ingroup cpp_kodi_vfs_Defs
 /// @brief Used CURL message types
 ///
 typedef enum CURLOptiontype
@@ -184,8 +196,11 @@ typedef enum CURLOptiontype
 
 //============================================================================
 ///
-/// \ingroup cpp_kodi_vfs_CFile_Defs
-/// @brief Information about a file
+/// \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:
 ///
 struct STAT_STRUCTURE
 {
@@ -785,7 +800,7 @@ namespace vfs
 
   //============================================================================
   ///
-  /// \ingroup cpp_kodi
+  /// @ingroup cpp_kodi_vfs
   /// @brief Returns the translated path
   ///
   /// @param[in] source  string or unicode - Path to format
@@ -929,7 +944,7 @@ namespace vfs
   /// fprintf(stderr, "Log file should be always present, is it present? %s\n", exists ? "yes" : "no");
   /// ~~~~~~~~~~~~~
   ///
-  static inline bool FileExists(const std::string& filename, bool usecache = false)
+  inline bool FileExists(const std::string& filename, bool usecache = false)
   {
     return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->file_exists(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), usecache);
   }
@@ -980,7 +995,7 @@ namespace vfs
   ///                      ret);
   /// ~~~~~~~~~~~~~
   ///
-  static inline bool StatFile(const std::string& filename, STAT_STRUCTURE& buffer)
+  inline bool StatFile(const std::string& filename, STAT_STRUCTURE& buffer)
   {
     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))
@@ -1045,7 +1060,7 @@ namespace vfs
   /// }
   /// ~~~~~~~~~~~~~
   ///
-  static inline bool DeleteFile(const std::string& filename)
+  inline bool DeleteFile(const std::string& filename)
   {
     return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->delete_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str());
   }
@@ -1061,7 +1076,7 @@ namespace vfs
   /// @return                   true if successfully renamed
   ///
   ///
-  static inline bool RenameFile(const std::string& filename, const std::string& newFileName)
+  inline bool RenameFile(const std::string& filename, const std::string& newFileName)
   {
     return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->rename_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), newFileName.c_str());
   }
@@ -1077,7 +1092,7 @@ namespace vfs
   /// @return                   true if successfully copied
   ///
   ///
-  static inline bool CopyFile(const std::string& filename, const std::string& destination)
+  inline bool CopyFile(const std::string& filename, const std::string& destination)
   {
     return ::kodi::addon::CAddonBase::m_interface->toKodi->kodi_filesystem->copy_file(::kodi::addon::CAddonBase::m_interface->toKodi->kodiBase, filename.c_str(), destination.c_str());
   }
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 50718af..f4295ea 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/General.h
@@ -34,11 +34,18 @@
  */
 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 dwCode);
   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);
 } AddonToKodiFuncTable_kodi;
 
 //==============================================================================
@@ -62,6 +69,8 @@ typedef enum 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
@@ -73,6 +82,71 @@ typedef enum LangFormats
 } LangFormats;
 //------------------------------------------------------------------------------
 
+//==============================================================================
+/// \ingroup cpp_kodi_Defs
+/// @brief For kodi::Version used structure
+///
+typedef struct kodi_version_t
+{
+  /// Application name, normally 'Kodi'
+  std::string compile_name;
+  /// Major code version of Kodi
+  int major;
+  /// Minor code version of Kodi
+  int minor;
+  /// The Revision contains a id and the build date, e.g. 20170706-c6b22fe217-dirty
+  std::string revision;
+  /// The version canditate e.g. alpha, beta or release
+  std::string tag;
+  /// The revision of tag before
+  std::string tag_revision;
+} kodi_version_t;
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Returns the value of an addon property as a string
+///
+/// @param[in] id id of the property that the module needs to access
+/// |              | Choices are  |              |
+/// |:------------:|:------------:|:------------:|
+/// |  author      | icon         | stars        |
+/// |  changelog   | id           | summary      |
+/// |  description | name         | type         |
+/// |  disclaimer  | path         | version      |
+/// |  fanart      | profile      |              |
+///
+/// @return AddOn property as a string
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// std::string addonName = kodi::GetAddonInfo("name");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline std::string GetAddonInfo(const std::string& id)
+{
+  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+
+  std::string strReturn;
+  char* strMsg = toKodi->kodi->get_addon_info(toKodi->kodiBase, id.c_str());
+  if (strMsg != nullptr)
+  {
+    if (std::strlen(strMsg))
+      strReturn = strMsg;
+    toKodi->free_string(toKodi->kodiBase, strMsg);
+  }
+  return strReturn;
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
 
 //==============================================================================
 namespace kodi {
@@ -374,3 +448,251 @@ inline void QueueNotification(QueueMsg type, const std::string& header,
 }
 } /* namespace kodi */
 //------------------------------------------------------------------------------
+
+//============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Get the MD5 digest of the given text
+///
+/// @param[in]  text  text to compute the MD5 for
+/// @return           Returned MD5 digest
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// std::string md5 = kodi::GetMD5("Make me as md5");
+/// fprintf(stderr, "My md5 digest is: '%s'\n", md5.c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline std::string 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);
+  std::string md5 = md5ret;
+  free(md5ret);
+  return md5;
+}
+} /* namespace kodi */
+//----------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief To get a temporary path for the addon
+///
+/// This gives a temporary path which the addon can use individually for its things.
+///
+/// The content of this folder will be deleted when Kodi is finished!
+///
+/// @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 = "")
+{
+  char* str = ::kodi::addon::CAddonBase::m_interface->toKodi->kodi->get_temp_path(::kodi::addon::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);
+  if (!append.empty())
+  {
+    if (append.at(0) != '\\' &&
+        append.at(0) != '/')
+#ifdef TARGET_WINDOWS
+      ret.append("\\");
+#else
+      ret.append("/");
+#endif
+    ret.append(append);
+  }
+  return ret;
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \ingroup cpp_kodi
+/// @brief Returns your regions setting as a string for the specified id
+///
+/// @param[in] id id of setting to return
+/// |              | Choices are  |              |
+/// |:------------:|:------------:|:------------:|
+/// |  dateshort   | time         | tempunit     |
+/// |  datelong    | meridiem     | speedunit    |
+///
+/// @return settings string
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// std::string timeFormat = kodi::GetRegion("time");
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline std::string GetRegion(const std::string& id)
+{
+  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+
+  std::string strReturn;
+  char* strMsg = toKodi->kodi->get_region(toKodi->kodiBase, id.c_str());
+  if (strMsg != nullptr)
+  {
+    if (std::strlen(strMsg))
+      strReturn = strMsg;
+    toKodi->free_string(toKodi->kodiBase, strMsg);
+  }
+  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
+///
+/// @param[out] free free memory
+/// @param[out] total total memory
+/// @param[in] asBytes [opt] if set to true becomes returned as bytes, otherwise
+///                    as mega bytes
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// long freeMem;
+/// long totalMem;
+/// kodi::GetFreeMem(freeMem, totalMem);
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline void GetFreeMem(long& free, long& total, bool asBytes = false)
+{
+  free = -1;
+  total = -1;
+  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::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
+///
+/// @return idle time
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// int time = kodi::GetGlobalIdleTime();
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline int GetGlobalIdleTime()
+{
+  AddonToKodiFuncTable_Addon* toKodi = ::kodi::addon::CAddonBase::m_interface->toKodi;
+  return toKodi->kodi->get_global_idle_time(toKodi->kodiBase);
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
+
+//==============================================================================
+namespace kodi {
+///
+/// \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>
+/// is e.g.:
+/// ~~~~~~~~~~~~~{.cpp}
+/// version.compile_name = Kodi
+/// version.major        = 18
+/// version.minor        = 0
+/// version.revision     = 20170706-c6b22fe217-di
+/// version.tag          = alpha
+/// version.tag_revision = 1
+/// ~~~~~~~~~~~~~
+///
+/// @param[out] version structure to store data from kodi
+///
+///
+/// ------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+/// #include <kodi/General.h>
+/// ...
+/// kodi_version_t version;
+/// kodi::KodiVersion(version);
+/// fprintf(stderr,
+///     "kodi_version_t version;\n"
+///     "kodi::KodiVersion(version);\n"
+///     " - version.compile_name = %s\n"
+///     " - version.major        = %i\n"
+///     " - version.minor        = %i\n"
+///     " - version.revision     = %s\n"
+///     " - version.tag          = %s\n"
+///     " - version.tag_revision = %s\n",
+///             version.compile_name.c_str(), version.major, version.minor,
+///             version.revision.c_str(), version.tag.c_str(), version.tag_revision.c_str());
+/// ...
+/// ~~~~~~~~~~~~~
+///
+inline void KodiVersion(kodi_version_t& version)
+{
+  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);
+  if (compile_name != nullptr)
+  {
+    version.compile_name  = compile_name;
+    toKodi->free_string
+    (
+      toKodi->kodiBase,
+      compile_name
+    );
+  }
+  if (revision != nullptr)
+  {
+    version.revision = revision;
+    toKodi->free_string(toKodi->kodiBase, revision);
+  }
+  if (tag != nullptr)
+  {
+    version.tag = tag;
+    toKodi->free_string(toKodi->kodiBase, tag);
+  }
+  if (tag_revision != nullptr)
+  {
+    version.tag_revision = tag_revision;
+    toKodi->free_string(toKodi->kodiBase, tag_revision);
+  }
+}
+} /* namespace kodi */
+//------------------------------------------------------------------------------
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h
new file mode 100644
index 0000000..85de3ec
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCodec.h
@@ -0,0 +1,33 @@
+#pragma once
+/*
+ *      Copyright (C) 2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+enum STREAMCODEC_PROFILE
+{
+  CodecProfileUnknown = 0,
+  CodecProfileNotNeeded,
+  H264CodecProfileBaseline,
+  H264CodecProfileMain,
+  H264CodecProfileExtended,
+  H264CodecProfileHigh,
+  H264CodecProfileHigh10,
+  H264CodecProfileHigh422,
+  H264CodecProfileHigh444Predictive
+};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h
new file mode 100644
index 0000000..f802f3b
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/StreamCrypto.h
@@ -0,0 +1,37 @@
+#pragma once
+/*
+ *      Copyright (C) 2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+typedef struct CRYPTO_INFO
+{
+  enum CRYPTO_KEY_SYSTEM : uint8_t
+  {
+    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;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDSP.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDSP.h
new file mode 100644
index 0000000..c508f80
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDSP.h
@@ -0,0 +1,1288 @@
+#pragma once
+
+/*
+ *      Copyright (C) 2005-2015 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+
+#define AE_DSP_STREAM_MAX_STREAMS               8
+#define AE_DSP_STREAM_MAX_MODES                 32
+
+/*!
+ * @file Addon.h
+ * @section sec1 Basic audio dsp addon interface description
+ * @author Team Kodi
+ * @date 10. May 2014
+ * @version 0.1.5
+ *
+ * @subsection sec1_1 General
+ * @li The basic support on the addon is supplied with the
+ * AE_DSP_ADDON_CAPABILITIES data which becomes asked over
+ * GetCapabilities(...), further the addon must register his available
+ * modes on startup with the RegisterMode(...) callback function.
+ * If one of this two points is not set the addon becomes
+ * ignored for the chain step.
+ *
+ * @subsection sec1_2 Processing
+ * @li On start of new stream the addon becomes called with StreamCreate(...)
+ * to check about given values that it support it basically and can create
+ * his structure, if nothing is supported it can return AE_DSP_ERROR_IGNORE_ME.
+ *
+ * @li As next step StreamIsModeSupported(...) becomes called for every
+ * available and enabled modes, is separated due to more as one available mode
+ * on the addon is possible, if the mode is not supported it can also be return
+ * AE_DSP_ERROR_IGNORE_ME.
+ *   - If mode is a resample mode and returns no error it becomes asked with
+ *     InputResampleSampleRate(...) or OutputResampleSampleRate(...) (relevant
+ *     to his type) about his given sample rate.
+ *   - About the from user selected master processing mode the related addon
+ *     becomes called now with MasterProcessSetMode(...) to handle it's
+ *     selectionon the addon given by the own addon type identifier or by
+ *     KODI's useddatabase id, also the currently used stream type (e.g.
+ *     Music or Video) is send.
+ *     - If the addon supports only one master mode it can ignore this function
+ *       and return always AE_DSP_ERROR_NO_ERROR.
+ *     - If the master mode is set the addon becomes asked about the from him
+ *       given output channel layout related to up- or downmix modes, if
+ *       nothing becomes changed on the layout it can return -1.
+ *     - The MasterProcessSetMode(...) is also called if from user a another
+ *       mode becomes selected.
+ *
+ * @li Then as last step shortly before the first process call becomes executed
+ * the addon is called one time with StreamInitialize(...) to inform that
+ * processing is started on the given settings.
+ *   - This function becomes also called on all add-ons if the master process
+ *     becomes changed.
+ *   - Also every process after StreamInitialize on the addon mode becomes asked
+ *     with _..._ProcessNeededSamplesize(...) about required memory size for the
+ *     output of his data, if no other size is required it can return 0.
+ *
+ * @li From now the processing becomes handled for the different steps with
+ * _..._Process(...).
+ *   - Further it becomes asked with _..._GetDelay(...) about his processing
+ *     time as float value in seconds, needed for video and audio alignment.
+ *
+ * @li On the end of the processing if the source becomes stopped the
+ * StreamDestroy(...) function becomes called on all active processing add-ons.
+ *
+ * @note
+ * The StreamCreate(...) can be becomes called for a new stream before the
+ * previous was closed with StreamDestroy(...) ! To have a speed improve.
+ */
+
+namespace kodi { namespace addon { class CInstanceAudioDSP; }}
+
+extern "C" {
+
+  typedef void* ADSPHANDLE;
+
+  typedef unsigned int AE_DSP_STREAM_ID;
+
+  /*!
+   * @brief Audio DSP add-on error codes
+   */
+  typedef enum
+  {
+    AE_DSP_ERROR_NO_ERROR             = 0,      /*!< @brief no error occurred */
+    AE_DSP_ERROR_UNKNOWN              = -1,     /*!< @brief an unknown error occurred */
+    AE_DSP_ERROR_IGNORE_ME            = -2,     /*!< @brief the used input stream can not processed and add-on want to ignore */
+    AE_DSP_ERROR_NOT_IMPLEMENTED      = -3,     /*!< @brief the method that KODI called is not implemented by the add-on */
+    AE_DSP_ERROR_REJECTED             = -4,     /*!< @brief the command was rejected by the DSP */
+    AE_DSP_ERROR_INVALID_PARAMETERS   = -5,     /*!< @brief the parameters of the method that was called are invalid for this operation */
+    AE_DSP_ERROR_INVALID_SAMPLERATE   = -6,     /*!< @brief the processed samplerate is not supported */
+    AE_DSP_ERROR_INVALID_IN_CHANNELS  = -7,     /*!< @brief the processed input channel format is not supported */
+    AE_DSP_ERROR_INVALID_OUT_CHANNELS = -8,     /*!< @brief the processed output channel format is not supported */
+    AE_DSP_ERROR_FAILED               = -9,     /*!< @brief the command failed */
+  } AE_DSP_ERROR;
+
+  /*!
+   * @brief The possible DSP channels (used as pointer inside arrays)
+   */
+  typedef enum
+  {
+    AE_DSP_CH_INVALID = -1,
+    AE_DSP_CH_FL = 0,
+    AE_DSP_CH_FR,
+    AE_DSP_CH_FC,
+    AE_DSP_CH_LFE,
+    AE_DSP_CH_BL,
+    AE_DSP_CH_BR,
+    AE_DSP_CH_FLOC,
+    AE_DSP_CH_FROC,
+    AE_DSP_CH_BC,
+    AE_DSP_CH_SL,
+    AE_DSP_CH_SR,
+    AE_DSP_CH_TFL,
+    AE_DSP_CH_TFR,
+    AE_DSP_CH_TFC,
+    AE_DSP_CH_TC,
+    AE_DSP_CH_TBL,
+    AE_DSP_CH_TBR,
+    AE_DSP_CH_TBC,
+    AE_DSP_CH_BLOC,
+    AE_DSP_CH_BROC,
+
+    AE_DSP_CH_MAX
+  } AE_DSP_CHANNEL;
+
+  /*!
+   * @brief Present channel flags
+   */
+  typedef enum
+  {
+    AE_DSP_PRSNT_CH_UNDEFINED = 0,
+    AE_DSP_PRSNT_CH_FL        = 1<<AE_DSP_CH_FL,
+    AE_DSP_PRSNT_CH_FR        = 1<<AE_DSP_CH_FR,
+    AE_DSP_PRSNT_CH_FC        = 1<<AE_DSP_CH_FC,
+    AE_DSP_PRSNT_CH_LFE       = 1<<AE_DSP_CH_LFE,
+    AE_DSP_PRSNT_CH_BL        = 1<<AE_DSP_CH_BL,
+    AE_DSP_PRSNT_CH_BR        = 1<<AE_DSP_CH_BR,
+    AE_DSP_PRSNT_CH_FLOC      = 1<<AE_DSP_CH_FLOC,
+    AE_DSP_PRSNT_CH_FROC      = 1<<AE_DSP_CH_FROC,
+    AE_DSP_PRSNT_CH_BC        = 1<<AE_DSP_CH_BC,
+    AE_DSP_PRSNT_CH_SL        = 1<<AE_DSP_CH_SL,
+    AE_DSP_PRSNT_CH_SR        = 1<<AE_DSP_CH_SR,
+    AE_DSP_PRSNT_CH_TFL       = 1<<AE_DSP_CH_TFL,
+    AE_DSP_PRSNT_CH_TFR       = 1<<AE_DSP_CH_TFR,
+    AE_DSP_PRSNT_CH_TFC       = 1<<AE_DSP_CH_TFC,
+    AE_DSP_PRSNT_CH_TC        = 1<<AE_DSP_CH_TC,
+    AE_DSP_PRSNT_CH_TBL       = 1<<AE_DSP_CH_TBL,
+    AE_DSP_PRSNT_CH_TBR       = 1<<AE_DSP_CH_TBR,
+    AE_DSP_PRSNT_CH_TBC       = 1<<AE_DSP_CH_TBC,
+    AE_DSP_PRSNT_CH_BLOC      = 1<<AE_DSP_CH_BLOC,
+    AE_DSP_PRSNT_CH_BROC      = 1<<AE_DSP_CH_BROC
+  } AE_DSP_CHANNEL_PRESENT;
+
+  /**
+   * @brief The various stream type formats
+   * Used for audio DSP processing to know input audio type
+   */
+  typedef enum
+  {
+    AE_DSP_ASTREAM_INVALID = -1,
+    AE_DSP_ASTREAM_BASIC = 0,
+    AE_DSP_ASTREAM_MUSIC,
+    AE_DSP_ASTREAM_MOVIE,
+    AE_DSP_ASTREAM_GAME,
+    AE_DSP_ASTREAM_APP,
+    AE_DSP_ASTREAM_PHONE,
+    AE_DSP_ASTREAM_MESSAGE,
+
+    AE_DSP_ASTREAM_AUTO,
+    AE_DSP_ASTREAM_MAX
+  } AE_DSP_STREAMTYPE;
+
+  /*!
+   * @brief Add-ons supported audio stream type flags
+   * used on master mode information on AE_DSP_MODES to know
+   * on which audio stream the master mode is supported
+   */
+  typedef enum
+  {
+    AE_DSP_PRSNT_ASTREAM_BASIC    = 1<<AE_DSP_ASTREAM_BASIC,
+    AE_DSP_PRSNT_ASTREAM_MUSIC    = 1<<AE_DSP_ASTREAM_MUSIC,
+    AE_DSP_PRSNT_ASTREAM_MOVIE    = 1<<AE_DSP_ASTREAM_MOVIE,
+    AE_DSP_PRSNT_ASTREAM_GAME     = 1<<AE_DSP_ASTREAM_GAME,
+    AE_DSP_PRSNT_ASTREAM_APP      = 1<<AE_DSP_ASTREAM_APP,
+    AE_DSP_PRSNT_ASTREAM_PHONE    = 1<<AE_DSP_ASTREAM_PHONE,
+    AE_DSP_PRSNT_ASTREAM_MESSAGE  = 1<<AE_DSP_ASTREAM_MESSAGE,
+  } AE_DSP_ASTREAM_PRESENT;
+
+  /**
+   * @brief The various base type formats
+   * Used for audio DSP processing to know input audio source
+   */
+  typedef enum
+  {
+    AE_DSP_ABASE_INVALID = -1,
+    AE_DSP_ABASE_STEREO = 0,
+    AE_DSP_ABASE_MONO,
+    AE_DSP_ABASE_MULTICHANNEL,
+    AE_DSP_ABASE_AC3,
+    AE_DSP_ABASE_EAC3,
+    AE_DSP_ABASE_DTS,
+    AE_DSP_ABASE_DTSHD_MA,
+    AE_DSP_ABASE_DTSHD_HRA,
+    AE_DSP_ABASE_TRUEHD,
+    AE_DSP_ABASE_MLP,
+    AE_DSP_ABASE_FLAC,
+
+    AE_DSP_ABASE_MAX
+  } AE_DSP_BASETYPE;
+
+
+  /**
+   * @brief The from KODI in settings requested audio process quality.
+   * The KODI internal used quality levels is translated to this values
+   * for usage on DSP processing add-ons. Is present on iQualityLevel
+   * inside AE_DSP_SETTINGS.
+   */
+  typedef enum
+  {
+    AE_DSP_QUALITY_UNKNOWN    = -1,             /*!< @brief  Unset, unknown or incorrect quality level */
+    AE_DSP_QUALITY_DEFAULT    =  0,             /*!< @brief  Engine's default quality level */
+
+    /* Basic quality levels */
+    AE_DSP_QUALITY_LOW        = 20,             /*!< @brief  Low quality level */
+    AE_DSP_QUALITY_MID        = 30,             /*!< @brief  Standard quality level */
+    AE_DSP_QUALITY_HIGH       = 50,             /*!< @brief  Best sound processing quality */
+
+    /* Optional quality levels */
+    AE_DSP_QUALITY_REALLYHIGH = 100             /*!< @brief  Uncompromising optional quality level, usually with unmeasurable and unnoticeable improvement */
+  } AE_DSP_QUALITY;
+
+  /*!
+   * @brief Audio DSP menu hook categories.
+   * Used to identify on AE_DSP_MENUHOOK given add-on related skin dialog/windows.
+   * Except AE_DSP_MENUHOOK_ALL and AE_DSP_MENUHOOK_SETTING are the menus available
+   * from DSP playback dialogue which can be opened over KODI file context menu and over
+   * button on full screen OSD window.
+   *
+   * Menu hook AE_DSP_MENUHOOK_SETTING is available from DSP processing setup dialogue.
+   */
+  typedef enum
+  {
+    AE_DSP_MENUHOOK_UNKNOWN         =-1,        /*!< @brief unknown menu hook */
+    AE_DSP_MENUHOOK_ALL             = 0,        /*!< @brief all categories */
+    AE_DSP_MENUHOOK_PRE_PROCESS     = 1,        /*!< @brief for pre processing */
+    AE_DSP_MENUHOOK_MASTER_PROCESS  = 2,        /*!< @brief for master processing */
+    AE_DSP_MENUHOOK_POST_PROCESS    = 3,        /*!< @brief for post processing */
+    AE_DSP_MENUHOOK_RESAMPLE        = 4,        /*!< @brief for re sample */
+    AE_DSP_MENUHOOK_MISCELLANEOUS   = 5,        /*!< @brief for miscellaneous dialogues */
+    AE_DSP_MENUHOOK_INFORMATION     = 6,        /*!< @brief dialogue to show processing information */
+    AE_DSP_MENUHOOK_SETTING         = 7,        /*!< @brief for settings */
+  } AE_DSP_MENUHOOK_CAT;
+
+  /*!
+   * @brief Menu hooks that are available in the menus while playing a stream via this add-on.
+   */
+  typedef struct AE_DSP_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 */
+    AE_DSP_MENUHOOK_CAT category;               /*!< @brief (required) category of menu hook */
+    unsigned int        iRelevantModeId;        /*!< @brief (required) except category AE_DSP_MENUHOOK_SETTING and AE_DSP_MENUHOOK_ALL must be the related mode id present here */
+    bool                bNeedPlayback;          /*!< @brief (required) set to true if menu hook need playback and active processing */
+  } ATTRIBUTE_PACKED AE_DSP_MENUHOOK;
+
+  /*!
+   * @brief Audio DSP add-on capabilities. All capabilities are set to "false" as default.
+   * If a capability is set to true, then the corresponding methods from kodi_audiodsp_dll.h need to be implemented.
+   */
+  typedef struct AE_DSP_ADDON_CAPABILITIES
+  {
+    bool bSupportsInputProcess;                 /*!< @brief true if this add-on provides audio input processing */
+    bool bSupportsInputResample;                /*!< @brief true if this add-on provides audio resample before master handling */
+    bool bSupportsPreProcess;                   /*!< @brief true if this add-on provides audio pre processing */
+    bool bSupportsMasterProcess;                /*!< @brief true if this add-on provides audio master processing */
+    bool bSupportsPostProcess;                  /*!< @brief true if this add-on provides audio post processing */
+    bool bSupportsOutputResample;               /*!< @brief true if this add-on provides audio re sample after master handling */
+  } ATTRIBUTE_PACKED AE_DSP_ADDON_CAPABILITIES;
+
+  /*!
+   * @brief Audio processing settings for in and out arrays
+   * Send on creation and before first processed audio packet to add-on
+   */
+  typedef struct AE_DSP_SETTINGS
+  {
+    AE_DSP_STREAM_ID  iStreamID;                /*!< @brief id of the audio stream packets */
+    AE_DSP_STREAMTYPE iStreamType;              /*!< @brief the input stream type source eg, Movie or Music */
+    int               iInChannels;              /*!< @brief the amount of input channels */
+    unsigned long     lInChannelPresentFlags;   /*!< @brief the exact channel mapping flags of input */
+    int               iInFrames;                /*!< @brief the input frame size from KODI */
+    unsigned int      iInSamplerate;            /*!< @brief the basic sample rate of the audio packet */
+    int               iProcessFrames;           /*!< @brief the processing frame size inside add-on's */
+    unsigned int      iProcessSamplerate;       /*!< @brief the sample rate after input resample present in master processing */
+    int               iOutChannels;             /*!< @brief the amount of output channels */
+    unsigned long     lOutChannelPresentFlags;  /*!< @brief the exact channel mapping flags for output */
+    int               iOutFrames;               /*!< @brief the final out frame size for KODI */
+    unsigned int      iOutSamplerate;           /*!< @brief the final sample rate of the audio packet */
+    bool              bInputResamplingActive;   /*!< @brief if a re-sampling is performed before master processing this flag is set to true */
+    bool              bStereoUpmix;             /*!< @brief true if the stereo upmix setting on kodi is set */
+    int               iQualityLevel;            /*!< @brief the from KODI selected quality level for signal processing */
+    /*!
+     * @note about "iProcessSamplerate" and "iProcessFrames" is set from KODI after call of StreamCreate on input re sample add-on, if re-sampling
+     * and processing is handled inside the same add-on, this value must be ignored!
+     */
+  } ATTRIBUTE_PACKED AE_DSP_SETTINGS;
+
+  /*!
+   * @brief Stream profile properties
+   * Can be used to detect best master processing mode and for post processing methods.
+   */
+//@{
+
+  /*!
+   * @brief Dolby profile types. Given from several formats, e.g. Dolby Digital or TrueHD
+   * Used on AE_DSP_PROFILE_AC3_EAC3 and AE_DSP_PROFILE_MLP_TRUEHD
+   */
+  #define AE_DSP_PROFILE_DOLBY_NONE             0
+  #define AE_DSP_PROFILE_DOLBY_SURROUND         1
+  #define AE_DSP_PROFILE_DOLBY_PLII             2
+  #define AE_DSP_PROFILE_DOLBY_PLIIX            3
+  #define AE_DSP_PROFILE_DOLBY_PLIIZ            4
+  #define AE_DSP_PROFILE_DOLBY_EX               5
+  #define AE_DSP_PROFILE_DOLBY_HEADPHONE        6
+
+  /*!
+   * @brief DTS/DTS HD profile types
+   * Used on AE_DSP_PROFILE_DTS_DTSHD
+   */
+  #define AE_DSP_PROFILE_DTS                    0
+  #define AE_DSP_PROFILE_DTS_ES                 1
+  #define AE_DSP_PROFILE_DTS_96_24              2
+  #define AE_DSP_PROFILE_DTS_HD_HRA             3
+  #define AE_DSP_PROFILE_DTS_HD_MA              4
+
+  /*!
+   * @brief AC3/EAC3 based service types
+   * Used on AE_DSP_PROFILE_AC3_EAC3
+   */
+  #define AE_DSP_SERVICE_TYPE_MAIN              0
+  #define AE_DSP_SERVICE_TYPE_EFFECTS           1
+  #define AE_DSP_SERVICE_TYPE_VISUALLY_IMPAIRED 2
+  #define AE_DSP_SERVICE_TYPE_HEARING_IMPAIRED  3
+  #define AE_DSP_SERVICE_TYPE_DIALOGUE          4
+  #define AE_DSP_SERVICE_TYPE_COMMENTARY        5
+  #define AE_DSP_SERVICE_TYPE_EMERGENCY         6
+  #define AE_DSP_SERVICE_TYPE_VOICE_OVER        7
+  #define AE_DSP_SERVICE_TYPE_KARAOKE           8
+
+  /*!
+   * @brief AC3/EAC3 based room types
+   * Present on AE_DSP_PROFILE_AC3_EAC3 and can be used for frequency corrections
+   * at post processing, e.g. THX Re-Equalization
+   */
+  #define AE_DSP_ROOM_TYPE_UNDEFINED            0
+  #define AE_DSP_ROOM_TYPE_SMALL                1
+  #define AE_DSP_ROOM_TYPE_LARGE                2
+
+  /*!
+   * @brief AC3/EAC3 stream profile properties
+   */
+  //! @todo add handling for it (currently never becomes set)
+  typedef struct AE_DSP_PROFILE_AC3_EAC3
+  {
+    unsigned int iProfile;                      /*!< defined by AE_DSP_PROFILE_DOLBY_* */
+    unsigned int iServiceType;                  /*!< defined by AE_DSP_SERVICE_TYPE_* */
+    unsigned int iRoomType;                     /*!< defined by AE_DSP_ROOM_TYPE_* (NOTICE: Information about it currently not supported from ffmpeg and must be implemented) */
+  } ATTRIBUTE_PACKED AE_DSP_PROFILE_AC3_EAC3;
+
+  /*!
+   * @brief MLP/Dolby TrueHD stream profile properties
+   */
+  //! @todo add handling for it (currently never becomes set)
+  typedef struct AE_DSP_PROFILE_MLP_TRUEHD
+  {
+    unsigned int iProfile;                      /*!< defined by AE_DSP_PROFILE_DOLBY_* */
+  } ATTRIBUTE_PACKED AE_DSP_PROFILE_MLP_TRUEHD;
+
+  /*!
+   * @brief DTS/DTS HD stream profile properties
+   */
+  //! @todo add handling for it (currently never becomes set)
+  typedef struct AE_DSP_PROFILE_DTS_DTSHD
+  {
+    unsigned int iProfile;                      /*!< defined by AE_DSP_PROFILE_DTS* */
+    bool bSurroundMatrix;                       /*!< if set to true given 2.0 stream is surround encoded */
+  } ATTRIBUTE_PACKED AE_DSP_PROFILE_DTS_DTSHD;
+
+  union AE_DSP_PROFILE
+  {
+    AE_DSP_PROFILE_AC3_EAC3   ac3_eac3;         /*!< Dolby Digital/Digital+ profile data */
+    AE_DSP_PROFILE_MLP_TRUEHD mlp_truehd;       /*!< MLP or Dolby TrueHD profile data */
+    AE_DSP_PROFILE_DTS_DTSHD  dts_dtshd;        /*!< DTS/DTS-HD profile data */
+  };
+  //@}
+
+  /*!
+   * @brief Audio DSP stream properties
+   * Used to check for the DSP add-on that the stream is supported,
+   * as example Dolby Digital Ex processing is only required on Dolby Digital with 5.1 layout
+   */
+  typedef struct AE_DSP_STREAM_PROPERTIES
+  {
+    AE_DSP_STREAM_ID  iStreamID;                  /*!< @brief stream id of the audio stream packets */
+    AE_DSP_STREAMTYPE iStreamType;                /*!< @brief the input stream type source eg, Movie or Music */
+    int               iBaseType;                  /*!< @brief the input stream base type source eg, Dolby Digital */
+    const char*       strName;                    /*!< @brief the audio stream name */
+    const char*       strCodecId;                 /*!< @brief codec id string of the audio stream */
+    const char*       strLanguage;                /*!< @brief language id of the audio stream */
+    int               iIdentifier;                /*!< @brief audio stream id inside player */
+    int               iChannels;                  /*!< @brief amount of basic channels */
+    int               iSampleRate;                /*!< @brief sample rate */
+    AE_DSP_PROFILE    Profile;                    /*!< @brief current running stream profile data */
+  } ATTRIBUTE_PACKED AE_DSP_STREAM_PROPERTIES;
+
+  /*!
+   * @brief Audio DSP mode categories
+   */
+  typedef enum
+  {
+    AE_DSP_MODE_TYPE_UNDEFINED       = -1,       /*!< @brief undefined type, never be used from add-on! */
+    AE_DSP_MODE_TYPE_INPUT_RESAMPLE  = 0,        /*!< @brief for input re sample */
+    AE_DSP_MODE_TYPE_PRE_PROCESS     = 1,        /*!< @brief for preprocessing */
+    AE_DSP_MODE_TYPE_MASTER_PROCESS  = 2,        /*!< @brief for master processing */
+    AE_DSP_MODE_TYPE_POST_PROCESS    = 3,        /*!< @brief for post processing */
+    AE_DSP_MODE_TYPE_OUTPUT_RESAMPLE = 4,        /*!< @brief for output re sample */
+    AE_DSP_MODE_TYPE_MAX             = 5
+  } AE_DSP_MODE_TYPE;
+
+  /*!
+   * @brief Audio DSP master mode information
+   * Used to get all available modes for current input stream
+   */
+  typedef struct AE_DSP_MODES
+  {
+    unsigned int iModesCount;                                             /*!< @brief (required) count of how much modes are in AE_DSP_MODES */
+    struct AE_DSP_MODE
+    {
+      int               iUniqueDBModeId;                                  /*!< @brief (required) the inside add-on used identifier for the mode, set by KODI's audio DSP database */
+      AE_DSP_MODE_TYPE  iModeType;                                        /*!< @brief (required) the processong mode type, see AE_DSP_MODE_TYPE */
+      char              strModeName[ADDON_STANDARD_STRING_LENGTH];        /*!< @brief (required) the addon name of the mode, used on KODI's logs  */
+
+      unsigned int      iModeNumber;                                      /*!< @brief (required) number of this mode on the add-on, is used on process functions with value "mode_id" */
+      unsigned int      iModeSupportTypeFlags;                            /*!< @brief (required) flags about supported input types for this mode, see AE_DSP_ASTREAM_PRESENT */
+      bool              bHasSettingsDialog;                               /*!< @brief (required) if setting dialog(s) are available it must be set to true */
+      bool              bIsDisabled;                                      /*!< @brief (optional) true if this mode is marked as disabled and not enabled default, only relevant for master processes, all other types always disabled as default */
+
+      unsigned int      iModeName;                                        /*!< @brief (required) the name id of the mode for this hook in g_localizeStrings */
+      unsigned int      iModeSetupName;                                   /*!< @brief (optional) the name id of the mode inside settings for this hook in g_localizeStrings */
+      unsigned int      iModeDescription;                                 /*!< @brief (optional) the description id of the mode for this hook in g_localizeStrings */
+      unsigned int      iModeHelp;                                        /*!< @brief (optional) help string id for inside DSP settings dialog of the mode for this hook in g_localizeStrings */
+
+      char              strOwnModeImage[ADDON_STANDARD_STRING_LENGTH];    /*!< @brief (optional) flag image for the mode */
+      char              strOverrideModeImage[ADDON_STANDARD_STRING_LENGTH];/*!< @brief (optional) image to override KODI Image for the mode, eg. Dolby Digital with Dolby Digital Ex (only used on master modes) */
+    } mode[AE_DSP_STREAM_MAX_MODES];                                      /*!< @brief Modes array storage */
+  } ATTRIBUTE_PACKED AE_DSP_MODES;
+
+  /*!
+   * @brief Audio DSP menu hook data
+   */
+  typedef struct AE_DSP_MENUHOOK_DATA
+  {
+    AE_DSP_MENUHOOK_CAT category;                                         /*!< @brief (required) related menuhook data category */
+    union data {
+      AE_DSP_STREAM_ID  iStreamId;                                        /*!< @brief currently only stream id is used, is used as union to have extension possibility */
+    } data;                                                               /*!< @brief related category related data */
+  } ATTRIBUTE_PACKED AE_DSP_MENUHOOK_DATA;
+
+  /*!
+   * @brief Properties passed to the Create() method of an add-on.
+   */
+  typedef struct AddonProps_AudioDSP
+  {
+    const char* strUserPath;                    /*!< @brief path to the user profile */
+    const char* strAddonPath;                   /*!< @brief path to this add-on */
+  } AddonProps_AudioDSP;
+
+  typedef struct AddonToKodiFuncTable_AudioDSP
+  {
+    void* kodiInstance;
+    void (*add_menu_hook)(void* kodiInstance, AE_DSP_MENUHOOK *hook);
+    void (*remove_menu_hook)(void* kodiInstance, AE_DSP_MENUHOOK *hook);
+    void (*register_mode)(void* kodiInstance, AE_DSP_MODES::AE_DSP_MODE *mode);
+    void (*unregister_mode)(void* kodiInstance, AE_DSP_MODES::AE_DSP_MODE *mode);
+  } AddonToKodiFuncTable_AudioDSP;
+
+  struct AddonInstance_AudioDSP;
+  typedef struct KodiToAddonFuncTable_AudioDSP
+  {
+    kodi::addon::CInstanceAudioDSP* addonInstance;
+    void (__cdecl* get_capabilities)(AddonInstance_AudioDSP const* addonInstance, AE_DSP_ADDON_CAPABILITIES*);
+    const char* (__cdecl* get_dsp_name)(AddonInstance_AudioDSP const* addonInstance);
+    const char* (__cdecl* get_dsp_version)(AddonInstance_AudioDSP const* addonInstance);
+    AE_DSP_ERROR (__cdecl* menu_hook)(AddonInstance_AudioDSP const* addonInstance, const AE_DSP_MENUHOOK*, const AE_DSP_MENUHOOK_DATA*);
+
+    AE_DSP_ERROR (__cdecl* stream_create)(AddonInstance_AudioDSP const* addonInstance, const AE_DSP_SETTINGS*, const AE_DSP_STREAM_PROPERTIES*, ADDON_HANDLE);
+    AE_DSP_ERROR (__cdecl* stream_destroy)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+    AE_DSP_ERROR (__cdecl* stream_is_mode_supported)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, AE_DSP_MODE_TYPE, unsigned int, int);
+    AE_DSP_ERROR (__cdecl* stream_initialize)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, const AE_DSP_SETTINGS*);
+
+    bool (__cdecl* input_process)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, const float**, unsigned int);
+
+    unsigned int (__cdecl* input_resample_process_needed_samplesize)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+    unsigned int (__cdecl* input_resample_process)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, const float**, float**, unsigned int);
+    float (__cdecl* input_resample_get_delay)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+    int (__cdecl* input_resample_samplerate)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+
+    unsigned int (__cdecl* pre_process_needed_samplesize)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, unsigned int);
+    float (__cdecl* pre_process_get_delay)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, unsigned int);
+    unsigned int (__cdecl* pre_process)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, unsigned int, const float**, float**, unsigned int);
+
+    AE_DSP_ERROR (__cdecl* master_process_set_mode)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, AE_DSP_STREAMTYPE, unsigned int, int);
+    unsigned int (__cdecl* master_process_needed_samplesize)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+    float (__cdecl* master_process_get_delay)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+    int (__cdecl* master_process_get_out_channels)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, unsigned long*);
+    unsigned int (__cdecl* master_process)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, const float**, float**, unsigned int);
+    const char* (__cdecl* master_process_get_stream_info_string)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+
+    unsigned int (__cdecl* post_process_needed_samplesize)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, unsigned int);
+    float (__cdecl* post_process_get_delay)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, unsigned int);
+    unsigned int (__cdecl* post_process)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, unsigned int, const float**, float**, unsigned int);
+
+    unsigned int (__cdecl* output_resample_process_needed_samplesize)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+    unsigned int (__cdecl* output_resample_process)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE, const float**, float**, unsigned int);
+    float (__cdecl* output_resample_get_delay)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+    int (__cdecl* output_resample_samplerate)(AddonInstance_AudioDSP const* addonInstance, const ADDON_HANDLE);
+  } KodiToAddonFuncTable_AudioDSP;
+
+  typedef struct AddonInstance_AudioDSP
+  {
+    AddonProps_AudioDSP props;
+    AddonToKodiFuncTable_AudioDSP toKodi;
+    KodiToAddonFuncTable_AudioDSP toAddon;
+  } AddonInstance_AudioDSP;
+
+} /* extern "C" */
+
+namespace kodi {
+namespace addon {
+
+  class CInstanceAudioDSP : public IAddonInstance
+  {
+  public:
+    //==========================================================================
+    /// @brief Class constructor
+    ///
+    CInstanceAudioDSP()
+      : IAddonInstance(ADDON_INSTANCE_ADSP)
+    {
+      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+        throw std::logic_error("kodi::addon::CInstanceAudioDSP: Creation of more as one in single instance way is not allowed!");
+
+      SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
+      CAddonBase::m_interface->globalSingleInstance = this;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// @brief Class constructor
+    ///
+    /// @param[in] instance             The from Kodi given instance given be
+    ///                                 add-on CreateInstance call with instance
+    ///                                 id ADDON_INSTANCE_ADSP.
+    ///
+    CInstanceAudioDSP(KODI_HANDLE instance)
+      : IAddonInstance(ADDON_INSTANCE_ADSP)
+    {
+      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+        throw std::logic_error("kodi::addon::CInstanceAudioDSP: Creation of multiple together with single instance way is not allowed!");
+
+      SetAddonStruct(instance);
+    }
+    //--------------------------------------------------------------------------
+
+    /*! @name Audio DSP add-on methods */
+    //@{
+    //==========================================================================
+    ///
+    /// @brief Get the list of features that this add-on provides.
+    /// Called by KODI to query the add-ons capabilities.
+    /// Used to check which options should be presented in the DSP, which methods
+    /// to call, etc.
+    /// All capabilities that the add-on supports should be set to true.
+    /// @param capabilities The add-ons capabilities.
+    /// @remarks Valid implementation required.
+    ///
+    virtual void GetCapabilities(AE_DSP_ADDON_CAPABILITIES& capabilities) = 0;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @return The name reported by the back end that will be displayed in the
+    /// UI.
+    /// @remarks Valid implementation required.
+    ///
+    virtual std::string GetDSPName() = 0;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @return The version string reported by the back end that will be displayed
+    /// in the UI.
+    /// @remarks Valid implementation required.
+    ///
+    virtual std::string GetDSPVersion() = 0;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Call one of the menu hooks (if supported).
+    /// Supported AE_DSP_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 AE_DSP_ERROR_NO_ERROR if the hook was called successfully.
+    /// @remarks Optional. Return AE_DSP_ERROR_NOT_IMPLEMENTED if this add-on
+    /// won't provide this function.
+    ///
+    virtual AE_DSP_ERROR MenuHook(const AE_DSP_MENUHOOK& menuhook, const AE_DSP_MENUHOOK_DATA& item) { return AE_DSP_ERROR_NOT_IMPLEMENTED; }
+    //--------------------------------------------------------------------------
+    //@}
+
+    //==========================================================================
+    /// @name DSP processing control, used to open and close a stream
+    ///  @remarks Valid implementation required.
+    ///
+    //@{
+    ///
+    /// @brief Set up Audio DSP with selected audio settings (use the basic
+    /// present audio stream data format).
+    /// Used to detect available add-ons for present stream, as example stereo
+    /// surround upmix not needed on 5.1 audio stream.
+    /// @param addonSettings The add-ons audio settings.
+    /// @param properties The properties of the currently playing stream.
+    /// @param handle On this becomes addon informated about stream id and can set function addresses which need on calls
+    /// @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully
+    /// and data can be performed. AE_DSP_ERROR_IGNORE_ME if format is not
+    /// supported, but without fault.
+    /// @remarks Valid implementation required.
+    ///
+    virtual AE_DSP_ERROR StreamCreate(const AE_DSP_SETTINGS& addonSettings, const AE_DSP_STREAM_PROPERTIES& properties, ADDON_HANDLE handle) = 0;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// Remove the selected id from currently used DSP processes
+    /// @param handle identification data for stream
+    /// @return AE_DSP_ERROR_NO_ERROR if the becomes found and removed
+    /// @remarks Valid implementation required.
+    ///
+    virtual AE_DSP_ERROR StreamDestroy(const ADDON_HANDLE handle) = 0;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Ask the add-on about a requested processing mode that it is
+    /// supported on the current stream. Is called about every add-on mode after
+    /// successed StreamCreate.
+    /// @param handle identification data for stream
+    /// @param type The processing mode type, see AE_DSP_MODE_TYPE for definitions
+    /// @param mode_id The mode inside add-on which must be performed on call. Id
+    /// is set from add-on by iModeNumber on AE_DSP_MODE structure during
+    /// RegisterMode callback,
+    /// @param unique_db_mode_id The Mode unique id generated from dsp database.
+    /// @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully
+    /// or if the stream is not supported the add-on must return
+    /// AE_DSP_ERROR_IGNORE_ME.
+    /// @remarks Valid implementation required.
+    ///
+    virtual AE_DSP_ERROR StreamIsModeSupported(const ADDON_HANDLE handle, AE_DSP_MODE_TYPE type, unsigned int mode_id, int unique_db_mode_id) = 0;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Set up Audio DSP with selected audio settings (detected on data of
+    /// first present audio packet)
+    /// @param addonSettings The add-ons audio settings.
+    /// @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully.
+    /// @remarks Valid implementation required.
+    ///
+    virtual AE_DSP_ERROR StreamInitialize(const ADDON_HANDLE handle, const AE_DSP_SETTINGS& addonSettings) = 0;
+    //--------------------------------------------------------------------------
+
+    //@}
+
+    /// @name DSP input processing
+    ///  @remarks Only used by KODI if bSupportsInputProcess is set to true.
+    ///
+    //@{
+    //==========================================================================
+    ///
+    /// @brief DSP input processing
+    /// Can be used to have unchanged stream..
+    /// All DSP add-ons allowed to-do this.
+    /// @param handle identification data for stream
+    /// @param array_in Pointer to data memory
+    /// @param samples Amount of samples inside array_in
+    /// @return true if work was OK
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual bool InputProcess(const ADDON_HANDLE handle, const float** array_in, unsigned int samples) { return true; }
+    //--------------------------------------------------------------------------
+    //@}
+
+    /// @name DSP pre-resampling
+    ///  @remarks Only used by KODI if bSupportsInputResample is set to true.
+    ///
+    //@{
+    //==========================================================================
+    ///
+    /// @brief If the add-on operate with buffered arrays and the output size can
+    /// be higher as the input it becomes asked about needed size before any
+    /// InputResampleProcess call.
+    /// @param handle identification data for stream
+    /// @return The needed size of output array or 0 if no changes within it
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int InputResampleProcessNeededSamplesize(const ADDON_HANDLE handle) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief DSP re sample processing before master.
+    /// Here a high quality resample can be performed.
+    /// Only one DSP add-on is allowed to-do this!
+    /// @param handle identification data for stream
+    /// @param array_in Pointer to input data memory
+    /// @param array_out Pointer to output data memory
+    /// @param samples Amount of samples inside array_in
+    /// @return Amount of samples processed
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int InputResampleProcess(const ADDON_HANDLE handle, const float** array_in, float** array_out, unsigned int samples) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Returns the re-sampling generated new sample rate used before the
+    /// master process
+    /// @param handle identification data for stream
+    /// @return The new sample rate
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual int InputResampleSampleRate(const ADDON_HANDLE handle) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Returns the time in seconds that it will take
+    /// for the next added packet to be returned to KODI.
+    /// @param handle identification data for stream
+    /// @return the delay in seconds
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual float InputResampleGetDelay(const ADDON_HANDLE handle) { return 0.0f; }
+    //--------------------------------------------------------------------------
+    //@}
+
+    /** @name DSP Pre processing
+    *  @remarks Only used by KODI if bSupportsPreProcess is set to true.
+    */
+    //@{
+    //==========================================================================
+    ///
+    /// @brief If the addon operate with buffered arrays and the output size can
+    /// be higher as the input it becomes asked about needed size before any
+    /// PreProcess call.
+    /// @param handle identification data for stream
+    /// @param mode_id The mode inside add-on which must be performed on call. Id
+    /// is set from add-on by iModeNumber on AE_DSP_MODE structure during
+    /// RegisterMode callback and can be defined from add-on as a structure
+    /// pointer or anything else what is needed to find it.
+    /// @return The needed size of output array or 0 if no changes within it
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int PreProcessNeededSamplesize(const ADDON_HANDLE handle, unsigned int mode_id) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Returns the time in seconds that it will take
+    /// for the next added packet to be returned to KODI.
+    /// @param handle identification data for stream
+    /// @param mode_id The mode inside add-on which must be performed on call. Id
+    /// is set from add-on by iModeNumber on AE_DSP_MODE structure during
+    /// RegisterMode callback and can be defined from add-on as a structure
+    /// pointer or anything else what is needed to find it.
+    /// @return the delay in seconds
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual float PreProcessGetDelay(const ADDON_HANDLE handle, unsigned int mode_id) { return 0.0f; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief DSP preprocessing
+    /// All DSP add-ons allowed to-do this.
+    /// @param handle identification data for stream
+    /// @param mode_id The mode inside add-on which must be performed on call. Id
+    /// is set from add-on by iModeNumber on AE_DSP_MODE structure during
+    /// RegisterMode callback and can be defined from add-on as a structure
+    /// pointer or anything else what is needed to find it.
+    /// @param array_in Pointer to input data memory
+    /// @param array_out Pointer to output data memory
+    /// @param samples Amount of samples inside array_in
+    /// @return Amount of samples processed
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int PreProcess(const ADDON_HANDLE handle, unsigned int mode_id, const float** array_in, float** array_out, unsigned int samples) { return 0; }
+    //--------------------------------------------------------------------------
+    //@}
+
+    /** @name DSP Master processing
+    *  @remarks Only used by KODI if bSupportsMasterProcess is set to true.
+    */
+    //@{
+    //==========================================================================
+    ///
+    /// @brief Set the active master process mode
+    /// @param handle identification data for stream
+    /// @param type Requested stream type for the selected master mode
+    /// @param mode_id The Mode identifier.
+    /// @param unique_db_mode_id The Mode unique id generated from DSP database.
+    /// @return AE_DSP_ERROR_NO_ERROR if the setup was successful
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual AE_DSP_ERROR MasterProcessSetMode(const ADDON_HANDLE handle, AE_DSP_STREAMTYPE type, unsigned int mode_id, int unique_db_mode_id) { return AE_DSP_ERROR_NOT_IMPLEMENTED; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief If the add-on operate with buffered arrays and the output size can
+    /// be higher as the input it becomes asked about needed size before any
+    /// MasterProcess call.
+    /// @param handle identification data for stream
+    /// @return The needed size of output array or 0 if no changes within it
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int MasterProcessNeededSamplesize(const ADDON_HANDLE handle) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Returns the time in seconds that it will take
+    /// for the next added packet to be returned to KODI.
+    /// @param handle identification data for stream
+    /// @return the delay in seconds
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual float MasterProcessGetDelay(const ADDON_HANDLE handle) { return 0.0f; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Returns the from selected master mode performed channel alignment
+    /// @param handle identification data for stream
+    /// @retval out_channel_present_flags the exact channel present flags after
+    /// performed up-/downmix
+    /// @return the amount channels
+    /// @remarks Optional. Must be used and set if a channel up- or downmix is
+    /// processed from the active master mode
+    ///
+    virtual int MasterProcessGetOutChannels(const ADDON_HANDLE handle, unsigned long& out_channel_present_flags) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Master processing becomes performed with it
+    /// Here a channel up-mix/down-mix for stereo surround sound can be performed
+    /// Only one DSP add-on is allowed to-do this!
+    /// @param handle identification data for stream
+    /// @param array_in Pointer to input data memory
+    /// @param array_out Pointer to output data memory
+    /// @param samples Amount of samples inside array_in
+    /// @return Amount of samples processed
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int MasterProcess(const ADDON_HANDLE handle, const float** array_in, float** array_out, unsigned int samples) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// Used to get a information string about the processed work to show on skin
+    /// @return A string to show
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual std::string MasterProcessGetStreamInfoString(const ADDON_HANDLE handle) { return ""; }
+    //--------------------------------------------------------------------------
+    //@}
+
+    /** @name DSP Post processing
+    *  @remarks Only used by KODI if bSupportsPostProcess is set to true.
+    */
+    //@{
+    //==========================================================================
+    ///
+    /// If the add-on operate with buffered arrays and the output size can be
+    /// higher as the input it becomes asked about needed size before any
+    /// PostProcess call.
+    /// @param handle identification data for stream
+    /// @param mode_id The mode inside add-on which must be performed on call. Id
+    /// is set from add-on by iModeNumber on AE_DSP_MODE structure during
+    /// RegisterMode callback, and can be defined from add-on as a structure
+    /// pointer or anything else what is needed to find it.
+    /// @return The needed size of output array or 0 if no changes within it
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int PostProcessNeededSamplesize(const ADDON_HANDLE handle, unsigned int mode_id) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// Returns the time in seconds that it will take
+    /// for the next added packet to be returned to KODI.
+    /// @param handle identification data for stream
+    /// @param mode_id The mode inside add-on which must be performed on call. Id
+    /// is set from add-on by iModeNumber on AE_DSP_MODE structure during
+    /// RegisterMode callback, and can be defined from add-on as a structure
+    /// pointer or anything else what is needed to find it.
+    /// @return the delay in seconds
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual float PostProcessGetDelay(const ADDON_HANDLE handle, unsigned int mode_id) { return 0.0f; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+
+    ///
+    /// @brief DSP post processing
+    /// On the post processing can be things performed with additional channel
+    /// upmix like 6.1 to 7.1
+    /// or frequency/volume corrections, speaker distance handling, equalizer... .
+    /// All DSP add-ons allowed to-do this.
+    /// @param handle identification data for stream
+    /// @param mode_id The mode inside add-on which must be performed on call. Id
+    /// is set from add-on by iModeNumber on AE_DSP_MODE structure during
+    /// RegisterMode callback, and can be defined from add-on as a structure
+    /// pointer or anything else what is needed to find it.
+    /// @param array_in Pointer to input data memory
+    /// @param array_out Pointer to output data memory
+    /// @param samples Amount of samples inside array_in
+    /// @return Amount of samples processed
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int PostProcess(const ADDON_HANDLE handle, unsigned int mode_id, const float** array_in, float** array_out, unsigned int samples) { return 0; }
+
+    //--------------------------------------------------------------------------
+    //@}
+
+    /** @name DSP Post re-sampling
+    *  @remarks Only used by KODI if bSupportsOutputResample is set to true.
+    */
+    //@{
+    //==========================================================================
+    ///
+    /// @brief If the add-on operate with buffered arrays and the output size
+    /// can be higher as the input
+    /// it becomes asked about needed size before any OutputResampleProcess call.
+    /// @param handle identification data for stream
+    /// @return The needed size of output array or 0 if no changes within it
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int OutputResampleProcessNeededSamplesize(const ADDON_HANDLE handle) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Re-sampling after master processing becomes performed with it if
+    /// needed, only
+    /// one add-on can perform it.
+    /// @param handle identification data for stream
+    /// @param array_in Pointer to input data memory
+    /// @param array_out Pointer to output data memory
+    /// @param samples Amount of samples inside array_in
+    /// @return Amount of samples processed
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual unsigned int OutputResampleProcess(const ADDON_HANDLE handle, const float** array_in, float** array_out, unsigned int samples) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Returns the re-sampling generated new sample rate used after the
+    /// master process.
+    /// @param handle identification data for stream
+    /// @return The new sample rate
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual int OutputResampleSampleRate(const ADDON_HANDLE handle) { return 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Returns the time in seconds that it will take for the next added
+    /// packet to be returned to KODI.
+    /// @param handle identification data for stream
+    /// @return the delay in seconds
+    /// @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
+    /// GetCapabilities
+    ///
+    virtual float OutputResampleGetDelay(const ADDON_HANDLE handle) { return 0.0f; }
+    //--------------------------------------------------------------------------
+    //@}
+
+    //==========================================================================
+    ///
+    /// @brief Add or replace a menu hook for the context menu for this add-on
+    /// @param hook The hook to add
+    ///
+    void AddMenuHook(AE_DSP_MENUHOOK* hook)
+    {
+      return m_instanceData->toKodi.add_menu_hook(m_instanceData->toKodi.kodiInstance, hook);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Remove a menu hook for the context menu for this add-on
+    /// @param hook The hook to remove
+    ///
+    void RemoveMenuHook(AE_DSP_MENUHOOK* hook)
+    {
+      return m_instanceData->toKodi.remove_menu_hook(m_instanceData->toKodi.kodiInstance, hook);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Add or replace master mode information inside audio dsp database.
+    /// Becomes identifier written inside mode to iModeID if it was 0 (undefined)
+    /// @param mode The master mode to add or update inside database
+    ///
+    void RegisterMode(AE_DSP_MODES::AE_DSP_MODE* mode)
+    {
+      return m_instanceData->toKodi.register_mode(m_instanceData->toKodi.kodiInstance, mode);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @brief Remove a master mode from audio dsp database
+    /// @param mode The Mode to remove
+    ///
+    void UnregisterMode(AE_DSP_MODES::AE_DSP_MODE* mode)
+    {
+      return m_instanceData->toKodi.unregister_mode(m_instanceData->toKodi.kodiInstance, mode);
+    }
+    //--------------------------------------------------------------------------
+
+  private:
+    void SetAddonStruct(KODI_HANDLE instance)
+    {
+      if (instance == nullptr)
+        throw std::logic_error("kodi::addon::CInstanceAudioDSP: Null pointer instance passed.");
+
+      m_instanceData = static_cast<AddonInstance_AudioDSP*>(instance);
+
+      m_instanceData->toAddon.get_capabilities = ADDON_GetCapabilities;
+      m_instanceData->toAddon.get_dsp_name = ADDON_GetDSPName;
+      m_instanceData->toAddon.get_dsp_version = ADDON_GetDSPVersion;
+      m_instanceData->toAddon.menu_hook = ADDON_MenuHook;
+
+      m_instanceData->toAddon.stream_create = ADDON_StreamCreate;
+      m_instanceData->toAddon.stream_destroy = ADDON_StreamDestroy;
+      m_instanceData->toAddon.stream_is_mode_supported = ADDON_StreamIsModeSupported;
+      m_instanceData->toAddon.stream_initialize = ADDON_StreamInitialize;
+
+      m_instanceData->toAddon.input_process = ADDON_InputProcess;
+
+      m_instanceData->toAddon.input_resample_process_needed_samplesize = ADDON_InputResampleProcessNeededSamplesize;
+      m_instanceData->toAddon.input_resample_process = ADDON_InputResampleProcess;
+      m_instanceData->toAddon.input_resample_get_delay = ADDON_InputResampleGetDelay;
+      m_instanceData->toAddon.input_resample_samplerate = ADDON_InputResampleSampleRate;
+
+      m_instanceData->toAddon.pre_process_needed_samplesize = ADDON_PreProcessNeededSamplesize;
+      m_instanceData->toAddon.pre_process_get_delay = ADDON_PreProcessGetDelay;
+      m_instanceData->toAddon.pre_process = ADDON_PreProcess;
+
+      m_instanceData->toAddon.master_process_set_mode = ADDON_MasterProcessSetMode;
+      m_instanceData->toAddon.master_process_needed_samplesize = ADDON_MasterProcessNeededSamplesize;
+      m_instanceData->toAddon.master_process_get_delay = ADDON_MasterProcessGetDelay;
+      m_instanceData->toAddon.master_process_get_out_channels = ADDON_MasterProcessGetOutChannels;
+      m_instanceData->toAddon.master_process = ADDON_MasterProcess;
+      m_instanceData->toAddon.master_process_get_stream_info_string = ADDON_MasterProcessGetStreamInfoString;
+
+      m_instanceData->toAddon.post_process_needed_samplesize = ADDON_PostProcessNeededSamplesize;
+      m_instanceData->toAddon.post_process_get_delay = ADDON_PostProcessGetDelay;
+      m_instanceData->toAddon.post_process = ADDON_PostProcess;
+
+      m_instanceData->toAddon.output_resample_process_needed_samplesize = ADDON_OutputResampleProcessNeededSamplesize;
+      m_instanceData->toAddon.output_resample_process = ADDON_OutputResampleProcess;
+      m_instanceData->toAddon.output_resample_get_delay = ADDON_OutputResampleGetDelay;
+      m_instanceData->toAddon.output_resample_samplerate = ADDON_OutputResampleSampleRate;
+    }
+
+    static inline void ADDON_GetCapabilities(AddonInstance_AudioDSP const* instance, AE_DSP_ADDON_CAPABILITIES *capabilities)
+    {
+      instance->toAddon.addonInstance->GetCapabilities(*capabilities);
+    }
+
+    static inline const char* ADDON_GetDSPName(AddonInstance_AudioDSP const* instance)
+    {
+      instance->toAddon.addonInstance->m_dspName = instance->toAddon.addonInstance->GetDSPName();
+      return instance->toAddon.addonInstance->m_dspName.c_str();
+    }
+
+    static inline const char* ADDON_GetDSPVersion(AddonInstance_AudioDSP const* instance)
+    {
+      instance->toAddon.addonInstance->m_dspVersion = instance->toAddon.addonInstance->GetDSPVersion();
+      return instance->toAddon.addonInstance->m_dspVersion.c_str();
+    }
+
+    static inline AE_DSP_ERROR ADDON_MenuHook(AddonInstance_AudioDSP const* instance, const AE_DSP_MENUHOOK* menuhook, const AE_DSP_MENUHOOK_DATA* item)
+    {
+      return instance->toAddon.addonInstance->MenuHook(*menuhook, *item);
+    }
+
+    static inline AE_DSP_ERROR ADDON_StreamCreate(AddonInstance_AudioDSP const* instance, const AE_DSP_SETTINGS *addonSettings, const AE_DSP_STREAM_PROPERTIES* properties, ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->StreamCreate(*addonSettings, *properties, handle);
+    }
+
+    static inline AE_DSP_ERROR ADDON_StreamDestroy(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->StreamDestroy(handle);
+    }
+
+    static inline AE_DSP_ERROR ADDON_StreamIsModeSupported(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, AE_DSP_MODE_TYPE type, unsigned int mode_id, int unique_db_mode_id)
+    {
+      return instance->toAddon.addonInstance->StreamIsModeSupported(handle, type, mode_id, unique_db_mode_id);
+    }
+
+    static inline AE_DSP_ERROR ADDON_StreamInitialize(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, const AE_DSP_SETTINGS *addonSettings)
+    {
+      return instance->toAddon.addonInstance->StreamInitialize(handle, *addonSettings);
+    }
+
+    static inline bool ADDON_InputProcess(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, const float** array_in, unsigned int samples)
+    {
+      return instance->toAddon.addonInstance->InputProcess(handle, array_in, samples);
+    }
+
+    static inline unsigned int ADDON_InputResampleProcessNeededSamplesize(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->InputResampleProcessNeededSamplesize(handle);
+    }
+
+    static inline unsigned int ADDON_InputResampleProcess(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, const float** array_in, float** array_out, unsigned int samples)
+    {
+      return instance->toAddon.addonInstance->InputResampleProcess(handle, array_in, array_out, samples);
+    }
+
+    static inline int ADDON_InputResampleSampleRate(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->InputResampleSampleRate(handle);
+    }
+
+    static inline float ADDON_InputResampleGetDelay(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->InputResampleGetDelay(handle);
+    }
+
+    static inline unsigned int ADDON_PreProcessNeededSamplesize(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, unsigned int mode_id)
+    {
+      return instance->toAddon.addonInstance->PreProcessNeededSamplesize(handle, mode_id);
+    }
+
+    static inline float ADDON_PreProcessGetDelay(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, unsigned int mode_id)
+    {
+      return instance->toAddon.addonInstance->PreProcessGetDelay(handle, mode_id);
+    }
+
+    static inline unsigned int ADDON_PreProcess(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, unsigned int mode_id, const float** array_in, float** array_out, unsigned int samples)
+    {
+      return instance->toAddon.addonInstance->PreProcess(handle, mode_id, array_in, array_out, samples);
+    }
+
+    static inline AE_DSP_ERROR ADDON_MasterProcessSetMode(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, AE_DSP_STREAMTYPE type, unsigned int mode_id, int unique_db_mode_id)
+    {
+      return instance->toAddon.addonInstance->MasterProcessSetMode(handle, type, mode_id, unique_db_mode_id);
+    }
+
+    static inline unsigned int ADDON_MasterProcessNeededSamplesize(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->MasterProcessNeededSamplesize(handle);
+    }
+
+    static inline float ADDON_MasterProcessGetDelay(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->MasterProcessGetDelay(handle);
+    }
+
+    static inline int ADDON_MasterProcessGetOutChannels(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, unsigned long* out_channel_present_flags)
+    {
+      return instance->toAddon.addonInstance->MasterProcessGetOutChannels(handle, *out_channel_present_flags);
+    }
+
+    static inline unsigned int ADDON_MasterProcess(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, const float** array_in, float** array_out, unsigned int samples)
+    {
+      return instance->toAddon.addonInstance->MasterProcess(handle, array_in, array_out, samples);
+    }
+
+    static inline const char* ADDON_MasterProcessGetStreamInfoString(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      instance->toAddon.addonInstance->m_streamInfoString = instance->toAddon.addonInstance->MasterProcessGetStreamInfoString(handle);
+      return instance->toAddon.addonInstance->m_streamInfoString.c_str();
+    }
+
+    static inline unsigned int ADDON_PostProcessNeededSamplesize(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, unsigned int mode_id)
+    {
+      return instance->toAddon.addonInstance->PostProcessNeededSamplesize(handle, mode_id);
+    }
+
+    static inline float ADDON_PostProcessGetDelay(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, unsigned int mode_id)
+    {
+      return instance->toAddon.addonInstance->PostProcessGetDelay(handle, mode_id);
+    }
+
+    static inline unsigned int ADDON_PostProcess(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, unsigned int mode_id, const float** array_in, float** array_out, unsigned int samples)
+    {
+      return instance->toAddon.addonInstance->PostProcess(handle, mode_id, array_in, array_out, samples);
+    }
+
+    static inline unsigned int ADDON_OutputResampleProcessNeededSamplesize(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->OutputResampleProcessNeededSamplesize(handle);
+    }
+
+    static inline unsigned int ADDON_OutputResampleProcess(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle, const float** array_in, float** array_out, unsigned int samples)
+    {
+      return instance->toAddon.addonInstance->OutputResampleProcess(handle, array_in, array_out, samples);
+    }
+
+    static inline int ADDON_OutputResampleSampleRate(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->OutputResampleSampleRate(handle);
+    }
+
+    static inline float ADDON_OutputResampleGetDelay(AddonInstance_AudioDSP const* instance, const ADDON_HANDLE handle)
+    {
+      return instance->toAddon.addonInstance->OutputResampleGetDelay(handle);
+    }
+
+    std::string m_dspName;
+    std::string m_dspVersion;
+    std::string m_streamInfoString;
+    AddonInstance_AudioDSP* m_instanceData;
+  };
+
+} /* namespace addon */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..f56f8ae
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDecoder.h
@@ -0,0 +1,240 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+#ifdef BUILD_KODI_ADDON
+#include "../AEChannelData.h"
+#else
+#include "cores/AudioEngine/Utils/AEChannelData.h"
+#endif
+#include <stdint.h>
+
+namespace kodi { namespace addon { class CInstanceAudioDecoder; }}
+
+extern "C"
+{
+
+  typedef struct AddonProps_AudioDecoder
+  {
+    int dummy;
+  } AddonProps_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;
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace addon
+{
+
+  class CInstanceAudioDecoder : public IAddonInstance
+  {
+  public:
+    //==========================================================================
+    /// @brief Class constructor
+    ///
+    /// @param[in] instance             The from Kodi given instance given be
+    ///                                 add-on CreateInstance call with instance
+    ///                                 id ADDON_INSTANCE_AUDIODECODER.
+    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!");
+
+      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!");
+
+      m_instanceData = static_cast<AddonInstance_AudioDecoder*>(instance);
+
+      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())
+      {
+        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_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)
+      {
+        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;
+  };
+
+} /* 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
new file mode 100644
index 0000000..3d59a99
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioEncoder.h
@@ -0,0 +1,223 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+
+namespace kodi { namespace addon { class CInstanceAudioEncoder; }}
+
+extern "C"
+{
+
+  typedef struct AddonProps_AudioEncoder
+  {
+    int dummy;
+  } AddonProps_AudioEncoder;
+
+  typedef struct AddonToKodiFuncTable_AudioEncoder
+  {
+    void* kodiInstance;
+    int (*write) (void* kodiInstance, const uint8_t* data, int len);
+    int64_t (*seek)(void* kodiInstance, int64_t pos, int whence);
+  } AddonToKodiFuncTable_AudioEncoder;
+
+  struct AddonInstance_AudioEncoder;
+  typedef struct KodiToAddonFuncTable_AudioEncoder
+  {
+    kodi::addon::CInstanceAudioEncoder* addonInstance;
+    bool (__cdecl* start) (const AddonInstance_AudioEncoder* instance, int in_channels, int in_rate, int in_bits,
+                           const char* title, const char* artist,
+                           const char* albumartist, const char* album,
+                           const char* year, const char* track,
+                           const char* genre, const char* comment,
+                           int track_length);
+    int  (__cdecl* encode) (const AddonInstance_AudioEncoder* instance, int num_bytes_read, const uint8_t* pbt_stream);
+    bool (__cdecl* finish) (const AddonInstance_AudioEncoder* instance);
+  } KodiToAddonFuncTable_AudioEncoder;
+
+  typedef struct AddonInstance_AudioEncoder
+  {
+    AddonProps_AudioEncoder props;
+    AddonToKodiFuncTable_AudioEncoder toKodi;
+    KodiToAddonFuncTable_AudioEncoder toAddon;
+  } AddonInstance_AudioEncoder;
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace addon
+{
+
+  class CInstanceAudioEncoder : public IAddonInstance
+  {
+  public:
+    //==========================================================================
+    /// @brief Class constructor
+    ///
+    /// @param[in] instance             The from Kodi given instance given be
+    ///                                 add-on CreateInstance call with instance
+    ///                                 id ADDON_INSTANCE_AUDIOENCODER.
+    CInstanceAudioEncoder(KODI_HANDLE instance)
+      : IAddonInstance(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!");
+
+      SetAddonStruct(instance);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// \brief Start encoder (**required**)
+    ///
+    /// \param[in] inChannels           Number of channels
+    /// \param[in] inRate               Sample rate of input data
+    /// \param[in] inBits               Bits per sample in input data
+    /// \param[in] title                The title of the song
+    /// \param[in] artist               The artist of the song
+    /// \param[in] albumartist          The albumartist of the song
+    /// \param[in] year                 The year of the song
+    /// \param[in] track                The track number of the song
+    /// \param[in] genre                The genre of the song
+    /// \param[in] comment              A comment to attach to the song
+    /// \param[in] trackLength          Total track length in seconds
+    /// \return                         True on success, false on failure.
+    ///
+    virtual bool Start(int inChannels,
+                       int inRate,
+                       int inBits,
+                       const std::string& title,
+                       const std::string& artist,
+                       const std::string& albumartist,
+                       const std::string& album,
+                       const std::string& year,
+                       const std::string& track,
+                       const std::string& genre,
+                       const std::string& comment,
+                       int trackLength) = 0;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// \brief Encode a chunk of audio (**required**)
+    ///
+    /// \param[in] numBytesRead         Number of bytes in input buffer
+    /// \param[in] pbtStream            the input buffer
+    /// \return                         Number of bytes consumed
+    ///
+    virtual int Encode(int numBytesRead, const uint8_t* pbtStream) = 0;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// \brief Finalize encoding (**optional**)
+    ///
+    /// \return                         True on success, false on failure.
+    ///
+    virtual bool Finish() { return true; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// \brief Write block of data
+    ///
+    /// \param[in] data                 Pointer to the array of elements to be 
+    ///                                 written
+    /// \param[in] length               Size in bytes to be written.
+    /// \return                         The total number of bytes 
+    ///                                 successfully written is returned.
+    int Write(const uint8_t* data, int length)
+    {
+      return m_instanceData->toKodi.write(m_instanceData->toKodi.kodiInstance, data, length);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    /// \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)
+    {
+      return m_instanceData->toKodi.seek(m_instanceData->toKodi.kodiInstance, position, whence);
+    }
+    //--------------------------------------------------------------------------
+
+  private:
+    void SetAddonStruct(KODI_HANDLE instance)
+    {
+      if (instance == nullptr)
+        throw std::logic_error("kodi::addon::CInstanceAudioEncoder: Creation with empty addon structure not allowed, table must be given from Kodi!");
+
+      m_instanceData = static_cast<AddonInstance_AudioEncoder*>(instance);
+      m_instanceData->toAddon.addonInstance = this;
+      m_instanceData->toAddon.start = ADDON_Start;
+      m_instanceData->toAddon.encode = ADDON_Encode;
+      m_instanceData->toAddon.finish = ADDON_Finish;
+    }
+
+    inline static bool ADDON_Start(const AddonInstance_AudioEncoder* instance, int inChannels, int inRate, int inBits,
+                                   const char* title, const char* artist,
+                                   const char* albumartist, const char* album,
+                                   const char* year, const char* track,
+                                   const char* genre, const char* comment,
+                                   int trackLength)
+    {
+      return instance->toAddon.addonInstance->Start(inChannels,
+                                                    inRate,
+                                                    inBits,
+                                                    title,
+                                                    artist,
+                                                    albumartist,
+                                                    album,
+                                                    year,
+                                                    track,
+                                                    genre,
+                                                    comment,
+                                                    trackLength);
+    }
+
+    inline static int ADDON_Encode(const AddonInstance_AudioEncoder* instance, int numBytesRead, const uint8_t* pbtStream)
+    {
+      return instance->toAddon.addonInstance->Encode(numBytesRead, pbtStream);
+    }
+
+    inline static bool ADDON_Finish(const AddonInstance_AudioEncoder* instance)
+    {
+      return instance->toAddon.addonInstance->Finish();
+    }
+
+    AddonInstance_AudioEncoder* 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
new file mode 100644
index 0000000..a854711
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/ImageDecoder.h
@@ -0,0 +1,163 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+
+namespace kodi { namespace addon { class CInstanceImageDecoder; }}
+
+extern "C"
+{
+
+  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::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;
+
+} /* extern "C" */
+
+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;
+
+namespace kodi
+{
+namespace addon
+{
+
+  class CInstanceImageDecoder : public IAddonInstance
+  {
+  public:
+    //==========================================================================
+    /// @brief Class constructor
+    ///
+    /// @param[in] instance             The from Kodi given instance given be
+    ///                                 add-on CreateInstance call with instance
+    ///                                 id ADDON_INSTANCE_IMAGEDECODER.
+    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;
+  };
+
+} /* namespace addon */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..76cfe92
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Inputstream.h
@@ -0,0 +1,621 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/*
+ * Parts with a comment named "internal" are only used inside header and not
+ * used or accessed direct during add-on development!
+ */
+
+#include "../AddonBase.h"
+#include "../StreamCrypto.h"
+#include "../StreamCodec.h"
+
+#ifdef BUILD_KODI_ADDON
+#include "../DVDDemuxPacket.h"
+#else
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
+#endif
+
+namespace kodi { namespace addon { class CInstanceInputStream; }}
+
+extern "C" {
+
+  /*!
+   * @brief InputStream add-on capabilities. All capabilities are set to "false" as default.
+   */
+  typedef struct INPUTSTREAM_CAPABILITIES
+  {
+    enum MASKTYPE: uint32_t
+    {
+      /// supports interface IDemux
+      SUPPORTS_IDEMUX = (1 << 0),
+
+      /// supports interface IPosTime
+      SUPPORTS_IPOSTIME = (1 << 1),
+
+      /// supports interface IDisplayTime
+      SUPPORTS_IDISPLAYTIME = (1 << 2),
+
+      /// supports seek
+      SUPPORTS_SEEK = (1 << 3),
+
+      /// supports pause
+      SUPPORTS_PAUSE = (1 << 4)
+    };
+
+    /// set of supported capabilities
+    uint32_t m_mask;
+  } INPUTSTREAM_CAPABILITIES;
+
+  /*!
+   * @brief structure of key/value pairs passed to addon on Open()
+   */
+  typedef struct INPUTSTREAM
+  {
+    static const unsigned int MAX_INFO_COUNT = 8;
+
+    const char *m_strURL;
+
+    unsigned int m_nCountInfoValues;
+    struct LISTITEMPROPERTY
+    {
+      const char *m_strKey;
+      const char *m_strValue;
+    } m_ListItemProperties[MAX_INFO_COUNT];
+
+    const char *m_libFolder;
+    const char *m_profileFolder;
+  } INPUTSTREAM;
+
+  /*!
+   * @brief Array of stream IDs
+   */
+  typedef struct INPUTSTREAM_IDS
+  {
+    static const unsigned int MAX_STREAM_COUNT = 32;
+    unsigned int m_streamCount;
+    unsigned int m_streamIds[MAX_STREAM_COUNT];
+  } INPUTSTREAM_IDS;
+
+  /*!
+   * @brief stream properties
+   */
+  typedef struct INPUTSTREAM_INFO
+  {
+    enum STREAM_TYPE
+    {
+      TYPE_NONE,
+      TYPE_VIDEO,
+      TYPE_AUDIO,
+      TYPE_SUBTITLE,
+      TYPE_TELETEXT
+    } m_streamType;
+
+    enum Codec_FEATURES
+    {
+      FEATURE_DECODE = 1
+    };
+    unsigned int m_features;
+
+    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;
+    unsigned int m_ExtraSize;
+
+    char m_language[4];                  /*!< @brief ISO 639 3-letter 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_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_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;
+  } INPUTSTREAM_INFO;
+
+  /*!
+   * @brief Structure to transfer the methods from xbmc_inputstream_dll.h to XBMC
+   */
+
+  // this are properties given to the addon on create
+  // at this time we have no parameters for the addon
+  typedef struct AddonProps_InputStream /* internal */
+  {
+    int dummy;
+  } AddonProps_InputStream;
+
+  typedef struct AddonToKodiFuncTable_InputStream /* internal */
+  {
+    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);
+    void (*free_demux_packet)(void* kodiInstance, DemuxPacket* packet);
+  } AddonToKodiFuncTable_InputStream;
+
+  struct AddonInstance_InputStream;
+  typedef struct KodiToAddonFuncTable_InputStream /* internal */
+  {
+    kodi::addon::CInstanceInputStream* 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);
+
+    // 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);
+    void(__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);
+
+    // IDisplayTime
+    int (__cdecl* get_total_time)(const AddonInstance_InputStream* instance);
+    int (__cdecl* get_time)(const AddonInstance_InputStream* instance);
+
+    // 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);
+  } KodiToAddonFuncTable_InputStream;
+
+  typedef struct AddonInstance_InputStream /* internal */
+  {
+    AddonProps_InputStream props;
+    AddonToKodiFuncTable_InputStream toKodi;
+    KodiToAddonFuncTable_InputStream toAddon;
+  } AddonInstance_InputStream;
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace addon
+{
+
+  class CInstanceInputStream : public IAddonInstance
+  {
+  public:
+    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!");
+
+      SetAddonStruct(instance);
+    }
+
+    ~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;
+
+    /*!
+     * Close an open stream.
+     * @remarks
+     */
+    virtual void Close() = 0;
+
+    /*!
+     * Get Capabilities of this addon.
+     * @param capabilities The add-on's capabilities.
+     * @remarks
+     */
+    virtual void GetCapabilities(INPUTSTREAM_CAPABILITIES& capabilities) = 0;
+
+    /*!
+     * Get IDs of available streams
+     * @remarks
+     */
+    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;
+
+    /*!
+     * 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;
+
+    /*!
+    * Opens a stream for playback.
+    * @param streamid unique id of stream
+    * @remarks
+    */
+    virtual void OpenStream(int streamid) = 0;
+
+    /*!
+     * Reset the demultiplexer in the add-on.
+     * @remarks Required if bHandlesDemuxing is set to true.
+     */
+    virtual void DemuxReset() { }
+
+    /*!
+     * Abort the demultiplexer thread in the add-on.
+     * @remarks Required if bHandlesDemuxing is set to true.
+     */
+    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() { }
+
+    /*!
+     * 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 Return NULL if this add-on won't provide this function.
+     */
+    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
+     * @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.
+     */
+    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) { }
+
+    /*!
+     * Sets desired width / height
+     * @param width / hight
+     */
+    virtual void SetVideoResolution(int width, int height) { }
+
+    /*!
+     * Totel time in ms
+     * @remarks
+     */
+    virtual int GetTotalTime() { return -1; }
+
+    /*!
+     * Playing time in ms
+     * @remarks
+     */
+    virtual int GetTime() { return -1; }
+
+    /*!
+     * Positions inputstream to playing time given in ms
+     * @remarks
+     */
+    virtual bool PosTime(int ms) { return false; }
+
+
+    /*!
+     * 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; }
+
+    /*!
+     * 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; }
+
+    /*!
+     * 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; }
+
+    /*!
+     * 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; }
+
+    /*!
+     * @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; }
+
+    /*!
+     * @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; }
+
+
+    /*!
+     * @brief Notify the InputStream addon that Kodi (un)paused the currently playing stream
+     */
+    virtual void PauseStream(double time) { }
+
+
+    /*!
+     *  Check for real-time streaming
+     *  @return true if current stream is real-time
+     */
+    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);
+    }
+
+    /*!
+     * @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);
+    }
+
+    /*!
+     * @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);
+    }
+
+  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.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;
+    }
+
+    inline static bool ADDON_Open(const AddonInstance_InputStream* instance, INPUTSTREAM* props)
+    {
+      return instance->toAddon.addonInstance->Open(*props);
+    }
+
+    inline static void ADDON_Close(const AddonInstance_InputStream* instance)
+    {
+      instance->toAddon.addonInstance->Close();
+    }
+
+    inline static void ADDON_GetCapabilities(const AddonInstance_InputStream* instance, INPUTSTREAM_CAPABILITIES* capabilities)
+    {
+      instance->toAddon.addonInstance->GetCapabilities(*capabilities);
+    }
+
+
+    // IDemux
+    inline static struct INPUTSTREAM_IDS ADDON_GetStreamIds(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->GetStreamIds();
+    }
+
+    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);
+    }
+
+    inline static void ADDON_OpenStream(const AddonInstance_InputStream* instance, int streamid)
+    {
+      instance->toAddon.addonInstance->OpenStream(streamid);
+    }
+
+    inline static void ADDON_DemuxReset(const AddonInstance_InputStream* instance)
+    {
+      instance->toAddon.addonInstance->DemuxReset();
+    }
+
+    inline static void ADDON_DemuxAbort(const AddonInstance_InputStream* instance)
+    {
+      instance->toAddon.addonInstance->DemuxAbort();
+    }
+
+    inline static void ADDON_DemuxFlush(const AddonInstance_InputStream* instance)
+    {
+      instance->toAddon.addonInstance->DemuxFlush();
+    }
+
+    inline static DemuxPacket* ADDON_DemuxRead(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->DemuxRead();
+    }
+
+    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_DemuxSetSpeed(const AddonInstance_InputStream* instance, int speed)
+    {
+      instance->toAddon.addonInstance->DemuxSetSpeed(speed);
+    }
+
+    inline static void ADDON_SetVideoResolution(const AddonInstance_InputStream* instance, int width, int height)
+    {
+      instance->toAddon.addonInstance->SetVideoResolution(width, height);
+    }
+
+
+    // IDisplayTime
+    inline static int ADDON_GetTotalTime(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->GetTotalTime();
+    }
+
+    inline static int ADDON_GetTime(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->GetTime();
+    }
+
+
+    // IPosTime
+    inline static bool ADDON_PosTime(const AddonInstance_InputStream* instance, int ms)
+    {
+      return instance->toAddon.addonInstance->PosTime(ms);
+    }
+
+    // Seekable (mandatory)
+    inline static bool ADDON_CanPauseStream(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->CanPauseStream();
+    }
+
+    inline static bool ADDON_CanSeekStream(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->CanSeekStream();
+    }
+
+
+    inline static int ADDON_ReadStream(const AddonInstance_InputStream* instance, uint8_t* buffer, unsigned int bufferSize)
+    {
+      return instance->toAddon.addonInstance->ReadStream(buffer, bufferSize);
+    }
+
+    inline static int64_t ADDON_SeekStream(const AddonInstance_InputStream* instance, int64_t position, int whence)
+    {
+      return instance->toAddon.addonInstance->SeekStream(position, whence);
+    }
+
+    inline static int64_t ADDON_PositionStream(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->PositionStream();
+    }
+
+    inline static int64_t ADDON_LengthStream(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->LengthStream();
+    }
+
+    inline static void ADDON_PauseStream(const AddonInstance_InputStream* instance, double time)
+    {
+      instance->toAddon.addonInstance->PauseStream(time);
+    }
+
+    inline static bool ADDON_IsRealTimeStream(const AddonInstance_InputStream* instance)
+    {
+      return instance->toAddon.addonInstance->IsRealTimeStream();
+    }
+
+    AddonInstance_InputStream* m_instanceData;
+  };
+
+} /* namespace addon */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..631b9b4
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h
@@ -0,0 +1,682 @@
+#pragma once
+/*
+ *      Copyright (C) 2014-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+
+namespace kodi { namespace addon { class CInstancePeripheral; }}
+
+/* indicates a joystick has no preference for port number */
+#define NO_PORT_REQUESTED     (-1)
+
+/* joystick's driver button/hat/axis index is unknown */
+#define DRIVER_INDEX_UNKNOWN  (-1)
+
+extern "C"
+{
+
+  /// @name Peripheral types
+  ///{
+  typedef enum PERIPHERAL_ERROR
+  {
+    PERIPHERAL_NO_ERROR                      =  0, // no error occurred
+    PERIPHERAL_ERROR_UNKNOWN                 = -1, // an unknown error occurred
+    PERIPHERAL_ERROR_FAILED                  = -2, // the command failed
+    PERIPHERAL_ERROR_INVALID_PARAMETERS      = -3, // the parameters of the method are invalid for this operation
+    PERIPHERAL_ERROR_NOT_IMPLEMENTED         = -4, // the method that the frontend called is not implemented
+    PERIPHERAL_ERROR_NOT_CONNECTED           = -5, // no peripherals are connected
+    PERIPHERAL_ERROR_CONNECTION_FAILED       = -6, // peripherals are connected, but command was interrupted
+  } PERIPHERAL_ERROR;
+
+  typedef enum PERIPHERAL_TYPE
+  {
+    PERIPHERAL_TYPE_UNKNOWN,
+    PERIPHERAL_TYPE_JOYSTICK,
+    PERIPHERAL_TYPE_KEYBOARD,
+  } PERIPHERAL_TYPE;
+
+  typedef struct PERIPHERAL_INFO
+  {
+    PERIPHERAL_TYPE type;           /*!< @brief type of peripheral */
+    char*           name;           /*!< @brief name of peripheral */
+    uint16_t        vendor_id;      /*!< @brief vendor ID of peripheral, 0x0000 if unknown */
+    uint16_t        product_id;     /*!< @brief product ID of peripheral, 0x0000 if unknown */
+    unsigned int    index;          /*!< @brief the order in which the add-on identified this peripheral */
+  } ATTRIBUTE_PACKED PERIPHERAL_INFO;
+
+  /*!
+   * @brief Peripheral add-on capabilities.
+   * If a capability is set to true, then the corresponding methods from
+   * kodi_peripheral_dll.h need to be implemented.
+   */
+  typedef struct PERIPHERAL_CAPABILITIES
+  {
+    bool provides_joysticks;            /*!< @brief true if the add-on provides joysticks */
+    bool provides_joystick_rumble;
+    bool provides_joystick_power_off;
+    bool provides_buttonmaps;           /*!< @brief true if the add-on provides button maps */
+  } ATTRIBUTE_PACKED PERIPHERAL_CAPABILITIES;
+  ///}
+
+  /// @name Event types
+  ///{
+  typedef enum PERIPHERAL_EVENT_TYPE
+  {
+    PERIPHERAL_EVENT_TYPE_NONE,           /*!< @brief unknown event */
+    PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON,  /*!< @brief state changed for joystick driver button */
+    PERIPHERAL_EVENT_TYPE_DRIVER_HAT,     /*!< @brief state changed for joystick driver hat */
+    PERIPHERAL_EVENT_TYPE_DRIVER_AXIS,    /*!< @brief state changed for joystick driver axis */
+    PERIPHERAL_EVENT_TYPE_SET_MOTOR,      /*!< @brief set the state for joystick rumble motor */
+  } PERIPHERAL_EVENT_TYPE;
+
+  typedef enum JOYSTICK_STATE_BUTTON
+  {
+    JOYSTICK_STATE_BUTTON_UNPRESSED = 0x0,    /*!< @brief button is released */
+    JOYSTICK_STATE_BUTTON_PRESSED   = 0x1,    /*!< @brief button is pressed */
+  } JOYSTICK_STATE_BUTTON;
+
+  typedef enum JOYSTICK_STATE_HAT
+  {
+    JOYSTICK_STATE_HAT_UNPRESSED  = 0x0,    /*!< @brief no directions are pressed */
+    JOYSTICK_STATE_HAT_LEFT       = 0x1,    /*!< @brief only left is pressed */
+    JOYSTICK_STATE_HAT_RIGHT      = 0x2,    /*!< @brief only right is pressed */
+    JOYSTICK_STATE_HAT_UP         = 0x4,    /*!< @brief only up is pressed */
+    JOYSTICK_STATE_HAT_DOWN       = 0x8,    /*!< @brief only down is pressed */
+    JOYSTICK_STATE_HAT_LEFT_UP    = JOYSTICK_STATE_HAT_LEFT  | JOYSTICK_STATE_HAT_UP,
+    JOYSTICK_STATE_HAT_LEFT_DOWN  = JOYSTICK_STATE_HAT_LEFT  | JOYSTICK_STATE_HAT_DOWN,
+    JOYSTICK_STATE_HAT_RIGHT_UP   = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_UP,
+    JOYSTICK_STATE_HAT_RIGHT_DOWN = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_DOWN,
+  } JOYSTICK_STATE_HAT;
+
+  /*!
+   * @brief value in the closed interval [-1.0, 1.0]
+   *
+   * The axis state uses the XInput coordinate system:
+   *   - Negative values signify down or to the left
+   *   - Positive values signify up or to the right
+   */
+  typedef float JOYSTICK_STATE_AXIS;
+
+  typedef float JOYSTICK_STATE_MOTOR;
+
+  typedef struct PERIPHERAL_EVENT
+  {
+    unsigned int             peripheral_index;
+    PERIPHERAL_EVENT_TYPE    type;
+    unsigned int             driver_index;
+    JOYSTICK_STATE_BUTTON    driver_button_state;
+    JOYSTICK_STATE_HAT       driver_hat_state;
+    JOYSTICK_STATE_AXIS      driver_axis_state;
+    JOYSTICK_STATE_MOTOR     motor_state;
+  } ATTRIBUTE_PACKED PERIPHERAL_EVENT;
+  ///}
+
+  /// @name Joystick types
+  ///{
+  typedef struct JOYSTICK_INFO
+  {
+    PERIPHERAL_INFO peripheral;         /*!< @brief peripheral info for this joystick */
+    char*           provider;           /*!< @brief name of the driver or interface providing the joystick */
+    int             requested_port;     /*!< @brief requested port number (such as for 360 controllers), or NO_PORT_REQUESTED */
+    unsigned int    button_count;       /*!< @brief number of buttons reported by the driver */
+    unsigned int    hat_count;          /*!< @brief number of hats reported by the driver */
+    unsigned int    axis_count;         /*!< @brief number of axes reported by the driver */
+    unsigned int    motor_count;        /*!< @brief number of motors reported by the driver */
+    bool            supports_poweroff;  /*!< @brief whether the joystick supports being powered off */
+  } ATTRIBUTE_PACKED JOYSTICK_INFO;
+
+  typedef enum JOYSTICK_DRIVER_PRIMITIVE_TYPE
+  {
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN,
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON,
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION,
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS,
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR,
+  } JOYSTICK_DRIVER_PRIMITIVE_TYPE;
+
+  typedef struct JOYSTICK_DRIVER_BUTTON
+  {
+    int              index;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_BUTTON;
+
+  typedef enum JOYSTICK_DRIVER_HAT_DIRECTION
+  {
+    JOYSTICK_DRIVER_HAT_UNKNOWN,
+    JOYSTICK_DRIVER_HAT_LEFT,
+    JOYSTICK_DRIVER_HAT_RIGHT,
+    JOYSTICK_DRIVER_HAT_UP,
+    JOYSTICK_DRIVER_HAT_DOWN,
+  } JOYSTICK_DRIVER_HAT_DIRECTION;
+
+  typedef struct JOYSTICK_DRIVER_HAT
+  {
+    int                           index;
+    JOYSTICK_DRIVER_HAT_DIRECTION direction;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_HAT;
+
+  typedef enum JOYSTICK_DRIVER_SEMIAXIS_DIRECTION
+  {
+    JOYSTICK_DRIVER_SEMIAXIS_NEGATIVE = -1, /*!< @brief negative half of the axis */
+    JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN  =  0, /*!< @brief unknown direction */
+    JOYSTICK_DRIVER_SEMIAXIS_POSITIVE =  1, /*!< @brief positive half of the axis */
+  } JOYSTICK_DRIVER_SEMIAXIS_DIRECTION;
+
+  typedef struct JOYSTICK_DRIVER_SEMIAXIS
+  {
+    int                                index;
+    int                                center;
+    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction;
+    unsigned int                       range;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_SEMIAXIS;
+
+  typedef struct JOYSTICK_DRIVER_MOTOR
+  {
+    int              index;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_MOTOR;
+
+  typedef struct JOYSTICK_DRIVER_PRIMITIVE
+  {
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE    type;
+    union
+    {
+      struct JOYSTICK_DRIVER_BUTTON   button;
+      struct JOYSTICK_DRIVER_HAT      hat;
+      struct JOYSTICK_DRIVER_SEMIAXIS semiaxis;
+      struct JOYSTICK_DRIVER_MOTOR    motor;
+    };
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_PRIMITIVE;
+
+  typedef enum JOYSTICK_FEATURE_TYPE
+  {
+    JOYSTICK_FEATURE_TYPE_UNKNOWN,
+    JOYSTICK_FEATURE_TYPE_SCALAR,
+    JOYSTICK_FEATURE_TYPE_ANALOG_STICK,
+    JOYSTICK_FEATURE_TYPE_ACCELEROMETER,
+    JOYSTICK_FEATURE_TYPE_MOTOR,
+  } JOYSTICK_FEATURE_TYPE;
+
+  typedef enum JOYSTICK_FEATURE_PRIMITIVE
+  {
+    // Scalar feature
+    JOYSTICK_SCALAR_PRIMITIVE = 0,
+
+    // Analog stick
+    JOYSTICK_ANALOG_STICK_UP = 0,
+    JOYSTICK_ANALOG_STICK_DOWN = 1,
+    JOYSTICK_ANALOG_STICK_RIGHT = 2,
+    JOYSTICK_ANALOG_STICK_LEFT = 3,
+
+    // Accelerometer
+    JOYSTICK_ACCELEROMETER_POSITIVE_X = 0,
+    JOYSTICK_ACCELEROMETER_POSITIVE_Y = 1,
+    JOYSTICK_ACCELEROMETER_POSITIVE_Z = 2,
+
+    // Motor
+    JOYSTICK_MOTOR_PRIMITIVE = 0,
+
+    // Maximum number of primitives
+    JOYSTICK_PRIMITIVE_MAX = 4,
+  } JOYSTICK_FEATURE_PRIMITIVE;
+
+  typedef struct JOYSTICK_FEATURE
+  {
+    char*                                   name;
+    JOYSTICK_FEATURE_TYPE                   type;
+    struct JOYSTICK_DRIVER_PRIMITIVE        primitives[JOYSTICK_PRIMITIVE_MAX];
+  } ATTRIBUTE_PACKED JOYSTICK_FEATURE;
+  ///}
+
+  typedef struct AddonProps_Peripheral
+  {
+    const char* user_path;              /*!< @brief path to the user profile */
+    const char* addon_path;             /*!< @brief path to this add-on */
+  } ATTRIBUTE_PACKED AddonProps_Peripheral;
+
+  struct AddonInstance_Peripheral;
+
+  typedef struct AddonToKodiFuncTable_Peripheral
+  {
+    KODI_HANDLE kodiInstance;
+    void (*trigger_scan)(void* kodiInstance);
+    void (*refresh_button_maps)(void* kodiInstance, const char* device_name, const char* controller_id);
+    unsigned int (*feature_count)(void* kodiInstance, const char* controller_id, JOYSTICK_FEATURE_TYPE type);
+  } AddonToKodiFuncTable_Peripheral;
+
+  //! @todo Mouse, light gun, multitouch
+
+  typedef struct KodiToAddonFuncTable_Peripheral
+  {
+    kodi::addon::CInstancePeripheral* addonInstance;
+
+    void (__cdecl* get_capabilities)(const AddonInstance_Peripheral* addonInstance, PERIPHERAL_CAPABILITIES* capabilities);
+    PERIPHERAL_ERROR (__cdecl* perform_device_scan)(const AddonInstance_Peripheral* addonInstance, unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results);
+    void (__cdecl* free_scan_results)(const AddonInstance_Peripheral* addonInstance, unsigned int peripheral_count, PERIPHERAL_INFO* scan_results);
+    PERIPHERAL_ERROR (__cdecl* get_events)(const AddonInstance_Peripheral* addonInstance, unsigned int* event_count, PERIPHERAL_EVENT** events);
+    void (__cdecl* free_events)(const AddonInstance_Peripheral* addonInstance, unsigned int event_count, PERIPHERAL_EVENT* events);
+    bool (__cdecl* send_event)(const AddonInstance_Peripheral* addonInstance, const PERIPHERAL_EVENT* event);
+
+    /// @name Joystick operations
+    ///{
+    PERIPHERAL_ERROR (__cdecl* get_joystick_info)(const AddonInstance_Peripheral* addonInstance, unsigned int index, JOYSTICK_INFO* info);
+    void (__cdecl* free_joystick_info)(const AddonInstance_Peripheral* addonInstance, JOYSTICK_INFO* info);
+    PERIPHERAL_ERROR (__cdecl* get_features)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, const char* controller_id, unsigned int* feature_count, JOYSTICK_FEATURE** features);
+    void (__cdecl* free_features)(const AddonInstance_Peripheral* addonInstance, unsigned int feature_count, JOYSTICK_FEATURE* features);
+    PERIPHERAL_ERROR (__cdecl* map_features)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, const char* controller_id, unsigned int feature_count, const JOYSTICK_FEATURE* features);
+    PERIPHERAL_ERROR (__cdecl* get_ignored_primitives)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, unsigned int* feature_count, JOYSTICK_DRIVER_PRIMITIVE** primitives);
+    void (__cdecl* free_primitives)(const AddonInstance_Peripheral* addonInstance, unsigned int, JOYSTICK_DRIVER_PRIMITIVE* primitives);
+    PERIPHERAL_ERROR (__cdecl* set_ignored_primitives)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, unsigned int primitive_count, const JOYSTICK_DRIVER_PRIMITIVE* primitives);
+    void (__cdecl* save_button_map)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick);
+    void (__cdecl* revert_button_map)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick);
+    void (__cdecl* reset_button_map)(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, const char* controller_id);
+    void (__cdecl* power_off_joystick)(const AddonInstance_Peripheral* addonInstance, unsigned int index);
+    ///}
+  } KodiToAddonFuncTable_Peripheral;
+
+  typedef struct AddonInstance_Peripheral
+  {
+    AddonProps_Peripheral props;
+    AddonToKodiFuncTable_Peripheral toKodi;
+    KodiToAddonFuncTable_Peripheral toAddon;
+  } AddonInstance_Peripheral;
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace addon
+{
+
+  class CInstancePeripheral : public IAddonInstance
+  {
+  public:
+    CInstancePeripheral()
+      : IAddonInstance(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!");
+
+      SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
+      CAddonBase::m_interface->globalSingleInstance = this;
+    }
+
+    CInstancePeripheral(KODI_HANDLE instance)
+      : IAddonInstance(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!");
+
+      SetAddonStruct(instance);
+    }
+
+    ~CInstancePeripheral() override = default;
+
+    /// @name Peripheral operations
+    ///{
+    /*!
+     * @brief Get the list of features that this add-on provides
+     * @param capabilities The add-on's capabilities.
+     * @remarks Valid implementation required.
+     *
+     * Called by the frontend to query the add-on's capabilities and supported
+     * peripherals. All capabilities that the add-on supports should be set to true.
+     *
+     */
+    virtual void GetCapabilities(PERIPHERAL_CAPABILITIES &capabilities) { }
+
+    /*!
+     * @brief Perform a scan for joysticks
+     * @param peripheral_count  Assigned to the number of peripherals allocated
+     * @param scan_results      Assigned to allocated memory
+     * @return PERIPHERAL_NO_ERROR if successful; peripherals must be freed using
+     * FreeScanResults() in this case
+     *
+     * The frontend calls this when a hardware change is detected. If an add-on
+     * detects a hardware change, it can trigger this function using the
+     * TriggerScan() callback.
+     */
+    virtual PERIPHERAL_ERROR PerformDeviceScan(unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
+
+    /*!
+     * @brief Free the memory allocated in PerformDeviceScan()
+     *
+     * Must be called if PerformDeviceScan() returns PERIPHERAL_NO_ERROR.
+     *
+     * @param peripheral_count  The number of events allocated for the events array
+     * @param scan_results      The array of allocated peripherals
+     */
+    virtual void FreeScanResults(unsigned int peripheral_count, PERIPHERAL_INFO* scan_results) { }
+
+    /*!
+     * @brief Get all events that have occurred since the last call to GetEvents()
+     * @return PERIPHERAL_NO_ERROR if successful; events must be freed using
+     * FreeEvents() in this case
+     */
+    virtual PERIPHERAL_ERROR GetEvents(unsigned int* event_count, PERIPHERAL_EVENT** events) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
+
+    /*!
+     * @brief Free the memory allocated in GetEvents()
+     *
+     * Must be called if GetEvents() returns PERIPHERAL_NO_ERROR.
+     *
+     * @param event_count  The number of events allocated for the events array
+     * @param events       The array of allocated events
+     */
+    virtual void FreeEvents(unsigned int event_count, PERIPHERAL_EVENT* events) { }
+
+    /*!
+     * @brief Send an input event to the specified peripheral
+     * @param peripheralIndex The index of the device receiving the input event
+     * @param event The input event
+     * @return true if the event was handled, false otherwise
+     */
+    virtual bool SendEvent(const PERIPHERAL_EVENT* event) { return false; }
+    ///}
+
+    /// @name Joystick operations
+    /*!
+     * @note #define PERIPHERAL_ADDON_JOYSTICKS before including kodi_peripheral_dll.h
+     * in the add-on if the add-on provides joysticks and add provides_joysticks="true"
+     * to the kodi.peripheral extension point node in addon.xml.
+     */
+    ///{
+    /*!
+     * @brief Get extended info about an attached joystick
+     * @param index  The joystick's driver index
+     * @param info   The container for the allocated joystick info
+     * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
+     *         FreeJoystickInfo() in this case
+     */
+    virtual PERIPHERAL_ERROR GetJoystickInfo(unsigned int index, JOYSTICK_INFO* info) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
+
+    /*!
+     * @brief Free the memory allocated in GetJoystickInfo()
+     */
+    virtual void FreeJoystickInfo(JOYSTICK_INFO* info) { }
+
+    /*!
+     * @brief Get the features that allow translating the joystick into the controller profile
+     * @param joystick      The device's joystick properties; unknown values may be left at their default
+     * @param controller_id The controller profile being requested, e.g. game.controller.default
+     * @param feature_count The number of features allocated for the features array
+     * @param features      The array of allocated features
+     * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
+     *         FreeButtonMap() in this case
+     */
+    virtual PERIPHERAL_ERROR GetFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
+                                         unsigned int* feature_count, JOYSTICK_FEATURE** features) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
+
+    /*!
+     * @brief Free the memory allocated in GetFeatures()
+     *
+     * Must be called if GetFeatures() returns PERIPHERAL_NO_ERROR.
+     *
+     * @param feature_count  The number of features allocated for the features array
+     * @param features       The array of allocated features
+     */
+    virtual void FreeFeatures(unsigned int feature_count, JOYSTICK_FEATURE* features) { }
+
+    /*!
+     * @brief Add or update joystick features
+     * @param joystick      The device's joystick properties; unknown values may be left at their default
+     * @param controller_id The game controller profile being updated
+     * @param feature_count The number of features in the features array
+     * @param features      The array of features
+     * @return PERIPHERAL_NO_ERROR if successful
+     */
+    virtual PERIPHERAL_ERROR MapFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
+                                         unsigned int feature_count, const JOYSTICK_FEATURE* features) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
+
+    /*!
+     * @brief Get the driver primitives that should be ignored while mapping the device
+     * @param joystick        The device's joystick properties; unknown values may be left at their default
+     * @param primitive_count The number of features allocated for the primitives array
+     * @param primitives      The array of allocated driver primitives to be ignored
+     * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
+     *         FreePrimitives() in this case
+     */
+    virtual PERIPHERAL_ERROR GetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
+                                                  unsigned int* primitive_count,
+                                                  JOYSTICK_DRIVER_PRIMITIVE** primitives) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
+
+    /*!
+     * @brief Free the memory allocated in GetIgnoredPrimitives()
+     *
+     * Must be called if GetIgnoredPrimitives() returns PERIPHERAL_NO_ERROR.
+     *
+     * @param primitive_count  The number of driver primitives allocated for the primitives array
+     * @param primitives       The array of allocated driver primitives
+     */
+    virtual void FreePrimitives(unsigned int primitive_count, JOYSTICK_DRIVER_PRIMITIVE* primitives) { }
+
+    /*!
+     * @brief Set the list of driver primitives that are ignored for the device
+     * @param joystick         The device's joystick properties; unknown values may be left at their default
+     * @param primitive_count  The number of driver features in the primitives array
+     * @param primitives       The array of driver primitives to ignore
+     * @return PERIPHERAL_NO_ERROR if successful
+     */
+    virtual PERIPHERAL_ERROR SetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
+                                                  unsigned int primitive_count,
+                                                  const JOYSTICK_DRIVER_PRIMITIVE* primitives) { return PERIPHERAL_ERROR_NOT_IMPLEMENTED; }
+
+    /*!
+     * @brief Save the button map for the given joystick
+     * @param joystick      The device's joystick properties
+     */
+    virtual void SaveButtonMap(const JOYSTICK_INFO* joystick) { }
+
+    /*!
+     * @brief Revert the button map to the last time it was loaded or committed to disk
+     * @param joystick      The device's joystick properties
+     */
+    virtual void RevertButtonMap(const JOYSTICK_INFO* joystick) { }
+
+    /*!
+     * @brief Reset the button map for the given joystick and controller profile ID
+     * @param joystick      The device's joystick properties
+     * @param controller_id The game controller profile being reset
+     */
+    virtual void ResetButtonMap(const JOYSTICK_INFO* joystick, const char* controller_id) { }
+
+    /*!
+     * @brief Powers off the given joystick if supported
+     * @param index  The joystick's driver index
+     */
+    virtual void PowerOffJoystick(unsigned int index) { }
+
+    const std::string AddonPath() const
+    {
+      return m_instanceData->props.addon_path;
+    }
+
+    const std::string UserPath() const
+    {
+      return m_instanceData->props.user_path;
+    }
+
+    /*!
+     * @brief Trigger a scan for peripherals
+     *
+     * The add-on calls this if a change in hardware is detected.
+     */
+    void TriggerScan(void)
+    {
+      return m_instanceData->toKodi.trigger_scan(m_instanceData->toKodi.kodiInstance);
+    }
+
+    /*!
+     * @brief Notify the frontend that button maps have changed
+     *
+     * @param[optional] deviceName The name of the device to refresh, or empty/null for all devices
+     * @param[optional] controllerId The controller ID to refresh, or empty/null for all controllers
+     */
+    void RefreshButtonMaps(const std::string& strDeviceName = "", const std::string& strControllerId = "")
+    {
+      return m_instanceData->toKodi.refresh_button_maps(m_instanceData->toKodi.kodiInstance, strDeviceName.c_str(), strControllerId.c_str());
+    }
+
+    /*!
+     * @brief Return the number of features belonging to the specified controller
+     *
+     * @param controllerId    The controller ID to enumerate
+     * @param type[optional]  Type to filter by, or JOYSTICK_FEATURE_TYPE_UNKNOWN for all features
+     *
+     * @return The number of features matching the request parameters
+     */
+    unsigned int FeatureCount(const std::string& strControllerId, JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN)
+    {
+      return m_instanceData->toKodi.feature_count(m_instanceData->toKodi.kodiInstance, strControllerId.c_str(), type);
+    }
+
+  private:
+    void SetAddonStruct(KODI_HANDLE instance)
+    {
+      if (instance == nullptr)
+        throw std::logic_error("kodi::addon::CInstancePeripheral: Creation with empty addon structure not allowed, table must be given from Kodi!");
+
+      m_instanceData = static_cast<AddonInstance_Peripheral*>(instance);
+      m_instanceData->toAddon.addonInstance = this;
+
+      m_instanceData->toAddon.get_capabilities = ADDON_GetCapabilities;
+      m_instanceData->toAddon.perform_device_scan = ADDON_PerformDeviceScan;
+      m_instanceData->toAddon.free_scan_results = ADDON_FreeScanResults;
+      m_instanceData->toAddon.get_events = ADDON_GetEvents;
+      m_instanceData->toAddon.free_events = ADDON_FreeEvents;
+      m_instanceData->toAddon.send_event = ADDON_SendEvent;
+
+      m_instanceData->toAddon.get_joystick_info = ADDON_GetJoystickInfo;
+      m_instanceData->toAddon.free_joystick_info = ADDON_FreeJoystickInfo;
+      m_instanceData->toAddon.get_features = ADDON_GetFeatures;
+      m_instanceData->toAddon.free_features = ADDON_FreeFeatures;
+      m_instanceData->toAddon.map_features = ADDON_MapFeatures;
+      m_instanceData->toAddon.get_ignored_primitives = ADDON_GetIgnoredPrimitives;
+      m_instanceData->toAddon.free_primitives = ADDON_FreePrimitives;
+      m_instanceData->toAddon.set_ignored_primitives = ADDON_SetIgnoredPrimitives;
+      m_instanceData->toAddon.save_button_map = ADDON_SaveButtonMap;
+      m_instanceData->toAddon.revert_button_map = ADDON_RevertButtonMap;
+      m_instanceData->toAddon.reset_button_map = ADDON_ResetButtonMap;
+      m_instanceData->toAddon.power_off_joystick = ADDON_PowerOffJoystick;
+    }
+
+    inline static void ADDON_GetCapabilities(const AddonInstance_Peripheral* addonInstance, PERIPHERAL_CAPABILITIES *capabilities)
+    {
+      addonInstance->toAddon.addonInstance->GetCapabilities(*capabilities);
+    }
+
+    inline static PERIPHERAL_ERROR ADDON_PerformDeviceScan(const AddonInstance_Peripheral* addonInstance, unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results)
+    {
+      return addonInstance->toAddon.addonInstance->PerformDeviceScan(peripheral_count, scan_results);
+    }
+
+    inline static void ADDON_FreeScanResults(const AddonInstance_Peripheral* addonInstance, unsigned int peripheral_count, PERIPHERAL_INFO* scan_results)
+    {
+      addonInstance->toAddon.addonInstance->FreeScanResults(peripheral_count, scan_results);
+    }
+
+    inline static PERIPHERAL_ERROR ADDON_GetEvents(const AddonInstance_Peripheral* addonInstance, unsigned int* event_count, PERIPHERAL_EVENT** events)
+    {
+      return addonInstance->toAddon.addonInstance->GetEvents(event_count, events);
+    }
+
+    inline static void ADDON_FreeEvents(const AddonInstance_Peripheral* addonInstance, unsigned int event_count, PERIPHERAL_EVENT* events)
+    {
+      addonInstance->toAddon.addonInstance->FreeEvents(event_count, events);
+    }
+
+    inline static bool ADDON_SendEvent(const AddonInstance_Peripheral* addonInstance, const PERIPHERAL_EVENT* event)
+    {
+      return addonInstance->toAddon.addonInstance->SendEvent(event);
+    }
+
+    
+    inline static PERIPHERAL_ERROR ADDON_GetJoystickInfo(const AddonInstance_Peripheral* addonInstance, unsigned int index, JOYSTICK_INFO* info)
+    {
+      return addonInstance->toAddon.addonInstance->GetJoystickInfo(index, info);
+    }
+
+    inline static void ADDON_FreeJoystickInfo(const AddonInstance_Peripheral* addonInstance, JOYSTICK_INFO* info)
+    {
+      addonInstance->toAddon.addonInstance->FreeJoystickInfo(info);
+    }
+
+    inline static PERIPHERAL_ERROR ADDON_GetFeatures(const AddonInstance_Peripheral* addonInstance,
+                                                     const JOYSTICK_INFO* joystick, const char* controller_id,
+                                                     unsigned int* feature_count, JOYSTICK_FEATURE** features)
+    {
+      return addonInstance->toAddon.addonInstance->GetFeatures(joystick, controller_id, feature_count, features);
+    }
+
+    inline static void ADDON_FreeFeatures(const AddonInstance_Peripheral* addonInstance, unsigned int feature_count, JOYSTICK_FEATURE* features)
+    {
+      addonInstance->toAddon.addonInstance->FreeFeatures(feature_count, features);
+    }
+
+    inline static PERIPHERAL_ERROR ADDON_MapFeatures(const AddonInstance_Peripheral* addonInstance,
+                                                     const JOYSTICK_INFO* joystick, const char* controller_id,
+                                                     unsigned int feature_count, const JOYSTICK_FEATURE* features)
+    {
+      return addonInstance->toAddon.addonInstance->MapFeatures(joystick, controller_id, feature_count, features);
+    }
+
+    inline static PERIPHERAL_ERROR ADDON_GetIgnoredPrimitives(const AddonInstance_Peripheral* addonInstance,
+                                                              const JOYSTICK_INFO* joystick, unsigned int* primitive_count,
+                                                              JOYSTICK_DRIVER_PRIMITIVE** primitives)
+    {
+      return addonInstance->toAddon.addonInstance->GetIgnoredPrimitives(joystick, primitive_count, primitives);
+    }
+
+    inline static void ADDON_FreePrimitives(const AddonInstance_Peripheral* addonInstance,
+                                            unsigned int primitive_count, JOYSTICK_DRIVER_PRIMITIVE* primitives)
+    {
+      addonInstance->toAddon.addonInstance->FreePrimitives(primitive_count, primitives);
+    }
+
+    inline static PERIPHERAL_ERROR ADDON_SetIgnoredPrimitives(const AddonInstance_Peripheral* addonInstance,
+                                                              const JOYSTICK_INFO* joystick, unsigned int primitive_count,
+                                                              const JOYSTICK_DRIVER_PRIMITIVE* primitives)
+    {
+      return addonInstance->toAddon.addonInstance->SetIgnoredPrimitives(joystick, primitive_count, primitives);
+    }
+
+    inline static void ADDON_SaveButtonMap(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick)
+    {
+      addonInstance->toAddon.addonInstance->SaveButtonMap(joystick);
+    }
+
+    inline static void ADDON_RevertButtonMap(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick)
+    {
+      addonInstance->toAddon.addonInstance->RevertButtonMap(joystick);
+    }
+
+    inline static void ADDON_ResetButtonMap(const AddonInstance_Peripheral* addonInstance, const JOYSTICK_INFO* joystick, const char* controller_id)
+    {
+      addonInstance->toAddon.addonInstance->ResetButtonMap(joystick, controller_id);
+    }
+
+    inline static void ADDON_PowerOffJoystick(const AddonInstance_Peripheral* addonInstance, unsigned int index)
+    {
+      addonInstance->toAddon.addonInstance->PowerOffJoystick(index);
+    }
+
+    AddonInstance_Peripheral* m_instanceData;
+  };
+
+} /* namespace addon */
+} /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
index 2106d19..8cfa91b 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "kodi_peripheral_types.h"
+#include "Peripheral.h"
 
 #include <array> // Requires c++11
 #include <cstring>
@@ -30,7 +30,9 @@
 #define PERIPHERAL_SAFE_DELETE(x)        do { delete   (x); (x) = NULL; } while (0)
 #define PERIPHERAL_SAFE_DELETE_ARRAY(x)  do { delete[] (x); (x) = NULL; } while (0)
 
-namespace ADDON
+namespace kodi
+{
+namespace addon
 {
   /*!
    * Utility class to manipulate arrays of peripheral types.
@@ -111,7 +113,7 @@ namespace ADDON
     {
     }
 
-    virtual ~Peripheral(void) { }
+    virtual ~Peripheral(void) = default;
 
     PERIPHERAL_TYPE    Type(void) const      { return m_type; }
     const std::string& Name(void) const      { return m_strName; }
@@ -232,7 +234,7 @@ namespace ADDON
   typedef PeripheralVector<PeripheralEvent, PERIPHERAL_EVENT> PeripheralEvents;
 
   /*!
-   * ADDON::Joystick
+   * kodi::addon::Joystick
    *
    * Wrapper class providing additional joystick information not provided by
    * ADDON::Peripheral.
@@ -269,7 +271,7 @@ namespace ADDON
     {
     }
 
-    virtual ~Joystick(void) { }
+    ~Joystick(void) override = default;
 
     Joystick& operator=(const Joystick& rhs)
     {
@@ -570,7 +572,7 @@ namespace ADDON
   typedef PeripheralVector<DriverPrimitive, JOYSTICK_DRIVER_PRIMITIVE> DriverPrimitives;
 
   /*!
-   * ADDON::JoystickFeature
+   * kodi::addon::JoystickFeature
    *
    * Class for joystick features. A feature can be:
    *
@@ -660,4 +662,7 @@ namespace ADDON
   };
 
   typedef PeripheralVector<JoystickFeature, JOYSTICK_FEATURE> JoystickFeatures;
-}
+
+} /* namespace addon */
+} /* namespace kodi */
+
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 39baae7..85cd7bc 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
@@ -28,6 +28,11 @@ extern "C"
 
 struct AddonInstance_Screensaver;
 
+/*!
+ * @brief Screensaver properties
+ *
+ * Not to be used outside this header.
+ */
 typedef struct AddonProps_Screensaver
 {
   void *device;
@@ -41,11 +46,21 @@ typedef struct AddonProps_Screensaver
   const char *profile;
 } AddonProps_Screensaver;
 
+/*!
+ * @brief Screensaver callbacks
+ *
+ * Not to be used outside this header.
+ */
 typedef struct AddonToKodiFuncTable_Screensaver
 {
   KODI_HANDLE kodiInstance;
 } AddonToKodiFuncTable_Screensaver;
 
+/*!
+ * @brief Screensaver function hooks
+ *
+ * Not to be used outside this header.
+ */
 typedef struct KodiToAddonFuncTable_Screensaver
 {
   kodi::addon::CInstanceScreensaver* addonInstance;
@@ -54,6 +69,11 @@ typedef struct KodiToAddonFuncTable_Screensaver
   void (__cdecl* Render) (AddonInstance_Screensaver* instance);
 } KodiToAddonFuncTable_Screensaver;
 
+/*!
+ * @brief Screensaver instance
+ *
+ * Not to be used outside this header.
+ */
 typedef struct AddonInstance_Screensaver
 {
   AddonProps_Screensaver props;
@@ -68,9 +88,157 @@ namespace kodi
 namespace addon
 {
 
+  //============================================================================
+  ///
+  /// \addtogroup cpp_kodi_addon_screensaver
+  /// @brief \cpp_class{ kodi::addon::CInstanceScreensaver }
+  /// **Screensaver add-on instance**
+  ///
+  /// A screensaver is a Kodi addon that fills the screen with moving images or
+  /// patterns when the computer is not in use. Initially designed to prevent
+  /// phosphor burn-in on CRT and plasma computer monitors (hence the name),
+  /// screensavers are now used primarily for entertainment, security or to
+  /// display system status information.
+  ///
+  /// Include the header \ref ScreenSaver.h "#include <kodi/addon-instance/ScreenSaver.h>"
+  /// to use this class.
+  ///
+  /// This interface allows the creating of screensavers for Kodi, based upon
+  /// **DirectX** or/and **OpenGL** rendering with `C++` code.
+  ///
+  /// The interface is small and easy usable. It has three functions:
+  ///
+  /// * <b><c>Start()</c></b> - Called on creation
+  /// * <b><c>Render()</c></b> - Called at render time
+  /// * <b><c>Stop()</c></b> - Called when the screensaver has no work
+  ///
+  /// Additionally, there are several \ref cpp_kodi_addon_screensaver_CB "other functions"
+  /// available in which the child class can ask about the current hardware,
+  /// including the device, display and several other parts.
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  ///
+  /// **Here is an example of the minimum required code to start a screensaver:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/Screensaver.h>
+  ///
+  /// class CMyScreenSaver : public kodi::addon::CAddonBase,
+  ///                        public kodi::addon::CInstanceScreensaver
+  /// {
+  /// public:
+  ///   CMyScreenSaver();
+  ///
+  ///   bool Start() override;
+  ///   void Render() override;
+  /// };
+  ///
+  /// CMyScreenSaver::CMyScreenSaver()
+  /// {
+  ///   ...
+  /// }
+  ///
+  /// bool CMyScreenSaver::Start()
+  /// {
+  ///   ...
+  ///   return true;
+  /// }
+  ///
+  /// void CMyScreenSaver::Render()
+  /// {
+  ///   ...
+  /// }
+  ///
+  /// ADDONCREATOR(CMyScreenSaver)
+  /// ~~~~~~~~~~~~~
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  ///
+  /// **Here is another example where the screensaver is used together with
+  /// other instance types:**
+  ///
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/Screensaver.h>
+  ///
+  /// class CMyScreenSaver : public ::kodi::addon::CInstanceScreensaver
+  /// {
+  /// public:
+  ///   CMyScreenSaver(KODI_HANDLE instance);
+  ///
+  ///   bool Start() override;
+  ///   void Render() override;
+  /// };
+  ///
+  /// CMyScreenSaver::CMyScreenSaver(KODI_HANDLE instance)
+  ///   : CInstanceScreensaver(instance)
+  /// {
+  ///   ...
+  /// }
+  ///
+  /// bool CMyScreenSaver::Start()
+  /// {
+  ///   ...
+  ///   return true;
+  /// }
+  ///
+  /// void CMyScreenSaver::Render()
+  /// {
+  ///   ...
+  /// }
+  ///
+  ///
+  /// /*----------------------------------------------------------------------*/
+  ///
+  /// 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_SCREENSAVER)
+  ///   {
+  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Screensaver");
+  ///     addonInstance = new CMyScreenSaver(instance);
+  ///     return ADDON_STATUS_OK;
+  ///   }
+  ///   else if (...)
+  ///   {
+  ///     ...
+  ///   }
+  ///   return ADDON_STATUS_UNKNOWN;
+  /// }
+  ///
+  /// ADDONCREATOR(CMyAddon)
+  /// ~~~~~~~~~~~~~
+  ///
+  /// The destruction of the example class `CMyScreenSaver` is called from
+  /// Kodi's header. Manually deleting the add-on instance is not required.
+  ///
+  //----------------------------------------------------------------------------
   class CInstanceScreensaver : public IAddonInstance
   {
   public:
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver
+    /// @brief Screensaver class constructor
+    ///
+    /// Used by an add-on that only supports screensavers.
+    ///
     CInstanceScreensaver()
       : IAddonInstance(ADDON_INSTANCE_SCREENSAVER)
     {
@@ -80,7 +248,19 @@ namespace addon
       SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
       CAddonBase::m_interface->globalSingleInstance = this;
     }
+    //--------------------------------------------------------------------------
 
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver
+    /// @brief Screensaver class constructor used to support multiple instance
+    /// types
+    ///
+    /// @param[in] instance               The instance value given to
+    ///                                   <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+    ///
+    /// @warning Only use `instance` from the CreateInstance call
+    ///
     CInstanceScreensaver(KODI_HANDLE instance)
       : IAddonInstance(ADDON_INSTANCE_SCREENSAVER)
     {
@@ -89,22 +269,150 @@ namespace addon
 
       SetAddonStruct(instance);
     }
+    //--------------------------------------------------------------------------
 
-    virtual ~CInstanceScreensaver() { }
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver
+    /// @brief Destructor
+    ///
+    ~CInstanceScreensaver() override = default;
+    //--------------------------------------------------------------------------
 
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver
+    /// @brief Used to notify the screensaver that it has been started
+    ///
+    /// @return                         true if the screensaver was started
+    ///                                 successfully, false otherwise
+    ///
     virtual bool Start() { return true; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver
+    /// @brief Used to inform the screensaver that the rendering control was
+    /// stopped
+    ///
     virtual void Stop() {}
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver
+    /// @brief Used to indicate when the add-on should render
+    ///
     virtual void Render() {}
+    //--------------------------------------------------------------------------
 
+    //==========================================================================
+    ///
+    /// \defgroup cpp_kodi_addon_screensaver_CB Information functions
+    /// \ingroup cpp_kodi_addon_screensaver
+    /// @brief **To get info about the device, display and several other parts**
+    ///
+    //@{
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Device that represents the display adapter
+    ///
+    /// @return A pointer to the device
+    ///
+    /// @note This is only available on **DirectX**, It us unused (`nullptr`) on
+    /// **OpenGL**
+    ///
     inline void* Device() { return m_instanceData->props.device; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Returns the X position of the rendering window
+    ///
+    /// @return The X position, in pixels
+    ///
     inline int X() { return m_instanceData->props.x; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Returns the Y position of the rendering window
+    ///
+    /// @return The Y position, in pixels
+    ///
     inline int Y() { return m_instanceData->props.y; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Returns the width of the rendering window
+    ///
+    /// @return The width, in pixels
+    ///
     inline int Width() { return m_instanceData->props.width; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Returns the height of the rendering window
+    ///
+    /// @return The height, in pixels
+    ///
     inline int Height() { return m_instanceData->props.height; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Pixel aspect ratio (often abbreviated PAR) is a ratio that
+    /// describes how the width of a pixel compares to the height of that pixel.
+    ///
+    /// @return The pixel aspect ratio used by the display
+    ///
     inline float PixelRatio() { return m_instanceData->props.pixelRatio; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Used to get the name of the add-on defined in `addon.xml`
+    ///
+    /// @return The add-on name
+    ///
     inline std::string Name() { return m_instanceData->props.name; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Used to get the full path where the add-on is installed
+    ///
+    /// @return The add-on installation path
+    ///
     inline std::string Presets() { return m_instanceData->props.presets; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_screensaver_CB
+    /// @brief Used to get the full path to the add-on's user profile
+    ///
+    /// @note The trailing folder (consisting of the add-on's ID) is not created
+    /// by default. If it is needed, you must call kodi::vfs::CreateDirectory()
+    /// to create the folder.
+    ///
+    /// @return Path to the user profile
+    ///
     inline std::string Profile() { return m_instanceData->props.profile; }
+    //--------------------------------------------------------------------------
+    //@}
 
   private:
     void SetAddonStruct(KODI_HANDLE instance)
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
new file mode 100644
index 0000000..4bb3e69
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h
@@ -0,0 +1,622 @@
+#pragma once
+/*
+ *      Copyright (C) 2015 Team Kodi
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../AddonBase.h"
+#include "../Filesystem.h"
+
+#ifdef BUILD_KODI_ADDON
+#include "../IFileTypes.h"
+#else
+#include "filesystem/IFileTypes.h"
+#include "PlatformDefs.h"
+#endif
+
+namespace kodi { namespace addon { class CInstanceVFS; }}
+
+extern "C"
+{
+
+  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;
+  };
+
+  typedef struct VFSGetDirectoryCallbacks /* internal */
+  {
+    bool (__cdecl* get_keyboard_input)(void* ctx, const char* heading, char** input, bool hidden_input);
+    void (__cdecl* set_error_dialog)(void* ctx, const char* heading, const char* line1, const char* line2, const char* line3);
+    void (__cdecl* require_authentication)(void* ctx, const char* url);
+    void* ctx;
+  } VFSGetDirectoryCallbacks;
+
+  typedef struct AddonProps_VFSEntry /* internal */
+  {
+    int dummy;
+  } AddonProps_VFSEntry;
+
+  typedef struct AddonToKodiFuncTable_VFSEntry /* internal */
+  {
+    KODI_HANDLE kodiInstance;
+  } AddonToKodiFuncTable_VFSEntry;
+
+  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,
+                                  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);
+  } KodiToAddonFuncTable_VFSEntry;
+
+  typedef struct AddonInstance_VFSEntry /* internal */
+  {
+    AddonProps_VFSEntry props;
+    AddonToKodiFuncTable_VFSEntry toKodi;
+    KodiToAddonFuncTable_VFSEntry toAddon;
+  } AddonInstance_VFSEntry;
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace addon
+{
+  class CInstanceVFS : public IAddonInstance
+  {
+  public:
+    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}
+    ///
+    /// #include <kodi/addon-instance/VFS.h>
+    ///
+    /// ...
+    ///
+    /// 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
+    {
+    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)
+      {
+        m_cb->require_authentication(m_cb->ctx, url.c_str());
+      }
+
+      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)
+    ///
+    /// @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
+    ///
+    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)
+    {
+      return instance->toAddon.addonInstance->Open(*url);
+    }
+
+    inline static void* ADDON_OpenForWrite(const AddonInstance_VFSEntry* instance, const VFSURL* url, bool overWrite)
+    {
+      return instance->toAddon.addonInstance->OpenForWrite(*url, overWrite);
+    }
+
+    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);
+    }
+
+    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);
+    }
+
+    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);
+    }
+
+    inline static int ADDON_Truncate(const AddonInstance_VFSEntry* instance, void* context, int64_t size)
+    {
+      return instance->toAddon.addonInstance->Truncate(context, size);
+    }
+
+    inline static int64_t ADDON_GetLength(const AddonInstance_VFSEntry* instance, void* context)
+    {
+      return instance->toAddon.addonInstance->GetLength(context);
+    }
+
+    inline static int64_t ADDON_GetPosition(const AddonInstance_VFSEntry* instance, void* context)
+    {
+      return instance->toAddon.addonInstance->GetPosition(context);
+    }
+
+    inline static int ADDON_GetChunkSize(const AddonInstance_VFSEntry* instance, void* context)
+    {
+      return instance->toAddon.addonInstance->GetChunkSize(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_Stat(const AddonInstance_VFSEntry* instance, const VFSURL* url, struct __stat64* buffer)
+    {
+      return instance->toAddon.addonInstance->Stat(*url, buffer);
+    }
+
+    inline static bool ADDON_Close(const AddonInstance_VFSEntry* instance, void* context)
+    {
+      return instance->toAddon.addonInstance->Close(context);
+    }
+
+    inline static bool ADDON_Exists(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+    {
+      return instance->toAddon.addonInstance->Exists(*url);
+    }
+
+    inline static void ADDON_ClearOutIdle(const AddonInstance_VFSEntry* instance)
+    {
+      return instance->toAddon.addonInstance->ClearOutIdle();
+    }
+
+    inline static void ADDON_DisconnectAll(const AddonInstance_VFSEntry* instance)
+    {
+      return instance->toAddon.addonInstance->DisconnectAll();
+    }
+
+    inline static bool ADDON_Delete(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+    {
+      return instance->toAddon.addonInstance->Delete(*url);
+    }
+
+    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_DirectoryExists(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+    {
+      return instance->toAddon.addonInstance->DirectoryExists(*url);
+    }
+
+    inline static bool ADDON_RemoveDirectory(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+    {
+      return instance->toAddon.addonInstance->RemoveDirectory(*url);
+    }
+
+    inline static bool ADDON_CreateDirectory(const AddonInstance_VFSEntry* instance, const VFSURL* url)
+    {
+      return 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 = instance->toAddon.addonInstance->GetDirectory(*url, addonEntries, callbacks);
+      if (ret)
+      {
+        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].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[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 = addonEntries.size();
+      }
+      return ret;
+    }
+
+    inline static void ADDON_FreeDirectory(const AddonInstance_VFSEntry* instance, VFSDirEntry* entries, int num_entries)
+    {
+      for (int i = 0; i < num_entries; ++i)
+      {
+        if (entries[i].properties)
+        {
+          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].label);
+        free(entries[i].title);
+        free(entries[i].path);
+      }
+      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 = instance->toAddon.addonInstance->ContainsFiles(*url, addonEntries, cppRootPath);
+      if (ret)
+      {
+        strncpy(rootpath, cppRootPath.c_str(), ADDON_STANDARD_STRING_LENGTH);
+
+        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].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[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 = addonEntries.size();
+      }
+      return ret;
+    }
+
+    AddonInstance_VFSEntry* m_instanceData;
+  };
+
+} /* namespace addon */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..710fda0
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h
@@ -0,0 +1,256 @@
+/*
+ *      Copyright (C) 2017 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include "../AddonBase.h"
+#include "../StreamCrypto.h"
+#include "../StreamCodec.h"
+
+#ifdef BUILD_KODI_ADDON
+#include "../DVDDemuxPacket.h"
+#else
+#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
+#endif
+
+namespace kodi { namespace addon { class CInstanceVideoCodec; } }
+
+extern "C"
+{
+  enum VIDEOCODEC_FORMAT
+  {
+    UnknownVideoFormat = 0,
+    VideoFormatYV12,
+    VideoFormatI420,
+    MaxVideoFormats
+  };
+
+
+  struct VIDEOCODEC_INITDATA
+  {
+    enum Codec {
+      CodecUnknown = 0,
+      CodecVp8,
+      CodecH264,
+      CodecVp9
+    } codec;
+
+    STREAMCODEC_PROFILE codecProfile;
+    
+    //UnknownVideoFormat is terminator
+    VIDEOCODEC_FORMAT *videoFormats;
+
+    uint32_t width, height;
+    
+    const uint8_t *extraData;
+    unsigned int extraDataSize;
+
+    CRYPTO_INFO cryptoInfo;
+  };
+
+  struct VIDEOCODEC_PICTURE
+  {
+    enum VideoPlane {
+      YPlane = 0,
+      UPlane,
+      VPlane,
+      MaxPlanes = 3,
+    };
+
+    enum Flags : uint32_t {
+      FLAG_DROP,
+      FLAG_DRAIN
+    };
+
+    VIDEOCODEC_FORMAT videoFormat;
+    uint32_t flags;
+
+    uint32_t width, height;
+
+    uint8_t *decodedData;
+    size_t decodedDataSize;
+
+    uint32_t planeOffsets[VideoPlane::MaxPlanes];
+    uint32_t stride[VideoPlane::MaxPlanes];
+
+    int64_t pts;
+
+    void *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_BUFFER,          //< the decoder needs more data
+    VC_PICTURE,         //< the decoder got a picture
+    VC_EOF,             //< the decoder signals EOF
+  };
+
+  // this are properties given to the addon on create
+  // at this time we have no parameters for the addon
+  typedef struct AddonProps_VideoCodec
+  {
+    int dummy;
+  } AddonProps_VideoCodec;
+
+  struct AddonInstance_VideoCodec;
+  typedef struct KodiToAddonFuncTable_VideoCodec
+  {
+    kodi::addon::CInstanceVideoCodec* addonInstance;
+
+    //! \brief Opens a codec
+    bool (__cdecl* open) (const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData);
+
+    //! \brief Reconfigures a codec
+    bool (__cdecl* reconfigure) (const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData);
+
+    //! \brief Feed codec if requested from GetPicture() (return VC_BUFFER)
+    bool (__cdecl* add_data) (const AddonInstance_VideoCodec* instance, const DemuxPacket *packet);
+
+    //! \brief Get a decoded picture / request new data
+    VIDEOCODEC_RETVAL (__cdecl* get_picture) (const AddonInstance_VideoCodec* instance, VIDEOCODEC_PICTURE *picture);
+
+    //! \brief Get the name of this video decoder
+    const char *(__cdecl* get_name) (const AddonInstance_VideoCodec* instance);
+
+    //! \brief Reset the codec
+    void (__cdecl* reset)(const AddonInstance_VideoCodec* instance);
+  } KodiToAddonFuncTable_VideoCodec;
+
+  typedef struct AddonToKodiFuncTable_VideoCodec
+  {
+    KODI_HANDLE kodiInstance;
+    bool(*get_frame_buffer)(void* kodiInstance, VIDEOCODEC_PICTURE *picture);
+    void(*release_frame_buffer)(void* kodiInstance, void *buffer);
+  } AddonToKodiFuncTable_VideoCodec;
+
+  typedef struct AddonInstance_VideoCodec
+  {
+    AddonProps_VideoCodec props;
+    AddonToKodiFuncTable_VideoCodec toKodi;
+    KodiToAddonFuncTable_VideoCodec toAddon;
+  } AddonInstance_VideoCodec;
+}
+
+namespace kodi
+{
+  namespace addon
+  {
+
+    class CInstanceVideoCodec : public IAddonInstance
+    {
+    public:
+      CInstanceVideoCodec(KODI_HANDLE instance)
+        : IAddonInstance(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!");
+
+        SetAddonStruct(instance);
+      }
+
+      ~CInstanceVideoCodec() override = default;
+
+      //! \copydoc CInstanceVideoCodec::Open
+      virtual bool Open(VIDEOCODEC_INITDATA &initData) { return false; };
+
+      //! \copydoc CInstanceVideoCodec::Reconfigure
+      virtual bool Reconfigure(VIDEOCODEC_INITDATA &initData) { return false; };
+
+      //! \copydoc CInstanceVideoCodec::AddData
+      virtual bool AddData(const DemuxPacket &packet) { return false; };
+
+      //! \copydoc CInstanceVideoCodec::GetPicture
+      virtual VIDEOCODEC_RETVAL GetPicture(VIDEOCODEC_PICTURE &picture) { return VC_ERROR; };
+
+      //! \copydoc CInstanceVideoCodec::GetName
+      virtual const char *GetName() { return nullptr; };
+
+      //! \copydoc CInstanceVideoCodec::Reset
+      virtual void Reset() {};
+
+      /*!
+      * @brief AddonToKodi interface
+      */
+
+      //! \copydoc CInstanceVideoCodec::GetFrameBuffer
+      bool GetFrameBuffer(VIDEOCODEC_PICTURE &picture)
+      {
+        return m_instanceData->toKodi.get_frame_buffer(m_instanceData->toKodi.kodiInstance, &picture);
+      }
+
+      //! \copydoc CInstanceVideoCodec::ReleaseFrameBuffer
+      void ReleaseFrameBuffer(void *buffer)
+      {
+        return m_instanceData->toKodi.release_frame_buffer(m_instanceData->toKodi.kodiInstance, buffer);
+      }
+
+    private:
+      void SetAddonStruct(KODI_HANDLE instance)
+      {
+        if (instance == nullptr)
+          throw std::logic_error("kodi::addon::CInstanceVideoCodec: Creation with empty addon structure not allowed, table must be given from Kodi!");
+
+        m_instanceData = static_cast<AddonInstance_VideoCodec*>(instance);
+
+        m_instanceData->toAddon.addonInstance = this;
+        m_instanceData->toAddon.open = ADDON_Open;
+        m_instanceData->toAddon.reconfigure = ADDON_Reconfigure;
+        m_instanceData->toAddon.add_data = ADDON_AddData;
+        m_instanceData->toAddon.get_picture = ADDON_GetPicture;
+        m_instanceData->toAddon.get_name = ADDON_GetName;
+        m_instanceData->toAddon.reset = ADDON_Reset;
+      }
+
+      inline static bool ADDON_Open(const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData)
+      {
+        return instance->toAddon.addonInstance->Open(*initData);
+      }
+
+      inline static bool ADDON_Reconfigure(const AddonInstance_VideoCodec* instance, VIDEOCODEC_INITDATA *initData)
+      {
+        return instance->toAddon.addonInstance->Reconfigure(*initData);
+      }
+
+      inline static bool ADDON_AddData(const AddonInstance_VideoCodec* instance, const DemuxPacket *packet)
+      {
+        return instance->toAddon.addonInstance->AddData(*packet);
+      }
+
+      inline static VIDEOCODEC_RETVAL ADDON_GetPicture(const AddonInstance_VideoCodec* instance, VIDEOCODEC_PICTURE *picture)
+      {
+        return instance->toAddon.addonInstance->GetPicture(*picture);
+      }
+
+      inline static const char *ADDON_GetName(const AddonInstance_VideoCodec* instance)
+      {
+        return instance->toAddon.addonInstance->GetName();
+      }
+
+      inline static void ADDON_Reset(const AddonInstance_VideoCodec* instance)
+      {
+        return instance->toAddon.addonInstance->Reset();
+      }
+
+      AddonInstance_VideoCodec* m_instanceData;
+    };
+  } // namespace addon
+} // namespace kodi
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
new file mode 100644
index 0000000..b1ded64
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h
@@ -0,0 +1,766 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/*
+ * Parts with a comment named "internal" are only used inside header and not
+ * used or accessed direct during add-on development!
+ */
+
+#include "../AddonBase.h"
+
+namespace kodi { namespace addon { class CInstanceVisualization; }}
+
+extern "C"
+{
+
+struct AddonInstance_Visualization;
+
+typedef enum VIS_ACTION : unsigned int /* internal */
+{ 
+  VIS_ACTION_NONE = 0,
+  VIS_ACTION_NEXT_PRESET,
+  VIS_ACTION_PREV_PRESET,
+  VIS_ACTION_LOAD_PRESET,
+  VIS_ACTION_RANDOM_PRESET,
+  VIS_ACTION_LOCK_PRESET,
+  VIS_ACTION_RATE_PRESET_PLUS,
+  VIS_ACTION_RATE_PRESET_MINUS,
+  VIS_ACTION_UPDATE_ALBUMART,
+  VIS_ACTION_UPDATE_TRACK
+} VIS_ACTION;
+
+struct VIS_INFO /* internal */
+{
+  bool bWantsFreq;
+  int iSyncDelay;
+};
+
+typedef struct AddonProps_Visualization /* internal */
+{
+  void *device;
+  int x;
+  int y;
+  int width;
+  int height;
+  float pixelRatio;
+  const char *name;
+  const char *presets;
+  const char *profile;
+} AddonProps_Visualization;
+
+typedef struct AddonToKodiFuncTable_Visualization /* internal */
+{
+  KODI_HANDLE kodiInstance;
+  void (__cdecl* transfer_preset) (void* kodiInstance, const char* preset);
+} AddonToKodiFuncTable_Visualization;
+
+typedef struct KodiToAddonFuncTable_Visualization /* internal */
+{
+  kodi::addon::CInstanceVisualization* addonInstance;
+  bool (__cdecl* start)(const AddonInstance_Visualization* instance, int channels, int samples_per_sec, int bits_per_sample, const char* song_name);
+  void (__cdecl* stop)(const AddonInstance_Visualization* instance);
+  void (__cdecl* audio_data)(const AddonInstance_Visualization* instance, const float* audio_data, int audio_data_length, float *freq_data, int freq_data_length);
+  bool (__cdecl* is_dirty)(const AddonInstance_Visualization* instance);
+  void (__cdecl* render)(const AddonInstance_Visualization* instance);
+  void (__cdecl* get_info)(const AddonInstance_Visualization* instance, VIS_INFO *info);
+  bool (__cdecl* on_action)(const AddonInstance_Visualization* instance, VIS_ACTION action, const void *param);
+  unsigned int (__cdecl *get_presets)(const AddonInstance_Visualization* instance);
+  int (__cdecl *get_active_preset)(const AddonInstance_Visualization* instance);
+  bool (__cdecl* is_locked)(const AddonInstance_Visualization* instance);
+} KodiToAddonFuncTable_Visualization;
+
+typedef struct AddonInstance_Visualization /* internal */
+{
+  AddonProps_Visualization props;
+  AddonToKodiFuncTable_Visualization toKodi;
+  KodiToAddonFuncTable_Visualization toAddon;
+} AddonInstance_Visualization;
+
+//============================================================================
+/// \defgroup cpp_kodi_addon_visualization_VisTrack class VisTrack
+/// \ingroup cpp_kodi_addon_visualization
+/// @brief **Visualization track information structure**
+///
+/// Called from kodi::addon::CInstanceVisualization::UpdateTrack() with the
+/// information of the currently-playing song.
+///
+//@{
+struct VisTrack
+{
+  /// @brief Title of the current song.
+  const char *title;
+
+  /// @brief Artist names, as a single string
+  const char *artist;
+
+  /// @brief Album that the current song is from.
+  const char *album;
+
+  /// @brief Album artist names, as a single string
+  const char *albumArtist;
+
+  /// @brief The genre name from the music tag, if present.
+  const char *genre;
+
+  /// @brief Comment of the current song stored in the ID tag info.
+  const char *comment;
+
+  /// @brief Lyrics of the current song, if available.
+  const char *lyrics;
+
+  const char *reserved1;
+  const char *reserved2;
+
+  /// @brief Track number of the current song.
+  int trackNumber;
+
+  /// @brief Disc number of the current song stored in the ID tag info.
+  int discNumber;
+
+  /// @brief Duration of the current song, in seconds.
+  int duration;
+
+  /// @brief Year that the current song was released.
+  int year;
+
+  /// @brief The user-defined rating of the current song.
+  int rating;
+
+  int reserved3;
+  int reserved4;
+};
+//@}
+//----------------------------------------------------------------------------
+
+} /* extern "C" */
+
+namespace kodi
+{
+namespace addon
+{
+
+  //============================================================================
+  ///
+  /// \addtogroup cpp_kodi_addon_visualization
+  /// @brief \cpp_class{ kodi::addon::CInstanceVisualization }
+  /// **Visualization add-on instance**
+  ///
+  /// [Music visualization](https://en.wikipedia.org/wiki/Music_visualization),
+  /// or music visualisation, is a feature in Kodi that generates animated
+  /// imagery based on a piece of music. The imagery is usually generated and
+  /// rendered in real time synchronized to the music.
+  ///
+  /// Visualization techniques range from simple ones (e.g., a simulation of an
+  /// oscilloscope display) to elaborate ones, which often include a plurality
+  /// of composited effects. The changes in the music's loudness and frequency
+  /// spectrum are among the properties used as input to the visualization.
+  ///
+  /// Include the header \ref Visualization.h "#include <kodi/addon-instance/Visualization.h>"
+  /// to use this class.
+  ///
+  /// This interface allows the creation of visualizations for Kodi, based upon
+  /// **DirectX** or/and **OpenGL** rendering with `C++` code.
+  ///
+  /// Additionally, there are several \ref cpp_kodi_addon_visualization_CB "other functions"
+  /// available in which the child class can ask about the current hardware,
+  /// including the device, display and several other parts.
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  ///
+  /// **Here is an example of the minimum required code to start a visualization:**
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/Visualization.h>
+  ///
+  /// class CMyVisualization : public kodi::addon::CAddonBase,
+  ///                          public kodi::addon::CInstanceVisualization
+  /// {
+  /// public:
+  ///   CMyVisualization();
+  ///
+  ///   bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override;
+  ///   void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) override;
+  ///   void Render() override;
+  /// };
+  ///
+  /// CMyVisualization::CMyVisualization()
+  /// {
+  ///   ...
+  /// }
+  ///
+  /// bool CMyVisualization::Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
+  /// {
+  ///   ...
+  ///   return true;
+  /// }
+  ///
+  /// void CMyVisualization::AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength)
+  /// {
+  ///   ...
+  /// }
+  ///
+  /// void CMyVisualization::Render()
+  /// {
+  ///   ...
+  /// }
+  ///
+  /// ADDONCREATOR(CMyVisualization)
+  /// ~~~~~~~~~~~~~
+  ///
+  ///
+  /// --------------------------------------------------------------------------
+  ///
+  ///
+  /// **Here is another example where the visualization is used together with
+  /// other instance types:**
+  ///
+  /// ~~~~~~~~~~~~~{.cpp}
+  /// #include <kodi/addon-instance/Visualization.h>
+  ///
+  /// class CMyVisualization : public ::kodi::addon::CInstanceVisualization
+  /// {
+  /// public:
+  ///   CMyVisualization(KODI_HANDLE instance);
+  ///
+  ///   bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) override;
+  ///   void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) override;
+  ///   void Render() override;
+  /// };
+  ///
+  /// CMyVisualization::CMyVisualization(KODI_HANDLE instance)
+  ///   : CInstanceVisualization(instance)
+  /// {
+  ///   ...
+  /// }
+  ///
+  /// bool CMyVisualization::Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName)
+  /// {
+  ///   ...
+  ///   return true;
+  /// }
+  ///
+  /// void CMyVisualization::AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength)
+  /// {
+  ///   ...
+  /// }
+  ///
+  /// void CMyVisualization::Render()
+  /// {
+  ///   ...
+  /// }
+  ///
+  ///
+  /// /*----------------------------------------------------------------------*/
+  ///
+  /// 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_VISUALIZATION)
+  ///   {
+  ///     kodi::Log(ADDON_LOG_NOTICE, "Creating my Visualization");
+  ///     addonInstance = new CMyVisualization(instance);
+  ///     return ADDON_STATUS_OK;
+  ///   }
+  ///   else if (...)
+  ///   {
+  ///     ...
+  ///   }
+  ///   return ADDON_STATUS_UNKNOWN;
+  /// }
+  ///
+  /// ADDONCREATOR(CMyAddon)
+  /// ~~~~~~~~~~~~~
+  ///
+  /// The destruction of the example class `CMyVisualization` is called from
+  /// Kodi's header. Manually deleting the add-on instance is not required.
+  ///
+  //----------------------------------------------------------------------------
+  class CInstanceVisualization : public IAddonInstance
+  {
+  public:
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Visualization class constructor
+    ///
+    /// Used by an add-on that only supports visualizations.
+    ///
+    CInstanceVisualization()
+      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION),
+        m_presetLockedByUser(false)
+    {
+      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+        throw std::logic_error("kodi::addon::CInstanceVisualization: Cannot create multiple instances of add-on.");
+
+      SetAddonStruct(CAddonBase::m_interface->firstKodiInstance);
+      CAddonBase::m_interface->globalSingleInstance = this;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Visualization class constructor used to support multiple instance
+    /// types
+    ///
+    /// @param[in] instance               The instance value given to
+    ///                                   <b>`kodi::addon::CAddonBase::CreateInstance(...)`</b>.
+    ///
+    /// @warning Only use `instance` from the CreateInstance call
+    ///
+    CInstanceVisualization(KODI_HANDLE instance)
+      : IAddonInstance(ADDON_INSTANCE_VISUALIZATION),
+        m_presetLockedByUser(false)
+    {
+      if (CAddonBase::m_interface->globalSingleInstance != nullptr)
+        throw std::logic_error("kodi::addon::CInstanceVisualization: Creation of multiple together with single instance way is not allowed!");
+
+      SetAddonStruct(instance);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Destructor
+    ///
+    ~CInstanceVisualization() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Used to notify the visualization that a new song has been started
+    ///
+    /// @param[in] channels             Number of channels in the stream
+    /// @param[in] samplesPerSec        Samples per second of stream
+    /// @param[in] bitsPerSample        Number of bits in one sample
+    /// @param[in] songName             The name of the currently-playing song
+    /// @return                         true if start successful done
+    ///
+    virtual bool Start(int channels, int samplesPerSec, int bitsPerSample, std::string songName) { return true; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Used to inform the visualization that the rendering control was
+    /// stopped
+    ///
+    virtual void Stop() {}
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Pass audio data to the visualization
+    ///
+    /// @param[in] audioData            The raw audio data
+    /// @param[in] audioDataLength      Length of the audioData array
+    /// @param[in] freqData             The [FFT](https://en.wikipedia.org/wiki/Fast_Fourier_transform)
+    ///                                 of the audio data
+    /// @param[in] freqDataLength       Length of frequency data array
+    ///
+    /// Values **freqData** and **freqDataLength** are used if GetInfo() returns
+    /// true for the `wantsFreq` parameter. Otherwise, **freqData** is set to
+    /// `nullptr` and **freqDataLength** is `0`.
+    ///
+    virtual void AudioData(const float* audioData, int audioDataLength, float* freqData, int freqDataLength) {}
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Used to inform Kodi that the rendered region is dirty and need an
+    /// update
+    ///
+    /// @return True if dirty
+    ///
+    virtual bool IsDirty() { return true; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Used to indicate when the add-on should render
+    ///
+    virtual void Render() {}
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Used to get the number of buffers from the current visualization
+    ///
+    /// @param[out] wantsFreq           Indicates whether the add-on wants FFT
+    ///                                 data. If set to true, the **freqData**
+    ///                                 and **freqDataLength** parameters of
+    ///                                 AudioData() are used
+    /// @param[out] syncDelay           The number of buffers to delay before
+    ///                                 calling AudioData()
+    ///
+    /// @note If this function is not implemented, it will default to
+    /// `wantsFreq` = false and `syncDelay` = 0.
+    ///
+    virtual void GetInfo(bool& wantsFreq, int& syncDelay) { wantsFreq = false; syncDelay = 0; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Used to get a list of visualization presets the user can select
+    /// from
+    ///
+    /// @param[out] presets             The vector list containing the names of
+    ///                                 presets that the user can select
+    /// @return                         Return true if successful, or false if
+    ///                                 there are no presets to choose from
+    ///
+    virtual bool GetPresets(std::vector<std::string>& presets) { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Get the index of the current preset
+    ///
+    /// @return                         Index number of the current preset
+    ///
+    virtual int GetActivePreset() { return -1; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Check if the add-on is locked to the current preset
+    ///
+    /// @return                         True if locked to the current preset
+    ///
+    virtual bool IsLocked() { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Load the previous visualization preset
+    ///
+    /// @return                 Return true if the previous preset was loaded
+    virtual bool PrevPreset() { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Load the next visualization preset
+    ///
+    /// @return                 Return true if the next preset was loaded
+    virtual bool NextPreset() { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Load a visualization preset
+    ///
+    /// This function is called after a new preset is selected.
+    ///
+    /// @param[in] select       Preset index to use
+    /// @return                 Return true if the preset is loaded
+    virtual bool LoadPreset(int select) { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Switch to a new random preset
+    ///
+    /// @return                 Return true if a random preset was loaded
+    virtual bool RandomPreset() { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Lock the current visualization preset, preventing it from changing
+    ///
+    /// @param[in] lockUnlock   If set to true, the preset should be locked
+    /// @return                 Return true if the current preset is locked
+    virtual bool LockPreset(bool lockUnlock) { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Used to increase/decrease the visualization preset rating
+    ///
+    /// @param[in] plusMinus    If set to true the rating is increased, otherwise
+    ///                         decreased
+    /// @return                 Return true if the rating is modified
+    virtual bool RatePreset(bool plusMinus) { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Inform the visualization of the current album art image
+    ///
+    /// @param[in] albumart     Path to the current album art image
+    /// @return                 Return true if the image is used
+    virtual bool UpdateAlbumart(std::string albumart) { return false; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization
+    /// @brief Inform the visualization of the current track's tag information
+    ///
+    /// @param[in] track        Visualization track information structure
+    /// @return                 Return true if the track information is used
+    virtual bool UpdateTrack(const VisTrack &track) { return false; }
+
+    //==========================================================================
+    ///
+    /// \defgroup cpp_kodi_addon_visualization_CB Information functions
+    /// \ingroup cpp_kodi_addon_visualization
+    /// @brief **To get info about the device, display and several other parts**
+    ///
+    //@{
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Device that represents the display adapter
+    ///
+    /// @return A pointer to the used device
+    ///
+    /// @note This is only available on **DirectX**, It us unused (`nullptr`) on
+    /// **OpenGL**
+    ///
+    inline void* Device() { return m_instanceData->props.device; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Returns the X position of the rendering window
+    ///
+    /// @return The X position, in pixels
+    ///
+    inline int X() { return m_instanceData->props.x; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Returns the Y position of the rendering window
+    ///
+    /// @return The Y position, in pixels
+    ///
+    inline int Y() { return m_instanceData->props.y; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Returns the width of the rendering window
+    ///
+    /// @return The width, in pixels
+    ///
+    inline int Width() { return m_instanceData->props.width; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Returns the height of the rendering window
+    ///
+    /// @return The height, in pixels
+    ///
+    inline int Height() { return m_instanceData->props.height; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Pixel aspect ratio (often abbreviated PAR) is a ratio that
+    /// describes how the width of a pixel compares to the height of that pixel.
+    ///
+    /// @return The pixel aspect ratio used by the display
+    ///
+    inline float PixelRatio() { return m_instanceData->props.pixelRatio; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Used to get the name of the add-on defined in `addon.xml`
+    ///
+    /// @return The add-on name
+    ///
+    inline std::string Name() { return m_instanceData->props.name; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Used to get the full path where the add-on is installed
+    ///
+    /// @return The add-on installation path
+    ///
+    inline std::string Presets() { return m_instanceData->props.presets; }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @ingroup cpp_kodi_addon_visualization_CB
+    /// @brief Used to get the full path to the add-on's user profile
+    ///
+    /// @note The trailing folder (consisting of the add-on's ID) is not created
+    /// by default. If it is needed, you must call kodi::vfs::CreateDirectory()
+    /// to create the folder.
+    ///
+    /// @return Path to the user profile
+    ///
+    inline std::string Profile() { return m_instanceData->props.profile; }
+    //--------------------------------------------------------------------------
+    //@}
+
+  private:
+    void SetAddonStruct(KODI_HANDLE instance)
+    {
+      if (instance == nullptr)
+        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;
+    }
+
+    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);
+    }
+
+    inline static void ADDON_Stop(const AddonInstance_Visualization* addon)
+    {
+      addon->toAddon.addonInstance->Stop();
+    }
+
+    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);
+    }
+    
+    inline static bool ADDON_IsDirty(const AddonInstance_Visualization* addon)
+    {
+      return addon->toAddon.addonInstance->IsDirty();
+    }
+
+    inline static void ADDON_Render(const AddonInstance_Visualization* addon)
+    {
+      addon->toAddon.addonInstance->Render();
+    }
+
+    inline static void ADDON_GetInfo(const AddonInstance_Visualization* addon, VIS_INFO *info)
+    {
+      addon->toAddon.addonInstance->GetInfo(info->bWantsFreq, info->iSyncDelay);
+    }
+
+    inline static bool ADDON_OnAction(const AddonInstance_Visualization* addon, VIS_ACTION action, const void *param)
+    {
+      switch (action)
+      {
+        case VIS_ACTION_NEXT_PRESET:
+          return addon->toAddon.addonInstance->NextPreset();
+        case VIS_ACTION_PREV_PRESET:
+          return addon->toAddon.addonInstance->PrevPreset();
+        case VIS_ACTION_LOAD_PRESET:
+          return addon->toAddon.addonInstance->LoadPreset(*static_cast<const int*>(param));
+        case VIS_ACTION_RANDOM_PRESET:
+          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);
+        case VIS_ACTION_RATE_PRESET_PLUS:
+          return addon->toAddon.addonInstance->RatePreset(true);
+        case VIS_ACTION_RATE_PRESET_MINUS:
+          return addon->toAddon.addonInstance->RatePreset(false);
+        case VIS_ACTION_UPDATE_ALBUMART:
+          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));
+        case VIS_ACTION_NONE:
+        default:
+          break;
+      }
+      return false;
+    }
+
+    inline static unsigned int ADDON_GetPresets(const AddonInstance_Visualization* addon)
+    {
+      std::vector<std::string> 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());
+      }
+
+      return presets.size();
+    }
+
+    inline static int ADDON_GetActivePreset(const AddonInstance_Visualization* addon)
+    {
+      return addon->toAddon.addonInstance->GetActivePreset();
+    }
+
+    inline static bool ADDON_IsLocked(const AddonInstance_Visualization* addon)
+    {
+      return addon->toAddon.addonInstance->IsLocked();
+    }
+
+    bool m_presetLockedByUser;
+    AddonInstance_Visualization* m_instanceData;
+  };
+
+} /* namespace addon */
+} /* namespace kodi */
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 a473f28..944b1b9 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
@@ -91,20 +91,18 @@ namespace gui
     /// @param[in] label                Item label
     /// @param[in] label2               Second Item label (if needed)
     /// @param[in] iconImage            Item icon image (if needed)
-    /// @param[in] thumbnailImage       Thumbnail Image of item (if needed)
     /// @param[in] path                 Path to where item is defined
     ///
     CListItem(
       const std::string& label = "",
       const std::string& label2 = "",
       const std::string& iconImage = "",
-      const std::string& thumbnailImage = "",
       const std::string& path = "")
       : CAddonGUIControlBase(nullptr)
     {
       m_controlHandle = m_interface->kodi_gui->listItem->create(m_interface->kodiBase, label.c_str(),
                                                                 label2.c_str(), iconImage.c_str(),
-                                                                thumbnailImage.c_str(), path.c_str());
+                                                                path.c_str());
     }
 
     /*
@@ -124,7 +122,7 @@ namespace gui
     /// \ingroup cpp_kodi_gui_CListItem
     /// @brief Class destructor
     ///
-    virtual ~CListItem()
+    ~CListItem() override
     {
       m_interface->kodi_gui->listItem->destroy(m_interface->kodiBase, m_controlHandle);
     }
@@ -330,6 +328,86 @@ namespace gui
     }
     //--------------------------------------------------------------------------
 
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief Sets a listitem property, similar to an infolabel.
+    ///
+    /// @param[in] key            string - property name.
+    /// @param[in] value          string or unicode - value of property.
+    ///
+    /// @note Key is NOT case sensitive.
+    ///       You can use the above as keywords for arguments and skip certain\n
+    ///       optional arguments.\n
+    ///       Once you use a keyword, all following arguments require the
+    ///       keyword.
+    ///
+    /// Some of these are treated internally by Kodi, such as the
+    /// <b>'StartOffset'</b> property, which is the offset in seconds at which to
+    /// start playback of an item.  Others may be used in the skin to add
+    /// extra information, such as <b>'WatchedCount'</b> for tvshow items
+    ///
+    void SetProperty(const std::string& key, const std::string& value)
+    {
+      m_interface->kodi_gui->listItem->set_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief Returns a listitem property as a string, similar to an infolabel.
+    ///
+    /// @param[in] key                string - property name.
+    /// @return                       string - List item property
+    ///
+    /// @note Key is NOT case sensitive.\n
+    ///       You can use the above as keywords for arguments and skip certain
+    ///       optional arguments.\n
+    ///       Once you use a keyword, all following arguments require the
+    ///       keyword.
+    ///
+    std::string GetProperty(const std::string& key)
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->listItem->get_property(m_interface->kodiBase, m_controlHandle, key.c_str());
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief To control selection of item in list (also multiple selection,
+    /// in list on serveral items possible).
+    ///
+    /// @param[in] selected             if true becomes set as selected
+    ///
+    void Select(bool selected)
+    {
+      m_interface->kodi_gui->listItem->select(m_interface->kodiBase, m_controlHandle, selected);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CListItem
+    /// @brief Returns the listitem's selected status.
+    ///
+    /// @return                         true if selected, otherwise false
+    ///
+    bool IsSelected()
+    {
+      return m_interface->kodi_gui->listItem->is_selected(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
   };
 
 } /* namespace gui */
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 7069e63..b78585f 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
@@ -110,7 +110,7 @@ namespace gui
     ///
     ///
     ///
-    virtual ~CWindow()
+    ~CWindow() override
     {
       if (m_controlHandle)
         m_interface->kodi_gui->window->destroy(m_interface->kodiBase, m_controlHandle);
@@ -166,6 +166,232 @@ namespace gui
     //==========================================================================
     ///
     /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Gives the control with the supplied focus.
+    ///
+    /// @param[in] iControlId           On skin defined id of control
+    /// @return                         Return true if call and focus is successed,
+    ///                                 if false was something failed to get needed
+    ///                                 skin parts.
+    ///
+    ///
+    bool SetFocusId(int iControlId)
+    {
+      return m_interface->kodi_gui->window->set_focus_id(m_interface->kodiBase, m_controlHandle, iControlId);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns the id of the control which is focused.
+    ///
+    /// @return                         Focused control id
+    ///
+    ///
+    int GetFocusId()
+    {
+      return m_interface->kodi_gui->window->get_focus_id(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To set the used label on given control id
+    ///
+    /// @param[in] controlId            Control id where label need to set
+    /// @param[in] label                Label to use
+    ///
+    ///
+    void SetControlLabel(int controlId, const std::string& label)
+    {
+      m_interface->kodi_gui->window->set_control_label(m_interface->kodiBase, m_controlHandle, controlId, label.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a window property, similar to an infolabel.
+    ///
+    /// @param[in] key                  string - property name.
+    /// @param[in] value                string or unicode - value of property.
+    ///
+    /// @note  Key is NOT case sensitive. Setting value to an empty string is
+    ///        equivalent to clearProperty(key).\n
+    ///        You can use the above as keywords for arguments and skip certain
+    ///        optional arguments.\n
+    ///        Once you use a keyword, all following arguments require the keyword.
+    ///
+    void SetProperty(const std::string& key, const std::string& value)
+    {
+      m_interface->kodi_gui->window->set_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns a window property as a string, similar to an infolabel.
+    ///
+    /// @param[in] key                  string - property name.
+    /// @return                         The property as strin (if present)
+    ///
+    /// @note  Key is NOT case sensitive. Setting value to an empty string is
+    ///        equivalent to clearProperty(key).\n
+    ///        You can use the above as keywords for arguments and skip certain
+    ///        optional arguments.\n
+    ///        Once you use a keyword, all following arguments require the keyword.
+    ///
+    ///
+    std::string GetProperty(const std::string& key) const
+    {
+      std::string label;
+      char* ret = m_interface->kodi_gui->window->get_property(m_interface->kodiBase, m_controlHandle, key.c_str());
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          label = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return label;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a window property with integer value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @param[in] value                integer value to set
+    ///
+    ///
+    void SetPropertyInt(const std::string& key, int value)
+    {
+      m_interface->kodi_gui->window->set_property_int(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns a window property with integer value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @return                         integer value of property
+    ///
+    int GetPropertyInt(const std::string& key) const
+    {
+      return m_interface->kodi_gui->window->get_property_int(m_interface->kodiBase, m_controlHandle, key.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a window property with boolean value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @param[in] value                boolean value to set
+    ///
+    ///
+    void SetPropertyBool(const std::string& key, bool value)
+    {
+      m_interface->kodi_gui->window->set_property_bool(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns a window property with boolean value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @return                         boolean value of property
+    ///
+    bool GetPropertyBool(const std::string& key) const
+    {
+      return m_interface->kodi_gui->window->get_property_bool(m_interface->kodiBase, m_controlHandle, key.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a window property with double value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @param[in] value                double value to set
+    ///
+    ///
+    void SetPropertyDouble(const std::string& key, double value)
+    {
+      m_interface->kodi_gui->window->set_property_double(m_interface->kodiBase, m_controlHandle, key.c_str(), value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Returns a window property with double value
+    ///
+    /// @param[in] key                  string - property name.
+    /// @return                         double value of property
+    ///
+    ///
+    double GetPropertyDouble(const std::string& key) const
+    {
+      return m_interface->kodi_gui->window->get_property_double(m_interface->kodiBase, m_controlHandle, key.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Remove all present properties from window
+    ///
+    ///
+    ///
+    void ClearProperties()
+    {
+      m_interface->kodi_gui->window->clear_properties(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Clears the specific window property.
+    ///
+    /// @param[in] key                string - property name.
+    ///
+    /// @note Key is NOT case sensitive. Equivalent to SetProperty(key, "")
+    ///       You can use the above as keywords for arguments and skip certain
+    ///       optional arguments.
+    ///       Once you use a keyword, all following arguments require the
+    ///       keyword.
+    ///
+    ///
+    ///-----------------------------------------------------------------------
+    ///
+    /// **Example:**
+    /// ~~~~~~~~~~~~~{.cpp}
+    /// ..
+    /// ClearProperty('Category')
+    /// ..
+    /// ~~~~~~~~~~~~~
+    ///
+    void ClearProperty(const std::string& key)
+    {
+      m_interface->kodi_gui->window->clear_property(m_interface->kodiBase, m_controlHandle, key.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //@{
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
     /// @brief Function delete all entries in integrated list.
     ///
     ///
@@ -209,6 +435,34 @@ namespace gui
     //==========================================================================
     ///
     /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Remove list item on position.
+    ///
+    /// @param[in] itemPosition         List position to remove
+    ///
+    ///
+    void RemoveListItem(int itemPosition)
+    {
+      m_interface->kodi_gui->window->remove_list_item_from_position(m_interface->kodiBase, m_controlHandle, itemPosition);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Remove item with given control class from list.
+    ///
+    /// @param[in] item                 List item control class to remove
+    ///
+    ///
+    void RemoveListItem(ListItemPtr item)
+    {
+      m_interface->kodi_gui->window->remove_list_item(m_interface->kodiBase, m_controlHandle, item->m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
     /// @brief To get list item control class on wanted position.
     ///
     /// @param[in] listPos              Position from where control is needed
@@ -227,6 +481,135 @@ namespace gui
     //--------------------------------------------------------------------------
 
     //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To set position of selected part in list.
+    ///
+    /// @param[in] listPos              Position to use
+    ///
+    ///
+    void SetCurrentListPosition(int listPos)
+    {
+      m_interface->kodi_gui->window->set_current_list_position(m_interface->kodiBase, m_controlHandle, listPos);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To get current selected position in list
+    ///
+    /// @return                         Current list position
+    ///
+    ///
+    int GetCurrentListPosition()
+    {
+      return m_interface->kodi_gui->window->get_current_list_position(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To get the amount of entries in the list.
+    ///
+    /// @return                         Size of in window integrated control class
+    ///
+    ///
+    int GetListSize()
+    {
+      return m_interface->kodi_gui->window->get_list_size(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets a container property, similar to an infolabel.
+    ///
+    /// @param[in] key        string - property name.
+    /// @param[in] value      string or unicode - value of property.
+    ///
+    /// @note Key is NOT case sensitive.\n
+    /// You can use the above as keywords for arguments and skip certain
+    /// optional arguments.\n
+    /// Once you use a keyword, all following arguments require the keyword.
+    ///
+    ///
+    void SetContainerProperty(const std::string& key, const std::string& value)
+    {
+      m_interface->kodi_gui->window->set_container_property(m_interface->kodiBase, m_controlHandle, key.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Sets the content type of the container.
+    ///
+    /// @param[in] value      string or unicode - content value.
+    ///
+    /// __Available content types__
+    /// | Name        | Media                                    |
+    /// |:-----------:|:-----------------------------------------|
+    /// | actors      | Videos
+    /// | addons      | Addons, Music, Pictures, Programs, Videos
+    /// | albums      | Music, Videos
+    /// | artists     | Music, Videos
+    /// | countries   | Music, Videos
+    /// | directors   | Videos
+    /// | files       | Music, Videos
+    /// | games       | Games
+    /// | genres      | Music, Videos
+    /// | images      | Pictures
+    /// | mixed       | Music, Videos
+    /// | movies      | Videos
+    /// | Musicvideos | Music, Videos
+    /// | playlists   | Music, Videos
+    /// | seasons     | Videos
+    /// | sets        | Videos
+    /// | songs       | Music
+    /// | studios     | Music, Videos
+    /// | tags        | Music, Videos
+    /// | tvshows     | Videos
+    /// | videos      | Videos
+    /// | years       | Music, Videos
+    ///
+    ///
+    void SetContainerContent(const std::string& value)
+    {
+      m_interface->kodi_gui->window->set_container_content(m_interface->kodiBase, m_controlHandle, value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief Get the id of the currently visible container.
+    ///
+    /// @return               currently visible container id
+    ///
+    ///
+    int GetCurrentContainerId()
+    {
+      return m_interface->kodi_gui->window->get_current_container_id(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+    //@}
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_CWindow
+    /// @brief To inform Kodi that it need to render region new.
+    ///
+    ///
+    void MarkDirtyRegion()
+    {
+      return m_interface->kodi_gui->window->mark_dirty_region(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
     //
     /// @defgroup cpp_kodi_gui_CWindow_callbacks Callback functions from Kodi to add-on
     /// \ingroup cpp_kodi_gui_CWindow
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
new file mode 100644
index 0000000..5892d24
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Button.h
@@ -0,0 +1,176 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 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
+    ///
+    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 !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @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 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
+    {
+      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;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// @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
+    {
+      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;
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..83eeede
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Edit.h
@@ -0,0 +1,276 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CEdit Control Edit
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CEdit }
+  /// **Editable window text control used as an input control for the osd keyboard
+  /// and other input fields**
+  ///
+  /// The edit control  allows a user to  input text in Kodi. You can choose the
+  /// font, size, colour, location and header of the text to be displayed.
+  ///
+  /// It has the header \ref Edit.h "#include <kodi/gui/controls/Edit.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here  you  find  the   needed  skin  part  for  a   \ref skin_Edit_control
+  /// "edit control".
+  ///
+  /// @note The  call of the  control is only possible  from  the  corresponding
+  /// window as its class and identification number is required.
+  ///
+
+  //============================================================================
+  // see gui/definition.h for use of group "cpp_kodi_gui_controls_CEdit_Defs"
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CEdit_Defs Definitions, structures and enumerators
+  /// \ingroup cpp_kodi_gui_controls_CEdit
+  /// @brief **Library definition values**
+  ///
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
+
+//============================================================================
+///
+/// \ingroup cpp_kodi_gui_controls_CEdit_Defs
+/// @{
+/// @anchor AddonGUIInputType
+/// @brief Text input types used on kodi::gui::controls::CEdit
+enum AddonGUIInputType
+{
+  /// Text inside edit control only readable
+  ADDON_INPUT_TYPE_READONLY = -1,
+  /// Normal text entries
+  ADDON_INPUT_TYPE_TEXT = 0,
+  /// To use on edit control only numeric numbers
+  ADDON_INPUT_TYPE_NUMBER,
+  /// To insert seconds
+  ADDON_INPUT_TYPE_SECONDS,
+  /// To insert time
+  ADDON_INPUT_TYPE_TIME,
+  /// To insert a date
+  ADDON_INPUT_TYPE_DATE,
+  /// Used for write in IP addresses
+  ADDON_INPUT_TYPE_IPADDRESS,
+  /// Text field used as password entry field with not visible text
+  ADDON_INPUT_TYPE_PASSWORD,
+  /// Text field used as password entry field with not visible text but
+  /// returned as MD5 value
+  ADDON_INPUT_TYPE_PASSWORD_MD5,
+  /// Use text field for search purpose
+  ADDON_INPUT_TYPE_SEARCH,
+  /// Text field as filter
+  ADDON_INPUT_TYPE_FILTER,
+  ///
+  ADDON_INPUT_TYPE_PASSWORD_NUMBER_VERIFY_NEW
+};
+/// @}
+//----------------------------------------------------------------------------
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  class 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)
+    {
+      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 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 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
+    {
+      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;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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
+    {
+      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;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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 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 */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..82d17ff
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/FadeLabel.h
@@ -0,0 +1,159 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 CFadeLabel : public CAddonGUIControlBase
+  {
+  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;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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 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)
+      {
+        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 reset al inserted labels.
+    ///
+    void Reset()
+    {
+      m_interface->kodi_gui->control_fade_label->reset(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..1179fab
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Image.h
@@ -0,0 +1,123 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 CImage : public CAddonGUIControlBase
+  {
+  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);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..f74ac03
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Label.h
@@ -0,0 +1,128 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 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
+    ///
+    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);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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
+    {
+      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;
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..44310ed
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Progress.h
@@ -0,0 +1,121 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 CProgress : public CAddonGUIControlBase
+  {
+  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);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..b87920d
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/RadioButton.h
@@ -0,0 +1,171 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 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
+    ///
+    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);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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 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)
+      {
+        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 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 */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..f80fcfa
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Rendering.h
@@ -0,0 +1,215 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 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);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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)
+    {
+      return static_cast<CRendering*>(cbhdl)->Create(x, y, w, h, device);
+    }
+
+    static void OnRenderCB(void* cbhdl)
+    {
+      static_cast<CRendering*>(cbhdl)->Render();
+    }
+
+    static void OnStopCB(void* cbhdl)
+    {
+      static_cast<CRendering*>(cbhdl)->Stop();
+    }
+
+    static bool OnDirtyCB(void* cbhdl)
+    {
+      return static_cast<CRendering*>(cbhdl)->Dirty();
+    }
+
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..e51433a
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/SettingsSlider.h
@@ -0,0 +1,323 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 CSettingsSlider : public CAddonGUIControlBase
+  {
+  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;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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 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 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 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 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 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 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);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..cbb9b8f
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Slider.h
@@ -0,0 +1,336 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 CSlider : public CAddonGUIControlBase
+  {
+  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);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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 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)
+      {
+        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 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 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 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 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 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 */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..b39cd06
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/Spin.h
@@ -0,0 +1,376 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+namespace gui
+{
+namespace controls
+{
+
+  //============================================================================
+  ///
+  /// \defgroup cpp_kodi_gui_controls_CSpin Control Spin
+  /// \ingroup cpp_kodi_gui
+  /// @brief \cpp_class{ kodi::gui::controls::CSpin }
+  /// **Window control used for cycling up/down controls**
+  ///
+  /// The settings spin control is used in the settings  screens for when a list
+  /// of options  can be chosen  from using  up/down arrows.  You can choose the
+  /// position,  size,  and look of  the spin control.  It is basically  a cross
+  /// between  the button  control and a spin control.  It has a label and focus
+  /// and non focus textures, as well as a spin control on the right.
+  ///
+  /// It has the header \ref Spin.h "#include <kodi/gui/controls/Spin.h>"
+  /// be included to enjoy it.
+  ///
+  /// Here you find the needed skin part for a \ref Spin_Control "spin control"
+  ///
+  /// @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_CSpin
+  /// @anchor AddonGUISpinControlType
+  /// @brief The values here defines the used value format for steps on
+  /// spin control.
+  ///
+  typedef enum AddonGUISpinControlType
+  {
+    /// One spin step interpreted as integer
+    ADDON_SPIN_CONTROL_TYPE_INT    = 1,
+    /// One spin step interpreted as floating point value
+    ADDON_SPIN_CONTROL_TYPE_FLOAT  = 2,
+    /// One spin step interpreted as text string
+    ADDON_SPIN_CONTROL_TYPE_TEXT   = 3,
+    /// One spin step interpreted as a page change value
+    ADDON_SPIN_CONTROL_TYPE_PAGE   = 4
+  } AddonGUISpinControlType;
+  //----------------------------------------------------------------------------
+
+  class CSpin : public CAddonGUIControlBase
+  {
+  public:
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Construct a new control
+    ///
+    /// @param[in] window               related window control class
+    /// @param[in] controlId            Used skin xml control id
+    ///
+    CSpin(CWindow* window, int controlId)
+      : CAddonGUIControlBase(window)
+    {
+      m_controlHandle = m_interface->kodi_gui->window->get_control_spin(m_interface->kodiBase, m_Window->GetControlHandle(), controlId);
+      if (!m_controlHandle)
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::controls::CSpin can't create control class from Kodi !!!");
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Destructor
+    ///
+    ~CSpin() override = default;
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @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_spin->set_visible(m_interface->kodiBase, m_controlHandle, visible);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @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_spin->set_enabled(m_interface->kodiBase, m_controlHandle, enabled);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the text string on spin control
+    ///
+    /// @param[in] text                Text to show as name for spin
+    ///
+    void SetText(const std::string& text)
+    {
+      m_interface->kodi_gui->control_spin->set_text(m_interface->kodiBase, m_controlHandle, text.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To reset spin control to defaults
+    ///
+    void Reset()
+    {
+      m_interface->kodi_gui->control_spin->reset(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the with SpinControlType defined types of spin.
+    ///
+    /// @param[in] type                 The type to use
+    ///
+    /// @note See description of \ref AddonGUISpinControlType for available types.
+    ///
+    void SetType(AddonGUISpinControlType type)
+    {
+      m_interface->kodi_gui->control_spin->set_type(m_interface->kodiBase, m_controlHandle, (int)type);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To add a label entry in spin defined with a value as string.
+    ///
+    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+    ///
+    /// @param[in] label                Label string to view on skin
+    /// @param[in] value                String value to use for selection
+    ///                                 of them.
+    ///
+    void AddLabel(const std::string& label, const std::string& value)
+    {
+      m_interface->kodi_gui->control_spin->add_string_label(m_interface->kodiBase, m_controlHandle, label.c_str(), value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To add a label entry in spin defined with a value as integer.
+    ///
+    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_INT to use this function.
+    ///
+    /// @param[in] label                Label string to view on skin
+    /// @param[in] value                Integer value to use for selection
+    ///                                 of them.
+    ///
+    void AddLabel(const std::string& label, int value)
+    {
+      m_interface->kodi_gui->control_spin->add_int_label(m_interface->kodiBase, m_controlHandle, label.c_str(), value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To change the spin to position with them string as value.
+    ///
+    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+    ///
+    /// @param[in] value                 String value to change to
+    ///
+    void SetStringValue(const std::string& value)
+    {
+      m_interface->kodi_gui->control_spin->set_string_value(m_interface->kodiBase, m_controlHandle, value.c_str());
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To get the current spin control position with text string value.
+    ///
+    /// Format must be set to ADDON_SPIN_CONTROL_TYPE_TEXT to use this function.
+    ///
+    /// @return                         Currently selected string value
+    ///
+    std::string GetStringValue() const
+    {
+      std::string value;
+      char* ret = m_interface->kodi_gui->control_spin->get_string_value(m_interface->kodiBase, m_controlHandle);
+      if (ret != nullptr)
+      {
+        if (std::strlen(ret))
+          value = ret;
+        m_interface->free_string(m_interface->kodiBase, ret);
+      }
+      return value;
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @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.
+    ///
+    /// @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 and must be defined with \ref SetType before.
+    ///
+    void SetIntRange(int start, int end)
+    {
+      m_interface->kodi_gui->control_spin->set_int_range(m_interface->kodiBase, m_controlHandle, start, end);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @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 and must be defined with \ref SetType before.
+    ///
+    void SetIntValue(int value)
+    {
+      m_interface->kodi_gui->control_spin->set_int_value(m_interface->kodiBase, m_controlHandle, value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @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 and must be defined with \ref SetType before.
+    ///
+    int GetIntValue() const
+    {
+      return m_interface->kodi_gui->control_spin->get_int_value(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the  the range as  float of spin,  e.g. -25.0 is  the spin
+    /// 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 and must be defined with \ref SetType before.
+    ///
+    void SetFloatRange(float start, float end)
+    {
+      m_interface->kodi_gui->control_spin->set_float_range(m_interface->kodiBase, m_controlHandle, start, end);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief Set  the spin  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 and must be defined with \ref SetType before.
+    ///
+    void SetFloatValue(float value)
+    {
+      m_interface->kodi_gui->control_spin->set_float_value(m_interface->kodiBase, m_controlHandle, value);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To get the current position as float value.
+    ///
+    /// @return                         The position as float
+    ///
+    float GetFloatValue() const
+    {
+      return m_interface->kodi_gui->control_spin->get_float_value(m_interface->kodiBase, m_controlHandle);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \ingroup cpp_kodi_gui_controls_CSpin
+    /// @brief To set the  interval steps of spin,  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 and must be defined with \ref SetType before.
+    ///
+    void SetFloatInterval(float interval)
+    {
+      m_interface->kodi_gui->control_spin->set_float_interval(m_interface->kodiBase, m_controlHandle, interval);
+    }
+    //--------------------------------------------------------------------------
+  };
+
+} /* namespace controls */
+} /* namespace gui */
+} /* namespace kodi */
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
new file mode 100644
index 0000000..9d8976e
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls/TextBox.h
@@ -0,0 +1,176 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team KODI
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with KODI; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "../../AddonBase.h"
+#include "../Window.h"
+
+namespace kodi
+{
+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 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
+    ///
+    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);
+    }
+    //--------------------------------------------------------------------------
+
+    //==========================================================================
+    ///
+    /// \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 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)
+      {
+        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 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 */
+} /* namespace kodi */
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 a4cf963..61af9fe 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
@@ -39,6 +39,145 @@ typedef struct AddonToKodiFuncTable_kodi_gui_general
   int (*get_current_window_id)(void* kodiBase);
 } AddonToKodiFuncTable_kodi_gui_general;
 
+typedef struct AddonToKodiFuncTable_kodi_gui_control_button
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_label)(void* kodiBase, void* handle, const char* label);
+  char* (*get_label)(void* kodiBase, void* handle);
+  void (*set_label2)(void* kodiBase, void* handle, const char *label);
+  char* (*get_label2)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_button;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_edit
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_label)(void* kodiBase, void* handle, const char* label);
+  char* (*get_label)(void* kodiBase, void* handle);
+  void (*set_text)(void* kodiBase, void* handle, const char* text);
+  char* (*get_text)(void* kodiBase, void* handle);
+  void (*set_cursor_position)(void* kodiBase, void* handle, unsigned int position);
+  unsigned int (*get_cursor_position)(void* kodiBase, void* handle);
+  void (*set_input_type)(void* kodiBase, void* handle, int type, const char* heading);
+} AddonToKodiFuncTable_kodi_gui_control_edit;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_fade_label
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*add_label)(void* kodiBase, void* handle, const char* text);
+  char* (*get_label)(void* kodiBase, void* handle);
+  void (*set_scrolling)(void* kodiBase, void* handle, bool scroll);
+  void (*reset)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_fade_label;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_image
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_filename)(void* kodiBase, void* handle, const char* filename, bool use_cache);
+  void (*set_color_diffuse)(void* kodiBase, void* handle, uint32_t color_diffuse);
+} AddonToKodiFuncTable_kodi_gui_control_image;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_label
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_label)(void* kodiBase, void* handle, const char* text);
+  char* (*get_label)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_label;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_progress
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_percentage)(void* kodiBase, void* handle, float percent);
+  float (*get_percentage)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_progress;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_radio_button
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_label)(void* kodiBase, void* handle, const char* text);
+  char* (*get_label)(void* kodiBase, void* handle);
+  void (*set_selected)(void* kodiBase, void* handle, bool selected);
+  bool (*is_selected)(void* kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_radio_button;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_rendering
+{
+  void (*set_callbacks)(void* kodiBase, void* handle, void* clienthandle,
+      bool    (*createCB)(void*,int,int,int,int,void*),
+      void    (*renderCB)(void*),
+      void    (*stopCB)(void*),
+      bool    (*dirtyCB)(void*));
+  void (*destroy)(void *kodiBase, void* handle);
+} AddonToKodiFuncTable_kodi_gui_control_rendering;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_settings_slider
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_text)(void* kodiBase, void* handle, const char* label);
+  void (*reset)(void* kodiBase, void* handle);
+  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
+  void (*set_int_value)(void* kodiBase, void* handle, int value);
+  int (*get_int_value)(void* kodiBase, void* handle);
+  void (*set_int_interval)(void* kodiBase, void* handle, int interval);
+  void (*set_percentage)(void* kodiBase, void* handle, float percent);
+  float (*get_percentage)(void* kodiBase, void* handle);
+  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
+  void (*set_float_value)(void* kodiBase, void* handle, float value);
+  float (*get_float_value)(void* kodiBase, void* handle);
+  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
+} AddonToKodiFuncTable_kodi_gui_control_settings_slider;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_slider
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*reset)(void* kodiBase, void* handle);
+  char* (*get_description)(void* kodiBase, void* handle);
+  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
+  void (*set_int_value)(void* kodiBase, void* handle, int value);
+  int (*get_int_value)(void* kodiBase, void* handle);
+  void (*set_int_interval)(void* kodiBase, void* handle, int interval);
+  void (*set_percentage)(void* kodiBase, void* handle, float percent);
+  float (*get_percentage)(void* kodiBase, void* handle);
+  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
+  void (*set_float_value)(void* kodiBase, void* handle, float value);
+  float (*get_float_value)(void* kodiBase, void* handle);
+  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
+} AddonToKodiFuncTable_kodi_gui_control_slider;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_spin
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*set_enabled)(void* kodiBase, void* handle, bool enabled);
+  void (*set_text)(void* kodiBase, void* handle, const char* text);
+  void (*reset)(void* kodiBase, void* handle);
+  void (*set_type)(void* kodiBase, void* handle, int type);
+  void (*add_string_label)(void* kodiBase, void* handle, const char* label, const char* value);
+  void (*set_string_value)(void* kodiBase, void* handle, const char* value);
+  char* (*get_string_value)(void* kodiBase, void* handle);
+  void (*add_int_label)(void* kodiBase, void* handle, const char* label, int value);
+  void (*set_int_range)(void* kodiBase, void* handle, int start, int end);
+  void (*set_int_value)(void* kodiBase, void* handle, int value);
+  int (*get_int_value)(void* kodiBase, void* handle);
+  void (*set_float_range)(void* kodiBase, void* handle, float start, float end);
+  void (*set_float_value)(void* kodiBase, void* handle, float value);
+  float (*get_float_value)(void* kodiBase, void* handle);
+  void (*set_float_interval)(void* kodiBase, void* handle, float interval);
+} AddonToKodiFuncTable_kodi_gui_control_spin;
+
+typedef struct AddonToKodiFuncTable_kodi_gui_control_text_box
+{
+  void (*set_visible)(void* kodiBase, void* handle, bool visible);
+  void (*reset)(void* kodiBase, void* handle);
+  void (*set_text)(void* kodiBase, void* handle, const char* text);
+  char* (*get_text)(void* kodiBase, void* handle);
+  void (*scroll)(void* kodiBase, void* handle, unsigned int scroll);
+  void (*set_auto_scrolling)(void* kodiBase, void* handle, int delay, int time, int repeat);
+} AddonToKodiFuncTable_kodi_gui_control_text_box;
+
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogContextMenu
 {
   int (*open)(void* kodiBase, const char *heading, const char *entries[], unsigned int size);
@@ -122,7 +261,7 @@ typedef struct AddonToKodiFuncTable_kodi_gui_dialogProgress
 
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogSelect
 {
-  int (*open)(void* kodiBase, const char *heading, const char *entries[], unsigned int size, int selected, bool autoclose);
+  int (*open)(void* kodiBase, const char *heading, const char *entries[], unsigned int size, int selected, unsigned int autoclose);
 } AddonToKodiFuncTable_kodi_gui_dialogSelect;
 
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogTextViewer
@@ -139,7 +278,7 @@ typedef struct AddonToKodiFuncTable_kodi_gui_dialogYesNo
 
 typedef struct AddonToKodiFuncTable_kodi_gui_listItem
 {
-  void* (*create)(void* kodiBase, const char* label, const char* label2, const char* icon_image, const char* thumbnail_image, const char* path);
+  void* (*create)(void* kodiBase, const char* label, const char* label2, const char* icon_image, const char* path);
   void (*destroy)(void* kodiBase, void* handle);
   char* (*get_label)(void* kodiBase, void* handle);
   void (*set_label)(void* kodiBase, void* handle, const char* label);
@@ -151,6 +290,10 @@ typedef struct AddonToKodiFuncTable_kodi_gui_listItem
   void (*set_art)(void* kodiBase, void* handle, const char* type, const char* image);
   char* (*get_path)(void* kodiBase, void* handle);
   void (*set_path)(void* kodiBase, void* handle, const char* path);
+  char* (*get_property)(void* kodiBase, void* handle, const char* key);
+  void (*set_property)(void* kodiBase, void* handle, const char* key, const char* value);
+  void (*select)(void* kodiBase, void* handle, bool select);
+  bool (*is_selected)(void* kodiBase, void* handle);
 } AddonToKodiFuncTable_kodi_gui_listItem;
 
 #define ADDON_MAX_CONTEXT_ENTRIES 20
@@ -160,9 +303,10 @@ typedef struct gui_context_menu_pair
   unsigned int id;
   char name[ADDON_MAX_CONTEXT_ENTRY_NAME_LENGTH];
 } gui_context_menu_pair;
-    
+
 typedef struct AddonToKodiFuncTable_kodi_gui_window
 {
+  /* Window creation functions */
   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,
@@ -175,14 +319,90 @@ typedef struct AddonToKodiFuncTable_kodi_gui_window
   bool (*show)(void* kodiBase, void* handle);
   bool (*close)(void* kodiBase, void* handle);
   bool (*do_modal)(void* kodiBase, void* handle);
+
+  /* Window control functions */
+  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);
+
+  /* Window property functions */
+  void (*set_property)(void* kodiBase, void* handle, const char* key, const char* value);
+  void (*set_property_int)(void* kodiBase, void* handle, const char* key, int value);
+  void (*set_property_bool)(void* kodiBase, void* handle, const char* key, bool value);
+  void (*set_property_double)(void* kodiBase, void* handle, const char* key, double value);
+  char* (*get_property)(void* kodiBase, void* handle, const char* key);
+  int (*get_property_int)(void* kodiBase, void* handle, const char* key);
+  bool (*get_property_bool)(void* kodiBase, void* handle, const char* key);
+  double (*get_property_double)(void* kodiBase, void* handle, const char* key);
+  void (*clear_properties)(void* kodiBase, void* handle);
+  void (*clear_property)(void* kodiBase, void* handle, const char* key);
+
+  /* List item functions */
   void (*clear_item_list)(void* kodiBase, void* handle);
-  void (*add_list_item)(void* kodiBase, void* handle, void* item, int item_position);
-  void* (*get_list_item)(void* kodiBase, void* handle, int listPos);
+  void (*add_list_item)(void* kodiBase, void* handle, void* item, int list_position);
+  void (*remove_list_item_from_position)(void* kodiBase, void* handle, int list_position);
+  void (*remove_list_item)(void* kodiBase, void* handle, void* item);
+  void* (*get_list_item)(void* kodiBase, void* handle, int list_position);
+  void (*set_current_list_position)(void* kodiBase, void* handle, int list_position);
+  int (*get_current_list_position)(void* kodiBase, void* handle);
+  int (*get_list_size)(void* kodiBase, void* handle);
+  void (*set_container_property)(void* kodiBase, void* handle, const char* key, const char* value);
+  void (*set_container_content)(void* kodiBase, void* handle, const char* value);
+  int (*get_current_container_id)(void* kodiBase, void* handle);
+
+  /* Various functions */
+  void (*mark_dirty_region)(void* kodiBase, void* handle);
+
+  /* GUI control access functions */
+  void* (*get_control_button)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_edit)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_fade_label)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_image)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_label)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_progress)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_radio_button)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_render_addon)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_settings_slider)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_slider)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_spin)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_text_box)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy1)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy2)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy3)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy4)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy5)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy6)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy7)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy8)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy9)(void* kodiBase, void* handle, int control_id);
+  void* (*get_control_dummy10)(void* kodiBase, void* handle, int control_id); /* This and above used to add new get_control_* functions */
 } AddonToKodiFuncTable_kodi_gui_window;
 
 typedef struct AddonToKodiFuncTable_kodi_gui
 {
   AddonToKodiFuncTable_kodi_gui_general* general;
+  AddonToKodiFuncTable_kodi_gui_control_button* control_button;
+  AddonToKodiFuncTable_kodi_gui_control_edit* control_edit;
+  AddonToKodiFuncTable_kodi_gui_control_fade_label* control_fade_label;
+  AddonToKodiFuncTable_kodi_gui_control_label* control_label;
+  AddonToKodiFuncTable_kodi_gui_control_image* control_image;
+  AddonToKodiFuncTable_kodi_gui_control_progress* control_progress;
+  AddonToKodiFuncTable_kodi_gui_control_radio_button* control_radio_button;
+  AddonToKodiFuncTable_kodi_gui_control_rendering* control_rendering;
+  AddonToKodiFuncTable_kodi_gui_control_settings_slider* control_settings_slider;
+  AddonToKodiFuncTable_kodi_gui_control_slider* control_slider;
+  AddonToKodiFuncTable_kodi_gui_control_spin* control_spin;
+  AddonToKodiFuncTable_kodi_gui_control_text_box* control_text_box;
+  void* control_dummy1;
+  void* control_dummy2;
+  void* control_dummy3;
+  void* control_dummy4;
+  void* control_dummy5;
+  void* control_dummy6;
+  void* control_dummy7;
+  void* control_dummy8;
+  void* control_dummy9;
+  void* control_dummy10; /* This and above used to add new controls */
   AddonToKodiFuncTable_kodi_gui_dialogContextMenu* dialogContextMenu;
   AddonToKodiFuncTable_kodi_gui_dialogExtendedProgress* dialogExtendedProgress;
   AddonToKodiFuncTable_kodi_gui_dialogFileBrowser* dialogFileBrowser;
@@ -193,6 +413,16 @@ typedef struct AddonToKodiFuncTable_kodi_gui
   AddonToKodiFuncTable_kodi_gui_dialogSelect* dialogSelect;
   AddonToKodiFuncTable_kodi_gui_dialogTextViewer* dialogTextViewer;
   AddonToKodiFuncTable_kodi_gui_dialogYesNo* dialogYesNo;
+  void* dialog_dummy1;
+  void* dialog_dummy2;
+  void* dialog_dummy3;
+  void* dialog_dummy4;
+  void* dialog_dummy5;
+  void* dialog_dummy6;
+  void* dialog_dummy7;
+  void* dialog_dummy8;
+  void* dialog_dummy9;
+  void* dialog_dummy10; /* This and above used to add new dialogs */
   AddonToKodiFuncTable_kodi_gui_listItem* listItem;
   AddonToKodiFuncTable_kodi_gui_window* window;
 } AddonToKodiFuncTable_kodi_gui;
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogContextMenu.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
index 66a1c90..47afc23 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogContextMenu.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
@@ -19,33 +19,35 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogContextMenu Dialog Context Menu
+  /// \defgroup cpp_kodi_gui_dialogs_ContextMenu Dialog Context Menu
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::DialogContextMenu }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::ContextMenu }
   /// **Context menu dialog**
   ///
   /// The function listed below permits the call of a dialogue as context menu to
   /// select of an entry as a key
   ///
-  /// It has the header \ref DialogContextMenu.h "#include <kodi/gui/DialogContextMenu.h>"
+  /// It has the header \ref ContextMenu.h "#include <kodi/gui/dialogs/ContextMenu.h>"
   /// be included to enjoy it.
   ///
   ///
-  namespace DialogContextMenu
+  namespace ContextMenu
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogContextMenu
+    /// \ingroup cpp_kodi_gui_dialogs_ContextMenu
     /// @brief Show a context menu dialog about given parts.
     ///
     /// @param[in] heading   Dialog heading name
@@ -57,7 +59,7 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogContextMenu.h>
+    /// #include <kodi/gui/dialogs/ContextMenu.h>
     ///
     /// const std::vector<std::string> entries
     /// {
@@ -68,7 +70,7 @@ namespace gui
     ///   "Test 5"
     /// };
     ///
-    /// int selected = kodi::gui::DialogContextMenu::Show("Test selection", entries);
+    /// int selected = kodi::gui::dialogs::ContextMenu::Show("Test selection", entries);
     /// if (selected < 0)
     ///   fprintf(stderr, "Item selection canceled\n");
     /// else
@@ -91,5 +93,6 @@ namespace gui
     //--------------------------------------------------------------------------
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogExtendedProgress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
index b6f2deb..e9c5a9d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogExtendedProgress.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ExtendedProgress.h
@@ -19,22 +19,24 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_CDialogExtendedProgress Dialog Extended Progress
+  /// \defgroup cpp_kodi_gui_dialogs_CExtendedProgress Dialog Extended Progress
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::CDialogExtendedProgress }
+  /// @brief \cpp_class{ kodi::gui::dialogs::ExtendedProgress }
   /// **Progress dialog shown for background work**
   ///
-  /// The with \ref DialogExtendedProgress.h "#include <kodi/gui/DialogExtendedProgress.h>"
+  /// The with \ref ExtendedProgress.h "#include <kodi/gui/dialogs/ExtendedProgress.h>"
   /// given class are basically used to create Kodi's extended progress.
   ///
   ///
@@ -42,9 +44,9 @@ namespace gui
   ///
   /// **Example:**
   /// ~~~~~~~~~~~~~{.cpp}
-  /// #include <kodi/gui/DialogExtendedProgress.h>
+  /// #include <kodi/gui/dialogs/ExtendedProgress.h>
   ///
-  /// kodi::gui::CDialogExtendedProgress *ext_progress = new kodi::gui::CDialogExtendedProgress("Test Extended progress");
+  /// 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)
   /// {
@@ -63,17 +65,17 @@ namespace gui
   /// delete ext_progress;
   /// ~~~~~~~~~~~~~
   ///
-  class CDialogExtendedProgress
+  class CExtendedProgress
   {
   public:
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// Construct a new dialog
     ///
     /// @param[in] title  Title string
     ///
-    CDialogExtendedProgress(const std::string& title = "")
+    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());
@@ -84,10 +86,10 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// Destructor
     ///
-    ~CDialogExtendedProgress()
+    ~CExtendedProgress()
     {
       using namespace ::kodi::addon;
       if (m_DialogHandle)
@@ -97,7 +99,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief Get the used title
     ///
     /// @return Title string
@@ -119,7 +121,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To set the title of dialog
     ///
     /// @param[in] title     Title string
@@ -133,7 +135,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief Get the used text information string
     ///
     /// @return Text string
@@ -155,7 +157,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To set the used text information string
     ///
     /// @param[in] text         information text to set
@@ -169,7 +171,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To ask dialog is finished
     ///
     /// @return True if on end
@@ -183,7 +185,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief Mark progress finished
     ///
     void MarkFinished()
@@ -195,7 +197,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief Get the current progress position as percent
     ///
     /// @return Position
@@ -209,7 +211,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \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
@@ -223,7 +225,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogExtendedProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CExtendedProgress
     /// @brief To set progress position with predefined places
     ///
     /// @param[in] currentItem    Place position to use
@@ -240,5 +242,6 @@ namespace gui
     void* m_DialogHandle;
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogFileBrowser.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
index e348125..401a78d 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogFileBrowser.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/FileBrowser.h
@@ -19,35 +19,37 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogFileBrowser Dialog File Browser
+  /// \defgroup cpp_kodi_gui_dialogs_FileBrowser Dialog File Browser
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::DialogFileBrowser }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::FileBrowser }
   /// **File browser dialog**
   ///
-  /// The functions listed below of the class "DialogFileBrowser" offer
+  /// The functions listed below of the class "FileBrowser" offer
   /// the possibility to select to a file by the user of the add-on.
   ///
   /// It allows all the options that are possible in Kodi itself and offers all
   /// support file types.
   ///
-  /// It has the header \ref DialogFileBrowser.h "#include <kodi/gui/DialogFileBrowser.h>"
+  /// It has the header \ref FileBrowser.h "#include <kodi/gui/dialogs/FileBrowser.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogFileBrowser
+  namespace FileBrowser
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief Directory selection dialog
     ///
     /// @param[in] shares       With Shares becomes the available start folders
@@ -60,7 +62,7 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogFileBrowser.h>
+    /// #include <kodi/gui/dialogs/FileBrowser.h>
     ///
     /// /*
     ///  * Example show directory selection dialog with on 'share' (first value)
@@ -73,7 +75,7 @@ namespace gui
     ///  * to a start place.
     ///  */
     /// std::string directory;
-    /// bool ret = kodi::gui::DialogFileBrowser::ShowAndGetDirectory("local|network|removable",
+    /// bool ret = kodi::gui::dialogs::FileBrowser::ShowAndGetDirectory("local|network|removable",
     ///                                                    "Test directory selection",
     ///                                                    directory,
     ///                                                    false);
@@ -98,7 +100,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief File selection dialog
     ///
     /// @param[in] shares               With Shares becomes the available  start
@@ -133,7 +135,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief File selection from a directory
     ///
     /// @param[in] directory            The  directory  name  where  the  dialog
@@ -171,7 +173,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief File selection dialog to get several in to a list
     ///
     /// @param[in] shares             With Shares becomes  the  available  start
@@ -206,7 +208,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief Source selection dialog
     ///
     /// @param[in,out] path           As in the path to start and Return value
@@ -235,7 +237,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief Image selection dialog
     ///
     /// @param[in] shares     With Shares becomes the available start folders be
@@ -262,7 +264,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogFileBrowser
+    /// \ingroup cpp_kodi_gui_dialogs_FileBrowser
     /// @brief Image selection dialog to get several in to a list
     ///
     /// @param[in] shares       With Shares becomes the available  start folders
@@ -289,5 +291,6 @@ namespace gui
     //--------------------------------------------------------------------------
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogKeyboard.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
index 9261972..cff30d8 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogKeyboard.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h
@@ -19,19 +19,21 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogKeyboard Dialog Keyboard
+  /// \defgroup cpp_kodi_gui_dialogs_Keyboard Dialog Keyboard
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_namespace{ kodi::gui::DialogKeyboard }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::Keyboard }
   /// **Keyboard dialogs**
   ///
   /// The functions listed below have to be permitted by the user for the
@@ -40,14 +42,14 @@ namespace gui
   /// The class supports several kinds, from an easy text choice up to the
   /// passport Word production and their confirmation for add-on.
   ///
-  /// It has the header \ref DialogKeyboard.h "#include <kodi/gui/DialogKeyboard.h>"
+  /// It has the header \ref Keyboard.h "#include <kodi/gui/dialogs/Keyboard.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogKeyboard
+  namespace Keyboard
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Show keyboard with initial value `text` and replace with  result
     /// string.
     ///
@@ -67,7 +69,7 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogKeyboard.h>
+    /// #include <kodi/gui/dialogs/Keyboard.h>
     ///
     /// /*
     ///  * The example shows the display of keyboard call dialog at Kodi from the add-on.
@@ -76,7 +78,7 @@ namespace gui
     ///  */
     /// std::string text = "Please change me to them want you want"; /*< It can be leaved empty or a
     ///                                                                  entry text added */
-    /// bool bRet = ::kodi::gui::DialogKeyboard::ShowAndGetInput(text,
+    /// bool bRet = ::kodi::gui::dialogs::Keyboard::ShowAndGetInput(text,
     ///                                                      "Demonstration text entry",
     ///                                                      true,
     ///                                                      false,
@@ -104,7 +106,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief The example shows the display of keyboard  call dialog  at  Kodi
     /// from the add-on.
     ///
@@ -137,7 +139,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Shows  keyboard  and  prompts  for  a  password.   Differs  from
     /// `ShowAndVerifyNewPassword()` in that no second verification
     ///
@@ -170,7 +172,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Shows keyboard and prompts for a password. Differs from
     /// `ShowAndVerifyNewPassword()` in that no second verification
     ///
@@ -200,7 +202,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Show keyboard twice to  get and confirm a  user-entered  password
     /// string.
     ///
@@ -220,7 +222,7 @@ namespace gui
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
     /// #include <kodi/General.h>
-    /// #include <kodi/gui/DialogKeyboard.h>
+    /// #include <kodi/gui/dialogs/Keyboard.h>
     ///
     /// /*
     ///  * The example below shows the complete use of keyboard dialog for password
@@ -246,7 +248,7 @@ namespace gui
     ///   /*
     ///    * Ask the user about the password.
     ///    */
-    ///   ret = ::kodi::gui::DialogKeyboard::ShowAndVerifyPassword(password, "Demo password call for PW 'kodi'", i, 0);
+    ///   ret = ::kodi::gui::dialogs::Keyboard::ShowAndVerifyPassword(password, "Demo password call for PW 'kodi'", i, 0);
     ///   if (ret == 0)
     ///   {
     ///     fprintf(stderr, "Password successfull confirmed after '%i' tries\n", i+1);
@@ -283,7 +285,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Show keyboard twice to get and confirm  a user-entered  password
     /// string.
     ///
@@ -313,7 +315,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Show keyboard and verify user input against `password`.
     ///
     /// @param[in,out] password    Value to compare against user input.
@@ -347,7 +349,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Shows a filter related keyboard
     ///
     /// @param[in,out] text        Overwritten with user input if  return=true.
@@ -381,7 +383,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Send a text to a visible keyboard
     ///
     /// @param[in] text            Overwritten with user input if  return=true.
@@ -399,7 +401,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogKeyboard
+    /// \ingroup cpp_kodi_gui_dialogs_Keyboard
     /// @brief Check for visible keyboard on GUI
     ///
     /// @return  true if keyboard present, false if not present
@@ -412,5 +414,6 @@ namespace gui
     //--------------------------------------------------------------------------
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogNumeric.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
index 8b5c592..dddbf7e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogNumeric.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Numeric.h
@@ -19,20 +19,22 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogNumeric Dialog Numeric
+  /// \defgroup cpp_kodi_gui_dialogs_Numeric Dialog Numeric
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogNumeric }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::Numeric }
   /// **Numeric dialogs**
   ///
   /// The functions listed below have to be permitted by the user for the
@@ -41,14 +43,14 @@ namespace gui
   /// The class supports several kinds, from an easy number choice up to the
   /// passport Word production and their confirmation for add-on.
   ///
-  /// It has the header \ref DialogNumeric.h "#include <kodi/gui/DialogNumeric.h>"
+  /// It has the header \ref Numeric.h "#include <kodi/gui/dialogs/Numeric.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogNumeric
+  namespace Numeric
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get numeric new password
     ///
     /// @param[out] newPassword        String to preload into the keyboard
@@ -76,7 +78,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to verify numeric password.
     ///
     /// @param[in] password             Password to compare with user input, need
@@ -97,7 +99,7 @@ namespace gui
     /// ~~~~~~~~~~~~~{.cpp}
     /// #include <stdio.h>      /* fprintf */
     /// #include <kodi/General.h>
-    /// #include <kodi/gui/DialogNumeric.h>
+    /// #include <kodi/gui/dialogs/Numeric.h>
     ///
     /// /*
     ///  * The example below shows the complete use of keyboard dialog for password
@@ -123,7 +125,7 @@ namespace gui
     ///   /*
     ///    * Ask the user about the password.
     ///    */
-    ///   ret = kodi::gui::DialogNumeric::ShowAndVerifyPassword(password, "Demo numeric password call for PW '1234'", i);
+    ///   ret = kodi::gui::dialogs::Numeric::ShowAndVerifyPassword(password, "Demo numeric password call for PW '1234'", i);
     ///   if (ret == 0)
     ///   {
     ///     fprintf(stderr, "Numeric password successfull confirmed after '%i' tries\n", i+1);
@@ -151,7 +153,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to verify numeric password
     ///
     /// @param[in,out] toVerify         Value to compare against user input.
@@ -180,7 +182,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get time value.
     ///
     /// @param[out] time                Overwritten with user input if
@@ -197,7 +199,7 @@ namespace gui
     /// ~~~~~~~~~~~~~{.cpp}
     /// #include <stdio.h>      /* printf */
     /// #include <time.h>       /* time_t, struct tm, time, localtime, strftime */
-    /// #include <kodi/gui/DialogNumeric.h>
+    /// #include <kodi/gui/dialogs/Numeric.h>
     ///
     /// time_t rawtime;
     /// struct tm * timeinfo;
@@ -205,7 +207,7 @@ namespace gui
     ///
     /// time (&rawtime);
     /// timeinfo = localtime(&rawtime);
-    /// bool bRet = kodi::gui::DialogNumeric::ShowAndGetTime(*timeinfo, "Selected time test call");
+    /// bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetTime(*timeinfo, "Selected time test call");
     /// strftime(buffer, sizeof(buffer), "%H:%M.", timeinfo);
     /// printf("Selected time it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
@@ -219,7 +221,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get date value.
     ///
     /// @param[in,out] date             Overwritten with user input if
@@ -236,7 +238,7 @@ namespace gui
     /// ~~~~~~~~~~~~~{.cpp}
     /// #include <stdio.h>      /* printf */
     /// #include <time.h>       /* time_t, struct tm, time, localtime, strftime */
-    /// #include <kodi/gui/DialogNumeric.h>
+    /// #include <kodi/gui/dialogs/Numeric.h>
     ///
     /// time_t rawtime;
     /// struct tm * timeinfo;
@@ -244,7 +246,7 @@ namespace gui
     ///
     /// time (&rawtime);
     /// timeinfo = localtime(&rawtime);
-    /// bool bRet = kodi::gui::DialogNumeric::ShowAndGetDate(*timeinfo, "Selected date test call");
+    /// bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetDate(*timeinfo, "Selected date test call");
     /// strftime(buffer, sizeof(buffer), "%Y-%m-%d", timeinfo);
     /// printf("Selected date it's %s and was on Dialog %s\n", buffer, bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
@@ -258,7 +260,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get a IP
     ///
     /// @param[in,out] ipAddress        Overwritten with user input if
@@ -287,7 +289,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Use dialog to get normal number.
     ///
     /// @param[in,out] input            Overwritten with user input if
@@ -308,10 +310,10 @@ namespace gui
     /// ~~~~~~~~~~~~~{.cpp}
     ///   #include <stdio.h>      /* printf */
     ///   #include <stdlib.h>     /* strtoull (C++11) */
-    ///   #include <kodi/gui/DialogNumeric.h>
+    ///   #include <kodi/gui/dialogs/Numeric.h>
     ///
     ///   std::string number;
-    ///   bool bRet = kodi::gui::DialogNumeric::ShowAndGetNumber(number, "Number test call");
+    ///   bool bRet = kodi::gui::dialogs::Numeric::ShowAndGetNumber(number, "Number test call");
     ///   printf("Written number input is : %llu and was %s\n",
     ///                  strtoull(number.c_str(), nullptr, 0), bRet ? "OK" : "Canceled");
     /// ~~~~~~~~~~~~~
@@ -334,7 +336,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogNumeric
+    /// \ingroup cpp_kodi_gui_dialogs_Numeric
     /// @brief Show numeric keypad to get seconds.
     ///
     /// @param[in,out] time     Overwritten with user input if return=true and
@@ -362,5 +364,6 @@ namespace gui
   };
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogOK.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
index fa98241..12799b7 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogOK.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/OK.h
@@ -19,33 +19,35 @@
  *
  */
 
-#include "../AddonBase.h"
-#include "definitions.h"
+#include "../../AddonBase.h"
+#include "../definitions.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogOK Dialog OK
+  /// \defgroup cpp_kodi_gui_dialogs_OK Dialog OK
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogOK }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::OK }
   /// **OK dialog**
   ///
   /// The functions listed below permit the call of a dialogue of information, a
   /// confirmation of the user by press from OK required.
   ///
-  /// It has the header \ref DialogOK.h "#include <kodi/gui/DialogOK.h>"
+  /// It has the header \ref OK.h "#include <kodi/gui/dialogs/OK.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogOK
+  namespace OK
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogOK
+    /// \ingroup cpp_kodi_gui_dialogs_OK
     /// @brief Use dialog to inform user with text and confirmation with OK with continued string.
     ///
     /// @param[in] heading Dialog heading.
@@ -56,9 +58,9 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogOK.h>
+    /// #include <kodi/gui/dialogs/OK.h>
     /// ...
-    /// kodi::gui::DialogOK::ShowAndGetInput("Test dialog", "Hello World!\nI'm a call from add-on\n :) :D");
+    /// 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)
@@ -71,7 +73,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogOK
+    /// \ingroup cpp_kodi_gui_dialogs_OK
     /// @brief Use dialog to inform user with text and confirmation with OK with strings separated to the lines.
     ///
     /// @param[in] heading Dialog heading.
@@ -84,9 +86,9 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogOK.h>
+    /// #include <kodi/gui/dialogs/OK.h>
     /// ...
-    /// kodi::gui::DialogOK::ShowAndGetInput("Test dialog", "Hello World!", "I'm a call from add-on", " :) :D");
+    /// 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)
@@ -100,5 +102,6 @@ namespace gui
   }
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogProgress.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h
index e652644..3f18499 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogProgress.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Progress.h
@@ -19,30 +19,32 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_CDialogProgress Dialog Progress
+  /// \defgroup cpp_kodi_gui_dialogs_CProgress Dialog Progress
   /// \ingroup cpp_kodi_gui
-  /// @brief \cpp_class{ kodi::gui::CDialogProgress }
+  /// @brief \cpp_class{ kodi::gui::dialogs::CProgress }
   /// **Progress dialog shown in center**
   ///
-  /// The with \ref DialogProgress.h "#include <kodi/gui/DialogProgress.h>"
+  /// 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/DialogProgress.h>
+  /// #include <kodi/gui/dialogs/Progress.h>
   ///
-  /// kodi::gui::CDialogProgress *progress = new kodi::gui::CDialogProgress;
+  /// kodi::gui::dialogs::CProgress *progress = new kodi::gui::dialogs::CProgress;
   /// progress->SetHeading("Test progress");
   /// progress->SetLine(1, "line 1");
   /// progress->SetLine(2, "line 2");
@@ -58,29 +60,29 @@ namespace gui
   /// delete progress;
   /// ~~~~~~~~~~~~~
   ///
-  class CDialogProgress
+  class CProgress
   {
   public:
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Construct a new dialog
     ///
-    CDialogProgress()
+    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::CDialogProgress can't create window class from Kodi !!!");
+        kodi::Log(ADDON_LOG_FATAL, "kodi::gui::dialogs::CProgress can't create window class from Kodi !!!");
     }
     //--------------------------------------------------------------------------
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Destructor
     ///
-    ~CDialogProgress()
+    ~CProgress()
     {
       using namespace ::kodi::addon;
       if (m_DialogHandle)
@@ -90,7 +92,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To open the dialog
     ///
     void Open()
@@ -102,7 +104,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Set the heading title of dialog
     ///
     /// @param[in] heading Title string to use
@@ -116,7 +118,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To set the line text field on dialog from 0 - 2
     ///
     /// @param[in] iLine Line number
@@ -131,7 +133,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To enable and show cancel button on dialog
     ///
     /// @param[in] canCancel if true becomes it shown
@@ -145,7 +147,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To check dialog for clicked cancel button
     ///
     /// @return True if canceled
@@ -159,7 +161,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief Get the current progress position as percent
     ///
     /// @param[in] percentage Position to use from 0 to 100
@@ -173,7 +175,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To set the current progress position as percent
     ///
     /// @return Current Position used from 0 to 100
@@ -187,7 +189,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To show or hide progress bar dialog
     ///
     /// @param[in] onOff If true becomes it shown
@@ -201,7 +203,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \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
@@ -215,7 +217,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \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
@@ -229,7 +231,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_CDialogProgress
+    /// \ingroup cpp_kodi_gui_dialogs_CProgress
     /// @brief To check progress was canceled on work
     ///
     /// @return True if aborted
@@ -245,5 +247,6 @@ namespace gui
     void* m_DialogHandle;
   };
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogSelect.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
index 36433db..963c84c 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogSelect.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h
@@ -19,41 +19,44 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogSelect Dialog Select
+  /// \defgroup cpp_kodi_gui_dialogs_Select Dialog Select
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogSelect }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::Select }
   /// **Selection dialog**
   ///
   /// The function listed below permits the call of a dialogue to select of an
   /// entry as a key
   ///
-  /// It has the header \ref DialogSelect.h "#include <kodi/gui/DialogSelect.h>"
+  /// It has the header \ref Select.h "#include <kodi/gui/dialogs/Select.h>"
   /// be included to enjoy it.
   ///
   ///
-  namespace DialogSelect
+  namespace Select
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogSelect
+    /// \ingroup cpp_kodi_gui_dialogs_Select
     /// @brief Show a selection dialog about given parts.
     ///
     /// @param[in] heading      Dialog heading name
     /// @param[in] entries      String list about entries
     /// @param[in] selected     [opt] Predefined selection (default is
     ///                         <tt>-1</tt> for the first)
-    /// @param[in] autoclose    [opt] To close dialog automatic after a time
+    /// @param[in] autoclose    [opt] To close dialog automatic after the given
+    ///                         time in ms. As '0' it stays open.
     /// @return                 The selected entry, if return <tt>-1</tt> was
     ///                         nothing selected or canceled
     ///
@@ -62,7 +65,7 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogSelect.h>
+    /// #include <kodi/gui/dialogs/Select.h>
     ///
     /// const std::vector<std::string> entries
     /// {
@@ -73,14 +76,14 @@ namespace gui
     ///   "Test 5"
     /// };
     ///
-    /// int selected = kodi::gui::DialogSelect::Show("Test selection", entries, -1);
+    /// int selected = kodi::gui::dialogs::Select::Show("Test selection", entries, -1);
     /// if (selected < 0)
     ///   fprintf(stderr, "Item selection canceled\n");
     /// else
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::string>& entries, int selected = -1, bool autoclose = false)
+    inline int 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();
@@ -97,5 +100,6 @@ namespace gui
   };
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogTextViewer.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
index 09c81bd..c64bc1e 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogTextViewer.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/TextViewer.h
@@ -19,20 +19,22 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogTextViewer Dialog Text Viewer
+  /// \defgroup cpp_kodi_gui_dialogs_TextViewer Dialog Text Viewer
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogTextViewer }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::TextViewer }
   /// **Text viewer dialog**
   ///
   /// The text viewer dialog can be used to display descriptions, help texts or
@@ -42,14 +44,14 @@ namespace gui
   /// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
   /// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
   ///
-  /// It has the header \ref DialogTextViewer.h "#include <kodi/gui/DialogTextViewer.h>"
+  /// It has the header \ref TextViewer.h "#include <kodi/gui/dialogs/TextViewer.h>"
   /// be included to enjoy it.
   ///
-  namespace DialogTextViewer
+  namespace TextViewer
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogTextViewer
+    /// \ingroup cpp_kodi_gui_dialogs_TextViewer
     /// @brief Show info text dialog
     ///
     /// @param[in] heading  Small heading text
@@ -60,9 +62,9 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogTextViewer.h>
+    /// #include <kodi/gui/dialogs/TextViewer.h>
     ///
-    /// kodi::gui::DialogTextViewer::Show("The Wizard of Oz (1939 film)",
+    /// kodi::gui::dialogs::TextViewer::Show("The Wizard of Oz (1939 film)",
     ///  "The Wizard of Oz is a 1939 American musical comedy-drama fantasy film "
     ///  "produced by Metro-Goldwyn-Mayer, and the most well-known and commercially "
     ///  "successful adaptation based on the 1900 novel The Wonderful Wizard of Oz "
@@ -111,5 +113,6 @@ namespace gui
   };
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogYesNo.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
index 064bf8c..d9c34ff 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/DialogYesNo.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/YesNo.h
@@ -19,20 +19,22 @@
  *
  */
 
-#include "definitions.h"
-#include "../AddonBase.h"
+#include "../definitions.h"
+#include "../../AddonBase.h"
 
 namespace kodi
 {
 namespace gui
 {
+namespace dialogs
+{
 
   //============================================================================
   ///
-  /// \defgroup cpp_kodi_gui_DialogYesNo Dialog Yes/No
+  /// \defgroup cpp_kodi_gui_dialogs_YesNo Dialog Yes/No
   /// \ingroup cpp_kodi_gui
   /// @{
-  /// @brief \cpp_namespace{ kodi::gui::DialogYesNo }
+  /// @brief \cpp_namespace{ kodi::gui::dialogs::YesNo }
   /// **Yes / No dialog**
   ///
   /// The Yes / No dialog can be used to inform the user about questions and get
@@ -42,15 +44,15 @@ namespace gui
   /// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
   /// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
   ///
-  /// It has the header \ref DialogYesNo.h "#include <kodi/gui/DialogYesNo.h>"
+  /// It has the header \ref YesNo.h "#include <kodi/gui/dialogs/YesNo.h>"
   /// be included to enjoy it.
   ///
   ///
-  namespace DialogYesNo
+  namespace YesNo
   {
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogYesNo
+    /// \ingroup cpp_kodi_gui_dialogs_YesNo
     /// @brief Use dialog to get numeric new password with one text string shown
     /// everywhere and cancel return field
     ///
@@ -68,10 +70,10 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogYesNo.h>
+    /// #include <kodi/gui/dialogs/YesNo.h>
     ///
     /// bool canceled;
-    /// bool ret = kodi::gui::DialogYesNo::ShowAndGetInput(
+    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
     ///    "Yes / No test call",   /* The Header */
     ///    "You has opened Yes / No dialog for test\n\nIs this OK for you?",
     ///    canceled,               /* return value about cancel button */
@@ -95,7 +97,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogYesNo
+    /// \ingroup cpp_kodi_gui_dialogs_YesNo
     /// @brief Use dialog to get numeric new password with separated line strings
     ///
     /// @param[in] heading      Dialog heading
@@ -111,9 +113,9 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogYesNo.h>
+    /// #include <kodi/gui/dialogs/YesNo.h>
     ///
-    /// bool ret = kodi::gui::DialogYesNo::ShowAndGetInput(
+    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
     ///    "Yes / No test call",   // The Header
     ///    "You has opened Yes / No dialog for test",
     ///    "",
@@ -137,7 +139,7 @@ namespace gui
 
     //==========================================================================
     ///
-    /// \ingroup cpp_kodi_gui_DialogYesNo
+    /// \ingroup cpp_kodi_gui_dialogs_YesNo
     /// @brief Use dialog to get numeric new password with separated line strings and cancel return field
     ///
     /// @param[in] heading      Dialog heading
@@ -154,10 +156,10 @@ namespace gui
     ///
     /// **Example:**
     /// ~~~~~~~~~~~~~{.cpp}
-    /// #include <kodi/gui/DialogYesNo.h>
+    /// #include <kodi/gui/dialogs/YesNo.h>
     ///
     /// bool canceled;
-    /// bool ret = kodi::gui::DialogYesNo::ShowAndGetInput(
+    /// bool ret = kodi::gui::dialogs::YesNo::ShowAndGetInput(
     ///    "Yes / No test call",   // The Header
     ///    "You has opened Yes / No dialog for test",
     ///    "",
@@ -183,5 +185,6 @@ namespace gui
   };
   /// @}
 
+} /* namespace dialogs */
 } /* namespace gui */
 } /* namespace kodi */
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h
deleted file mode 100644
index b0ecb8b..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h
+++ /dev/null
@@ -1,529 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-/*!
- * @file kodi_adsp_dll.h
- * @section sec1 Basic audio dsp addon interface description
- * @author Team Kodi
- * @date 10. May 2014
- * @version 0.1.5
- *
- * @subsection sec1_1 General
- * @li The basic support on the addon is supplied with the
- * AE_DSP_ADDON_CAPABILITIES data which becomes asked over
- * GetAddonCapabilities(...), further the addon must register his available
- * modes on startup with the RegisterMode(...) callback function (see
- * libKODI_adsp.h). If one of this two points is not set the addon becomes
- * ignored for the chain step.
- *
- * @subsection sec1_2 Processing
- * @li On start of new stream the addon becomes called with StreamCreate(...)
- * to check about given values that it support it basically and can create
- * his structure, if nothing is supported it can return AE_DSP_ERROR_IGNORE_ME.
- *
- * @li As next step StreamIsModeSupported(...) becomes called for every
- * available and enabled modes, is separated due to more as one available mode
- * on the addon is possible, if the mode is not supported it can also be return
- * AE_DSP_ERROR_IGNORE_ME.
- *   - If mode is a resample mode and returns no error it becomes asked with
- *     InputResampleSampleRate(...) or OutputResampleSampleRate(...) (relevant
- *     to his type) about his given sample rate.
- *   - About the from user selected master processing mode the related addon
- *     becomes called now with MasterProcessSetMode(...) to handle it's
- *     selection on the addon given by the own addon type identifier or by
- *     KODI's useddatabase id, also the currently used stream type (e.g.
- *     Music or Video) is send.
- *     - If the addon supports only one master mode it can ignore this function
- *       and return always AE_DSP_ERROR_NO_ERROR.
- *     - If the master mode is set the addon becomes asked about the from him
- *       given output channel layout related to up- or downmix modes, if
- *       nothing becomes changed on the layout it can return -1.
- *     - The MasterProcessSetMode(...) is also called if from user a another
- *       mode becomes selected.
- *
- * @li Then as last step shortly before the first process call becomes executed
- * the addon is called one time with StreamInitialize(...) to inform that
- * processing is started on the given settings.
- *   - This function becomes also called on all add-ons if the master process
- *     becomes changed.
- *   - Also every process after StreamInitialize on the addon mode becomes asked
- *     with _..._ProcessNeededSamplesize(...) about required memory size for the
- *     output of his data, if no other size is required it can return 0.
- *
- * @li From now the processing becomes handled for the different steps with
- * _..._Process(...).
- *   - Further it becomes asked with _..._GetDelay(...) about his processing
- *     time as float value in seconds, needed for video and audio alignment.
- *
- * @li On the end of the processing if the source becomes stopped the
- * StreamDestroy(...) function becomes called on all active processing add-ons.
- *
- * @note
- * The StreamCreate(...) can be becomes called for a new stream before the
- * previous was closed with StreamDestroy(...) ! To have a speed improve.
- */
-
-#include "xbmc_addon_dll.h"
-#include "kodi_adsp_types.h"
-
-/*!
- * Functions that the Audio DSP 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 Audio DSP add-on methods */
-  //@{
-  /*!
-   * @brief Get the list of features that this add-on provides.
-   * Called by KODI to query the add-ons capabilities.
-   * Used to check which options should be presented in the DSP, which methods
-   * to call, etc.
-   * All capabilities that the add-on supports should be set to true.
-   * @param pCapabilities The add-ons capabilities.
-   * @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully.
-   * @remarks Valid implementation required.
-   */
-  AE_DSP_ERROR GetAddonCapabilities(AE_DSP_ADDON_CAPABILITIES *pCapabilities);
-
-  /*!
-   * @return The name reported by the back end that will be displayed in the
-   * UI.
-   * @remarks Valid implementation required.
-   */
-  const char* GetDSPName(void);
-
-  /*!
-   * @return The version string reported by the back end that will be displayed
-   * in the UI.
-   * @remarks Valid implementation required.
-   */
-  const char* GetDSPVersion(void);
-
-  /*!
-   * @brief Call one of the menu hooks (if supported).
-   * Supported AE_DSP_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 AE_DSP_ERROR_NO_ERROR if the hook was called successfully.
-   * @remarks Optional. Return AE_DSP_ERROR_NOT_IMPLEMENTED if this add-on
-   * won't provide this function.
-   */
-  AE_DSP_ERROR CallMenuHook(const AE_DSP_MENUHOOK& menuhook, const AE_DSP_MENUHOOK_DATA &item);
-  //@}
-
-  /** @name DSP processing control, used to open and close a stream
-   *  @remarks Valid implementation required.
-   */
-  //@{
-  /*!
-   * @brief Set up Audio DSP with selected audio settings (use the basic
-   * present audio stream data format).
-   * Used to detect available add-ons for present stream, as example stereo
-   * surround upmix not needed on 5.1 audio stream.
-   * @param addonSettings The add-ons audio settings.
-   * @param pProperties The properties of the currently playing stream.
-   * @param handle On this becomes addon informed about stream id and can set function addresses which need on calls
-   * @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully
-   * and data can be performed. AE_DSP_ERROR_IGNORE_ME if format is not
-   * supported, but without fault.
-   * @remarks Valid implementation required.
-   */
-  AE_DSP_ERROR StreamCreate(const AE_DSP_SETTINGS *addonSettings, const AE_DSP_STREAM_PROPERTIES* pProperties, ADDON_HANDLE handle);
-
-  /*!
-   * Remove the selected id from currently used DSP processes
-   * @param handle identification data for stream
-   * @return AE_DSP_ERROR_NO_ERROR if the becomes found and removed
-   * @remarks Valid implementation required.
-   */
-  AE_DSP_ERROR StreamDestroy(const ADDON_HANDLE handle);
-
-  /*!
-   * @brief Ask the add-on about a requested processing mode that it is
-   * supported on the current stream. Is called about every add-on mode after
-   * successed StreamCreate.
-   * @param handle identification data for stream
-   * @param type The processing mode type, see AE_DSP_MODE_TYPE for definitions
-   * @param mode_id The mode inside add-on which must be performed on call. Id
-   * is set from add-on by iModeNumber on AE_DSP_MODE structure during
-   * RegisterMode callback,
-   * @param unique_db_mode_id The Mode unique id generated from dsp database.
-   * @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully
-   * or if the stream is not supported the add-on must return
-   * AE_DSP_ERROR_IGNORE_ME.
-   * @remarks Valid implementation required.
-   */
-  AE_DSP_ERROR StreamIsModeSupported(const ADDON_HANDLE handle, AE_DSP_MODE_TYPE type, unsigned int mode_id, int unique_db_mode_id);
-
-  /*!
-   * @brief Set up Audio DSP with selected audio settings (detected on data of
-   * first present audio packet)
-   * @param addonSettings The add-ons audio settings.
-   * @return AE_DSP_ERROR_NO_ERROR if the properties were fetched successfully.
-   * @remarks Valid implementation required.
-   */
-  AE_DSP_ERROR StreamInitialize(const ADDON_HANDLE handle, const AE_DSP_SETTINGS *addonSettings);
-  //@}
-
-  /** @name DSP input processing
-   *  @remarks Only used by KODI if bSupportsInputProcess is set to true.
-   */
-  //@{
-  /*!
-   * @brief DSP input processing
-   * Can be used to have unchanged stream..
-   * All DSP add-ons allowed to-do this.
-   * @param handle identification data for stream
-   * @param array_in Pointer to data memory
-   * @param samples Amount of samples inside array_in
-   * @return true if work was OK
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  bool InputProcess(const ADDON_HANDLE handle, const float **array_in, unsigned int samples);
-  //@}
-
-  /** @name DSP pre-resampling
-   *  @remarks Only used by KODI if bSupportsInputResample is set to true.
-   */
-  //@{
-  /*!
-   * @brief If the add-on operate with buffered arrays and the output size can
-   * be higher as the input it becomes asked about needed size before any
-   * InputResampleProcess call.
-   * @param handle identification data for stream
-   * @return The needed size of output array or 0 if no changes within it
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int InputResampleProcessNeededSamplesize(const ADDON_HANDLE handle);
-
-  /*!
-   * @brief DSP re sample processing before master.
-   * Here a high quality resample can be performed.
-   * Only one DSP add-on is allowed to-do this!
-   * @param handle identification data for stream
-   * @param array_in Pointer to input data memory
-   * @param array_out Pointer to output data memory
-   * @param samples Amount of samples inside array_in
-   * @return Amount of samples processed
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int InputResampleProcess(const ADDON_HANDLE handle, float **array_in, float **array_out, unsigned int samples);
-
-  /*!
-   * @brief Returns the re-sampling generated new sample rate used before the
-   * master process
-   * @param handle identification data for stream
-   * @return The new sample rate
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  int InputResampleSampleRate(const ADDON_HANDLE handle);
-
-  /*!
-   * @brief Returns the time in seconds that it will take
-   * for the next added packet to be returned to KODI.
-   * @param handle identification data for stream
-   * @return the delay in seconds
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  float InputResampleGetDelay(const ADDON_HANDLE handle);
-  //@}
-
-  /** @name DSP Pre processing
-   *  @remarks Only used by KODI if bSupportsPreProcess is set to true.
-   */
-  //@{
-  /*!
-   * @brief If the addon operate with buffered arrays and the output size can
-   * be higher as the input it becomes asked about needed size before any
-   * PreProcess call.
-   * @param handle identification data for stream
-   * @param mode_id The mode inside add-on which must be performed on call. Id
-   * is set from add-on by iModeNumber on AE_DSP_MODE structure during
-   * RegisterMode callback and can be defined from add-on as a structure
-   * pointer or anything else what is needed to find it.
-   * @return The needed size of output array or 0 if no changes within it
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int PreProcessNeededSamplesize(const ADDON_HANDLE handle, unsigned int mode_id);
-
-  /*!
-   * @brief Returns the time in seconds that it will take
-   * for the next added packet to be returned to KODI.
-   * @param handle identification data for stream
-   * @param mode_id The mode inside add-on which must be performed on call. Id
-   * is set from add-on by iModeNumber on AE_DSP_MODE structure during
-   * RegisterMode callback and can be defined from add-on as a structure
-   * pointer or anything else what is needed to find it.
-   * @return the delay in seconds
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  float PreProcessGetDelay(const ADDON_HANDLE handle, unsigned int mode_id);
-
-  /*!
-   * @brief DSP preprocessing
-   * All DSP add-ons allowed to-do this.
-   * @param handle identification data for stream
-   * @param mode_id The mode inside add-on which must be performed on call. Id
-   * is set from add-on by iModeNumber on AE_DSP_MODE structure during
-   * RegisterMode callback and can be defined from add-on as a structure
-   * pointer or anything else what is needed to find it.
-   * @param array_in Pointer to input data memory
-   * @param array_out Pointer to output data memory
-   * @param samples Amount of samples inside array_in
-   * @return Amount of samples processed
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int PreProcess(const ADDON_HANDLE handle, unsigned int mode_id, float **array_in, float **array_out, unsigned int samples);
-  //@}
-
-  /** @name DSP Master processing
-   *  @remarks Only used by KODI if bSupportsMasterProcess is set to true.
-   */
-  //@{
-  /*!
-   * @brief Set the active master process mode
-   * @param handle identification data for stream
-   * @param type Requested stream type for the selected master mode
-   * @param mode_id The Mode identifier.
-   * @param unique_db_mode_id The Mode unique id generated from DSP database.
-   * @return AE_DSP_ERROR_NO_ERROR if the setup was successful
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  AE_DSP_ERROR MasterProcessSetMode(const ADDON_HANDLE handle, AE_DSP_STREAMTYPE type, unsigned int mode_id, int unique_db_mode_id);
-
-  /*!
-   * @brief If the add-on operate with buffered arrays and the output size can
-   * be higher as the input it becomes asked about needed size before any
-   * MasterProcess call.
-   * @param handle identification data for stream
-   * @return The needed size of output array or 0 if no changes within it
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int MasterProcessNeededSamplesize(const ADDON_HANDLE handle);
-
-  /*!
-   * @brief Returns the time in seconds that it will take
-   * for the next added packet to be returned to KODI.
-   * @param handle identification data for stream
-   * @return the delay in seconds
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  float MasterProcessGetDelay(const ADDON_HANDLE handle);
-
-  /*!
-   * @brief Returns the from selected master mode performed channel alignment
-   * @param handle identification data for stream
-   * @retval out_channel_present_flags the exact channel present flags after
-   * performed up-/downmix
-   * @return the amount channels
-   * @remarks Optional. Must be used and set if a channel up- or downmix is
-   * processed from the active master mode
-   */
-  int MasterProcessGetOutChannels(const ADDON_HANDLE handle, unsigned long &out_channel_present_flags);
-
-  /*!
-   * @brief Master processing becomes performed with it
-   * Here a channel up-mix/down-mix for stereo surround sound can be performed
-   * Only one DSP add-on is allowed to-do this!
-   * @param handle identification data for stream
-   * @param array_in Pointer to input data memory
-   * @param array_out Pointer to output data memory
-   * @param samples Amount of samples inside array_in
-   * @return Amount of samples processed
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int MasterProcess(const ADDON_HANDLE handle, float **array_in, float **array_out, unsigned int samples);
-
-  /*!
-   * Used to get a information string about the processed work to show on skin
-   * @return A string to show
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  const char *MasterProcessGetStreamInfoString(const ADDON_HANDLE handle);
-  //@}
-
-  /** @name DSP Post processing
-   *  @remarks Only used by KODI if bSupportsPostProcess is set to true.
-   */
-  //@{
-  /*!
-   * If the add-on operate with buffered arrays and the output size can be
-   * higher as the input it becomes asked about needed size before any
-   * PostProcess call.
-   * @param handle identification data for stream
-   * @param mode_id The mode inside add-on which must be performed on call. Id
-   * is set from add-on by iModeNumber on AE_DSP_MODE structure during
-   * RegisterMode callback, and can be defined from add-on as a structure
-   * pointer or anything else what is needed to find it.
-   * @return The needed size of output array or 0 if no changes within it
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int PostProcessNeededSamplesize(const ADDON_HANDLE handle, unsigned int mode_id);
-
-  /*!
-   * Returns the time in seconds that it will take
-   * for the next added packet to be returned to KODI.
-   * @param handle identification data for stream
-   * @param mode_id The mode inside add-on which must be performed on call. Id
-   * is set from add-on by iModeNumber on AE_DSP_MODE structure during
-   * RegisterMode callback, and can be defined from add-on as a structure
-   * pointer or anything else what is needed to find it.
-   * @return the delay in seconds
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  float PostProcessGetDelay(const ADDON_HANDLE handle, unsigned int mode_id);
-
-  /*!
-   * @brief DSP post processing
-   * On the post processing can be things performed with additional channel
-   * upmix like 6.1 to 7.1
-   * or frequency/volume corrections, speaker distance handling, equalizer... .
-   * All DSP add-ons allowed to-do this.
-   * @param handle identification data for stream
-   * @param mode_id The mode inside add-on which must be performed on call. Id
-   * is set from add-on by iModeNumber on AE_DSP_MODE structure during
-   * RegisterMode callback, and can be defined from add-on as a structure
-   * pointer or anything else what is needed to find it.
-   * @param array_in Pointer to input data memory
-   * @param array_out Pointer to output data memory
-   * @param samples Amount of samples inside array_in
-   * @return Amount of samples processed
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int PostProcess(const ADDON_HANDLE handle, unsigned int mode_id, float **array_in, float **array_out, unsigned int samples);
-  //@}
-
-  /** @name DSP Post re-sampling
-   *  @remarks Only used by KODI if bSupportsOutputResample is set to true.
-   */
-  //@{
-  /*!
-   * @brief If the add-on operate with buffered arrays and the output size
-   * can be higher as the input
-   * it becomes asked about needed size before any OutputResampleProcess call.
-   * @param handle identification data for stream
-   * @return The needed size of output array or 0 if no changes within it
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int OutputResampleProcessNeededSamplesize(const ADDON_HANDLE handle);
-
-  /*!
-   * @brief Re-sampling after master processing becomes performed with it if
-   * needed, only
-   * one add-on can perform it.
-   * @param handle identification data for stream
-   * @param array_in Pointer to input data memory
-   * @param array_out Pointer to output data memory
-   * @param samples Amount of samples inside array_in
-   * @return Amount of samples processed
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  unsigned int OutputResampleProcess(const ADDON_HANDLE handle, float **array_in, float **array_out, unsigned int samples);
-
-  /*!
-   * @brief Returns the re-sampling generated new sample rate used after the
-   * master process.
-   * @param handle identification data for stream
-   * @return The new sample rate
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  int OutputResampleSampleRate(const ADDON_HANDLE handle);
-
-  /*!
-   * @brief Returns the time in seconds that it will take for the next added
-   * packet to be returned to KODI.
-   * @param handle identification data for stream
-   * @return the delay in seconds
-   * @remarks Optional. Is set by AE_DSP_ADDON_CAPABILITIES and asked with
-   * GetAddonCapabilities
-   */
-  float OutputResampleGetDelay(const ADDON_HANDLE handle);
-  //@}
-
-  // function to export the above structure to KODI
-  void __declspec(dllexport) get_addon(void* ptr)
-  {
-    KodiToAddonFuncTable_AudioDSP* pDSP = static_cast<KodiToAddonFuncTable_AudioDSP*>(ptr);
-
-    pDSP->GetAddonCapabilities                  = GetAddonCapabilities;
-    pDSP->GetDSPName                            = GetDSPName;
-    pDSP->GetDSPVersion                         = GetDSPVersion;
-    pDSP->MenuHook                              = CallMenuHook;
-
-    pDSP->StreamCreate                          = StreamCreate;
-    pDSP->StreamDestroy                         = StreamDestroy;
-    pDSP->StreamIsModeSupported                 = StreamIsModeSupported;
-    pDSP->StreamInitialize                      = StreamInitialize;
-
-    pDSP->InputProcess                          = InputProcess;
-
-    pDSP->InputResampleProcessNeededSamplesize  = InputResampleProcessNeededSamplesize;
-    pDSP->InputResampleProcess                  = InputResampleProcess;
-    pDSP->InputResampleGetDelay                 = InputResampleGetDelay;
-    pDSP->InputResampleSampleRate               = InputResampleSampleRate;
-
-    pDSP->PreProcessNeededSamplesize            = PreProcessNeededSamplesize;
-    pDSP->PreProcessGetDelay                    = PreProcessGetDelay;
-    pDSP->PreProcess                            = PreProcess;
-
-    pDSP->MasterProcessSetMode                  = MasterProcessSetMode;
-    pDSP->MasterProcessNeededSamplesize         = MasterProcessNeededSamplesize;
-    pDSP->MasterProcessGetDelay                 = MasterProcessGetDelay;
-    pDSP->MasterProcessGetOutChannels           = MasterProcessGetOutChannels;
-    pDSP->MasterProcess                         = MasterProcess;
-    pDSP->MasterProcessGetStreamInfoString      = MasterProcessGetStreamInfoString;
-
-    pDSP->PostProcessNeededSamplesize           = PostProcessNeededSamplesize;
-    pDSP->PostProcessGetDelay                   = PostProcessGetDelay;
-    pDSP->PostProcess                           = PostProcess;
-
-    pDSP->OutputResampleProcessNeededSamplesize = OutputResampleProcessNeededSamplesize;
-    pDSP->OutputResampleProcess                 = OutputResampleProcess;
-    pDSP->OutputResampleSampleRate              = OutputResampleSampleRate;
-    pDSP->OutputResampleGetDelay                = OutputResampleGetDelay;
-  };
-};
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h
deleted file mode 100644
index 7dc7ae8..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h
+++ /dev/null
@@ -1,543 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-/*!
- * Common data structures shared between KODI and KODI's audio DSP add-ons
- */
-
-#ifndef TARGET_WINDOWS
-#ifndef __cdecl
-#define __cdecl
-#endif
-#ifndef __declspec
-#define __declspec(X)
-#endif
-#endif
-
-#include <cstddef>
-
-#include "xbmc_addon_types.h"
-
-#undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN
-#undef PRAGMA_PACK_END
-
-#if defined(__GNUC__)
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#define ATTRIBUTE_PACKED __attribute__ ((packed))
-#define PRAGMA_PACK 0
-#endif
-#endif
-
-#if !defined(ATTRIBUTE_PACKED)
-#define ATTRIBUTE_PACKED
-#define PRAGMA_PACK 1
-#endif
-
-#define AE_DSP_ADDON_STRING_LENGTH              1024
-
-#define AE_DSP_STREAM_MAX_STREAMS               8
-#define AE_DSP_STREAM_MAX_MODES                 32
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-  typedef void* ADSPHANDLE;
-  typedef unsigned int AE_DSP_STREAM_ID;
-
-  /*!
-   * @brief Audio DSP add-on error codes
-   */
-  typedef enum
-  {
-    AE_DSP_ERROR_NO_ERROR             = 0,      /*!< @brief no error occurred */
-    AE_DSP_ERROR_UNKNOWN              = -1,     /*!< @brief an unknown error occurred */
-    AE_DSP_ERROR_IGNORE_ME            = -2,     /*!< @brief the used input stream can not processed and add-on want to ignore */
-    AE_DSP_ERROR_NOT_IMPLEMENTED      = -3,     /*!< @brief the method that KODI called is not implemented by the add-on */
-    AE_DSP_ERROR_REJECTED             = -4,     /*!< @brief the command was rejected by the DSP */
-    AE_DSP_ERROR_INVALID_PARAMETERS   = -5,     /*!< @brief the parameters of the method that was called are invalid for this operation */
-    AE_DSP_ERROR_INVALID_SAMPLERATE   = -6,     /*!< @brief the processed samplerate is not supported */
-    AE_DSP_ERROR_INVALID_IN_CHANNELS  = -7,     /*!< @brief the processed input channel format is not supported */
-    AE_DSP_ERROR_INVALID_OUT_CHANNELS = -8,     /*!< @brief the processed output channel format is not supported */
-    AE_DSP_ERROR_FAILED               = -9,     /*!< @brief the command failed */
-  } AE_DSP_ERROR;
-
-  /*!
-   * @brief The possible DSP channels (used as pointer inside arrays)
-   */
-  typedef enum
-  {
-    AE_DSP_CH_INVALID = -1,
-    AE_DSP_CH_FL = 0,
-    AE_DSP_CH_FR,
-    AE_DSP_CH_FC,
-    AE_DSP_CH_LFE,
-    AE_DSP_CH_BL,
-    AE_DSP_CH_BR,
-    AE_DSP_CH_FLOC,
-    AE_DSP_CH_FROC,
-    AE_DSP_CH_BC,
-    AE_DSP_CH_SL,
-    AE_DSP_CH_SR,
-    AE_DSP_CH_TFL,
-    AE_DSP_CH_TFR,
-    AE_DSP_CH_TFC,
-    AE_DSP_CH_TC,
-    AE_DSP_CH_TBL,
-    AE_DSP_CH_TBR,
-    AE_DSP_CH_TBC,
-    AE_DSP_CH_BLOC,
-    AE_DSP_CH_BROC,
-
-    AE_DSP_CH_MAX
-  } AE_DSP_CHANNEL;
-
-  /*!
-   * @brief Present channel flags
-   */
-  typedef enum
-  {
-    AE_DSP_PRSNT_CH_UNDEFINED = 0,
-    AE_DSP_PRSNT_CH_FL        = 1<<0,
-    AE_DSP_PRSNT_CH_FR        = 1<<1,
-    AE_DSP_PRSNT_CH_FC        = 1<<2,
-    AE_DSP_PRSNT_CH_LFE       = 1<<3,
-    AE_DSP_PRSNT_CH_BL        = 1<<4,
-    AE_DSP_PRSNT_CH_BR        = 1<<5,
-    AE_DSP_PRSNT_CH_FLOC      = 1<<6,
-    AE_DSP_PRSNT_CH_FROC      = 1<<7,
-    AE_DSP_PRSNT_CH_BC        = 1<<8,
-    AE_DSP_PRSNT_CH_SL        = 1<<9,
-    AE_DSP_PRSNT_CH_SR        = 1<<10,
-    AE_DSP_PRSNT_CH_TFL       = 1<<11,
-    AE_DSP_PRSNT_CH_TFR       = 1<<12,
-    AE_DSP_PRSNT_CH_TFC       = 1<<13,
-    AE_DSP_PRSNT_CH_TC        = 1<<14,
-    AE_DSP_PRSNT_CH_TBL       = 1<<15,
-    AE_DSP_PRSNT_CH_TBR       = 1<<16,
-    AE_DSP_PRSNT_CH_TBC       = 1<<17,
-    AE_DSP_PRSNT_CH_BLOC      = 1<<18,
-    AE_DSP_PRSNT_CH_BROC      = 1<<19
-  } AE_DSP_CHANNEL_PRESENT;
-
-  /**
-   * @brief The various stream type formats
-   * Used for audio DSP processing to know input audio type
-   */
-  typedef enum
-  {
-    AE_DSP_ASTREAM_INVALID = -1,
-    AE_DSP_ASTREAM_BASIC = 0,
-    AE_DSP_ASTREAM_MUSIC,
-    AE_DSP_ASTREAM_MOVIE,
-    AE_DSP_ASTREAM_GAME,
-    AE_DSP_ASTREAM_APP,
-    AE_DSP_ASTREAM_PHONE,
-    AE_DSP_ASTREAM_MESSAGE,
-
-    AE_DSP_ASTREAM_AUTO,
-    AE_DSP_ASTREAM_MAX
-  } AE_DSP_STREAMTYPE;
-
-  /*!
-   * @brief Add-ons supported audio stream type flags
-   * used on master mode information on AE_DSP_MODES to know
-   * on which audio stream the master mode is supported
-   */
-  typedef enum
-  {
-    AE_DSP_PRSNT_ASTREAM_BASIC    = 1<<0,
-    AE_DSP_PRSNT_ASTREAM_MUSIC    = 1<<1,
-    AE_DSP_PRSNT_ASTREAM_MOVIE    = 1<<2,
-    AE_DSP_PRSNT_ASTREAM_GAME     = 1<<3,
-    AE_DSP_PRSNT_ASTREAM_APP      = 1<<4,
-    AE_DSP_PRSNT_ASTREAM_MESSAGE  = 1<<5,
-    AE_DSP_PRSNT_ASTREAM_PHONE    = 1<<6,
-  } AE_DSP_ASTREAM_PRESENT;
-
-  /**
-   * @brief The various base type formats
-   * Used for audio DSP processing to know input audio source
-   */
-  typedef enum
-  {
-    AE_DSP_ABASE_INVALID = -1,
-    AE_DSP_ABASE_STEREO = 0,
-    AE_DSP_ABASE_MONO,
-    AE_DSP_ABASE_MULTICHANNEL,
-    AE_DSP_ABASE_AC3,
-    AE_DSP_ABASE_EAC3,
-    AE_DSP_ABASE_DTS,
-    AE_DSP_ABASE_DTSHD_MA,
-    AE_DSP_ABASE_DTSHD_HRA,
-    AE_DSP_ABASE_TRUEHD,
-    AE_DSP_ABASE_MLP,
-    AE_DSP_ABASE_FLAC,
-
-    AE_DSP_ABASE_MAX
-  } AE_DSP_BASETYPE;
-
-
-  /**
-   * @brief The from KODI in settings requested audio process quality.
-   * The KODI internal used quality levels is translated to this values
-   * for usage on DSP processing add-ons. Is present on iQualityLevel
-   * inside AE_DSP_SETTINGS.
-   */
-  typedef enum
-  {
-    AE_DSP_QUALITY_UNKNOWN    = -1,             /*!< @brief  Unset, unknown or incorrect quality level */
-    AE_DSP_QUALITY_DEFAULT    =  0,             /*!< @brief  Engine's default quality level */
-
-    /* Basic quality levels */
-    AE_DSP_QUALITY_LOW        = 20,             /*!< @brief  Low quality level */
-    AE_DSP_QUALITY_MID        = 30,             /*!< @brief  Standard quality level */
-    AE_DSP_QUALITY_HIGH       = 50,             /*!< @brief  Best sound processing quality */
-
-    /* Optional quality levels */
-    AE_DSP_QUALITY_REALLYHIGH = 100             /*!< @brief  Uncompromising optional quality level, usually with unmeasurable and unnoticeable improvement */
-  } AE_DSP_QUALITY;
-
-  /*!
-   * @brief Audio DSP menu hook categories.
-   * Used to identify on AE_DSP_MENUHOOK given add-on related skin dialog/windows.
-   * Except AE_DSP_MENUHOOK_ALL and AE_DSP_MENUHOOK_SETTING are the menus available
-   * from DSP playback dialogue which can be opened over KODI file context menu and over
-   * button on full screen OSD window.
-   *
-   * Menu hook AE_DSP_MENUHOOK_SETTING is available from DSP processing setup dialogue.
-   */
-  typedef enum
-  {
-    AE_DSP_MENUHOOK_UNKNOWN         =-1,        /*!< @brief unknown menu hook */
-    AE_DSP_MENUHOOK_ALL             = 0,        /*!< @brief all categories */
-    AE_DSP_MENUHOOK_PRE_PROCESS     = 1,        /*!< @brief for pre processing */
-    AE_DSP_MENUHOOK_MASTER_PROCESS  = 2,        /*!< @brief for master processing */
-    AE_DSP_MENUHOOK_POST_PROCESS    = 3,        /*!< @brief for post processing */
-    AE_DSP_MENUHOOK_RESAMPLE        = 4,        /*!< @brief for re sample */
-    AE_DSP_MENUHOOK_MISCELLANEOUS   = 5,        /*!< @brief for miscellaneous dialogues */
-    AE_DSP_MENUHOOK_INFORMATION     = 6,        /*!< @brief dialogue to show processing information */
-    AE_DSP_MENUHOOK_SETTING         = 7,        /*!< @brief for settings */
-  } AE_DSP_MENUHOOK_CAT;
-
-  /*!
-   * @brief Menu hooks that are available in the menus while playing a stream via this add-on.
-   */
-  typedef struct AE_DSP_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 */
-    AE_DSP_MENUHOOK_CAT category;               /*!< @brief (required) category of menu hook */
-    unsigned int        iRelevantModeId;        /*!< @brief (required) except category AE_DSP_MENUHOOK_SETTING and AE_DSP_MENUHOOK_ALL must be the related mode id present here */
-    bool                bNeedPlayback;          /*!< @brief (required) set to true if menu hook need playback and active processing */
-  } ATTRIBUTE_PACKED AE_DSP_MENUHOOK;
-
-  /*!
-   * @brief Audio DSP add-on capabilities. All capabilities are set to "false" as default.
-   * If a capability is set to true, then the corresponding methods from kodi_audiodsp_dll.h need to be implemented.
-   */
-  typedef struct AE_DSP_ADDON_CAPABILITIES
-  {
-    bool bSupportsInputProcess;                 /*!< @brief true if this add-on provides audio input processing */
-    bool bSupportsInputResample;                /*!< @brief true if this add-on provides audio resample before master handling */
-    bool bSupportsPreProcess;                   /*!< @brief true if this add-on provides audio pre processing */
-    bool bSupportsMasterProcess;                /*!< @brief true if this add-on provides audio master processing */
-    bool bSupportsPostProcess;                  /*!< @brief true if this add-on provides audio post processing */
-    bool bSupportsOutputResample;               /*!< @brief true if this add-on provides audio re sample after master handling */
-  } ATTRIBUTE_PACKED AE_DSP_ADDON_CAPABILITIES;
-
-  /*!
-   * @brief Audio processing settings for in and out arrays
-   * Send on creation and before first processed audio packet to add-on
-   */
-  typedef struct AE_DSP_SETTINGS
-  {
-    AE_DSP_STREAM_ID  iStreamID;                /*!< @brief id of the audio stream packets */
-    AE_DSP_STREAMTYPE iStreamType;              /*!< @brief the input stream type source eg, Movie or Music */
-    int               iInChannels;              /*!< @brief the amount of input channels */
-    unsigned long     lInChannelPresentFlags;   /*!< @brief the exact channel mapping flags of input */
-    int               iInFrames;                /*!< @brief the input frame size from KODI */
-    unsigned int      iInSamplerate;            /*!< @brief the basic sample rate of the audio packet */
-    int               iProcessFrames;           /*!< @brief the processing frame size inside add-on's */
-    unsigned int      iProcessSamplerate;       /*!< @brief the sample rate after input resample present in master processing */
-    int               iOutChannels;             /*!< @brief the amount of output channels */
-    unsigned long     lOutChannelPresentFlags;  /*!< @brief the exact channel mapping flags for output */
-    int               iOutFrames;               /*!< @brief the final out frame size for KODI */
-    unsigned int      iOutSamplerate;           /*!< @brief the final sample rate of the audio packet */
-    bool              bInputResamplingActive;   /*!< @brief if a re-sampling is performed before master processing this flag is set to true */
-    bool              bStereoUpmix;             /*!< @brief true if the stereo upmix setting on kodi is set */
-    int               iQualityLevel;            /*!< @brief the from KODI selected quality level for signal processing */
-    /*!
-     * @note about "iProcessSamplerate" and "iProcessFrames" is set from KODI after call of StreamCreate on input re sample add-on, if re-sampling
-     * and processing is handled inside the same add-on, this value must be ignored!
-     */
-  } ATTRIBUTE_PACKED AE_DSP_SETTINGS;
-
-  /*!
-   * @brief Stream profile properties
-   * Can be used to detect best master processing mode and for post processing methods.
-   */
-//@{
-
-  /*!
-   * @brief Dolby profile types. Given from several formats, e.g. Dolby Digital or TrueHD
-   * Used on AE_DSP_PROFILE_AC3_EAC3 and AE_DSP_PROFILE_MLP_TRUEHD
-   */
-  #define AE_DSP_PROFILE_DOLBY_NONE             0
-  #define AE_DSP_PROFILE_DOLBY_SURROUND         1
-  #define AE_DSP_PROFILE_DOLBY_PLII             2
-  #define AE_DSP_PROFILE_DOLBY_PLIIX            3
-  #define AE_DSP_PROFILE_DOLBY_PLIIZ            4
-  #define AE_DSP_PROFILE_DOLBY_EX               5
-  #define AE_DSP_PROFILE_DOLBY_HEADPHONE        6
-
-  /*!
-   * @brief DTS/DTS HD profile types
-   * Used on AE_DSP_PROFILE_DTS_DTSHD
-   */
-  #define AE_DSP_PROFILE_DTS                    0
-  #define AE_DSP_PROFILE_DTS_ES                 1
-  #define AE_DSP_PROFILE_DTS_96_24              2
-  #define AE_DSP_PROFILE_DTS_HD_HRA             3
-  #define AE_DSP_PROFILE_DTS_HD_MA              4
-
-  /*!
-   * @brief AC3/EAC3 based service types
-   * Used on AE_DSP_PROFILE_AC3_EAC3
-   */
-  #define AE_DSP_SERVICE_TYPE_MAIN              0
-  #define AE_DSP_SERVICE_TYPE_EFFECTS           1
-  #define AE_DSP_SERVICE_TYPE_VISUALLY_IMPAIRED 2
-  #define AE_DSP_SERVICE_TYPE_HEARING_IMPAIRED  3
-  #define AE_DSP_SERVICE_TYPE_DIALOGUE          4
-  #define AE_DSP_SERVICE_TYPE_COMMENTARY        5
-  #define AE_DSP_SERVICE_TYPE_EMERGENCY         6
-  #define AE_DSP_SERVICE_TYPE_VOICE_OVER        7
-  #define AE_DSP_SERVICE_TYPE_KARAOKE           8
-
-  /*!
-   * @brief AC3/EAC3 based room types
-   * Present on AE_DSP_PROFILE_AC3_EAC3 and can be used for frequency corrections
-   * at post processing, e.g. THX Re-Equalization
-   */
-  #define AE_DSP_ROOM_TYPE_UNDEFINED            0
-  #define AE_DSP_ROOM_TYPE_SMALL                1
-  #define AE_DSP_ROOM_TYPE_LARGE                2
-
-  /*!
-   * @brief AC3/EAC3 stream profile properties
-   */
-  //! @todo add handling for it (currently never becomes set)
-  typedef struct AE_DSP_PROFILE_AC3_EAC3
-  {
-    unsigned int iProfile;                      /*!< defined by AE_DSP_PROFILE_DOLBY_* */
-    unsigned int iServiceType;                  /*!< defined by AE_DSP_SERVICE_TYPE_* */
-    unsigned int iRoomType;                     /*!< defined by AE_DSP_ROOM_TYPE_* (NOTICE: Information about it currently not supported from ffmpeg and must be implemented) */
-  } ATTRIBUTE_PACKED AE_DSP_PROFILE_AC3_EAC3;
-
-  /*!
-   * @brief MLP/Dolby TrueHD stream profile properties
-   */
-  //! @todo add handling for it (currently never becomes set)
-  typedef struct AE_DSP_PROFILE_MLP_TRUEHD
-  {
-    unsigned int iProfile;                      /*!< defined by AE_DSP_PROFILE_DOLBY_* */
-  } ATTRIBUTE_PACKED AE_DSP_PROFILE_MLP_TRUEHD;
-
-  /*!
-   * @brief DTS/DTS HD stream profile properties
-   */
-  //! @todo add handling for it (currently never becomes set)
-  typedef struct AE_DSP_PROFILE_DTS_DTSHD
-  {
-    unsigned int iProfile;                      /*!< defined by AE_DSP_PROFILE_DTS* */
-    bool bSurroundMatrix;                       /*!< if set to true given 2.0 stream is surround encoded */
-  } ATTRIBUTE_PACKED AE_DSP_PROFILE_DTS_DTSHD;
-
-  union AE_DSP_PROFILE
-  {
-    AE_DSP_PROFILE_AC3_EAC3   ac3_eac3;         /*!< Dolby Digital/Digital+ profile data */
-    AE_DSP_PROFILE_MLP_TRUEHD mlp_truehd;       /*!< MLP or Dolby TrueHD profile data */
-    AE_DSP_PROFILE_DTS_DTSHD  dts_dtshd;        /*!< DTS/DTS-HD profile data */
-  };
-  //@}
-
-  /*!
-   * @brief Audio DSP stream properties
-   * Used to check for the DSP add-on that the stream is supported,
-   * as example Dolby Digital Ex processing is only required on Dolby Digital with 5.1 layout
-   */
-  typedef struct AE_DSP_STREAM_PROPERTIES
-  {
-    AE_DSP_STREAM_ID  iStreamID;                  /*!< @brief stream id of the audio stream packets */
-    AE_DSP_STREAMTYPE iStreamType;                /*!< @brief the input stream type source eg, Movie or Music */
-    int               iBaseType;                  /*!< @brief the input stream base type source eg, Dolby Digital */
-    const char*       strName;                    /*!< @brief the audio stream name */
-    const char*       strCodecId;                 /*!< @brief codec id string of the audio stream */
-    const char*       strLanguage;                /*!< @brief language id of the audio stream */
-    int               iIdentifier;                /*!< @brief audio stream id inside player */
-    int               iChannels;                  /*!< @brief amount of basic channels */
-    int               iSampleRate;                /*!< @brief sample rate */
-    AE_DSP_PROFILE    Profile;                    /*!< @brief current running stream profile data */
-  } ATTRIBUTE_PACKED AE_DSP_STREAM_PROPERTIES;
-
-  /*!
-   * @brief Audio DSP mode categories
-   */
-  typedef enum
-  {
-    AE_DSP_MODE_TYPE_UNDEFINED       = -1,       /*!< @brief undefined type, never be used from add-on! */
-    AE_DSP_MODE_TYPE_INPUT_RESAMPLE  = 0,        /*!< @brief for input re sample */
-    AE_DSP_MODE_TYPE_PRE_PROCESS     = 1,        /*!< @brief for preprocessing */
-    AE_DSP_MODE_TYPE_MASTER_PROCESS  = 2,        /*!< @brief for master processing */
-    AE_DSP_MODE_TYPE_POST_PROCESS    = 3,        /*!< @brief for post processing */
-    AE_DSP_MODE_TYPE_OUTPUT_RESAMPLE = 4,        /*!< @brief for output re sample */
-    AE_DSP_MODE_TYPE_MAX             = 5
-  } AE_DSP_MODE_TYPE;
-
-  /*!
-   * @brief Audio DSP master mode information
-   * Used to get all available modes for current input stream
-   */
-  typedef struct AE_DSP_MODES
-  {
-    unsigned int iModesCount;                                             /*!< @brief (required) count of how much modes are in AE_DSP_MODES */
-    struct AE_DSP_MODE
-    {
-      int               iUniqueDBModeId;                                  /*!< @brief (required) the inside add-on used identifier for the mode, set by KODI's audio DSP database */
-      AE_DSP_MODE_TYPE  iModeType;                                        /*!< @brief (required) the processing mode type, see AE_DSP_MODE_TYPE */
-      char              strModeName[AE_DSP_ADDON_STRING_LENGTH];          /*!< @brief (required) the addon name of the mode, used on KODI's logs  */
-
-      unsigned int      iModeNumber;                                      /*!< @brief (required) number of this mode on the add-on, is used on process functions with value "mode_id" */
-      unsigned int      iModeSupportTypeFlags;                            /*!< @brief (required) flags about supported input types for this mode, see AE_DSP_ASTREAM_PRESENT */
-      bool              bHasSettingsDialog;                               /*!< @brief (required) if setting dialog(s) are available it must be set to true */
-      bool              bIsDisabled;                                      /*!< @brief (optional) true if this mode is marked as disabled and not enabled default, only relevant for master processes, all other types always disabled as default */
-
-      unsigned int      iModeName;                                        /*!< @brief (required) the name id of the mode for this hook in g_localizeStrings */
-      unsigned int      iModeSetupName;                                   /*!< @brief (optional) the name id of the mode inside settings for this hook in g_localizeStrings */
-      unsigned int      iModeDescription;                                 /*!< @brief (optional) the description id of the mode for this hook in g_localizeStrings */
-      unsigned int      iModeHelp;                                        /*!< @brief (optional) help string id for inside DSP settings dialog of the mode for this hook in g_localizeStrings */
-
-      char              strOwnModeImage[AE_DSP_ADDON_STRING_LENGTH];      /*!< @brief (optional) flag image for the mode */
-      char              strOverrideModeImage[AE_DSP_ADDON_STRING_LENGTH]; /*!< @brief (optional) image to override KODI Image for the mode, eg. Dolby Digital with Dolby Digital Ex (only used on master modes) */
-    } mode[AE_DSP_STREAM_MAX_MODES];                                      /*!< @brief Modes array storage */
-  } ATTRIBUTE_PACKED AE_DSP_MODES;
-
-  /*!
-   * @brief Audio DSP menu hook data
-   */
-  typedef struct AE_DSP_MENUHOOK_DATA
-  {
-    AE_DSP_MENUHOOK_CAT category;                                         /*!< @brief (required) related menuhook data category */
-    union data {
-      AE_DSP_STREAM_ID  iStreamId;                                        /*!< @brief currently only stream id is used, is used as union to have extension possibility */
-    } data;                                                               /*!< @brief related category related data */
-  } ATTRIBUTE_PACKED AE_DSP_MENUHOOK_DATA;
-
-  /*!
-   * @brief Structure to transfer the methods from kodi_audiodsp_dll.h to KODI
-   */
-
-  typedef struct AddonProps_AudioDSP
-  {
-    const char* strUserPath;                    /*!< @brief path to the user profile */
-    const char* strAddonPath;                   /*!< @brief path to this add-on */
-  } AddonProps_AudioDSP;
-
-  typedef AddonProps_AudioDSP AE_DSP_PROPERTIES;
-
-  typedef struct AddonToKodiFuncTable_AudioDSP
-  {
-    KODI_HANDLE kodiInstance;
-
-    void (*AddMenuHook)(void* kodiInstance, AE_DSP_MENUHOOK *hook);
-    void (*RemoveMenuHook)(void* kodiInstance, AE_DSP_MENUHOOK *hook);
-    void (*RegisterMode)(void* kodiInstance, AE_DSP_MODES::AE_DSP_MODE *mode);
-    void (*UnregisterMode)(void* kodiInstance, AE_DSP_MODES::AE_DSP_MODE *mode);
-
-    ADSPHANDLE (*SoundPlay_GetHandle)(void* kodiInstance, const char *filename);
-    void (*SoundPlay_ReleaseHandle)(void* kodiInstance, ADSPHANDLE handle);
-    void (*SoundPlay_Play)(void* kodiInstance, ADSPHANDLE handle);
-    void (*SoundPlay_Stop)(void* kodiInstance, ADSPHANDLE handle);
-    bool (*SoundPlay_IsPlaying)(void* kodiInstance, ADSPHANDLE handle);
-    void (*SoundPlay_SetChannel)(void* kodiInstance, ADSPHANDLE handle, AE_DSP_CHANNEL channel);
-    AE_DSP_CHANNEL (*SoundPlay_GetChannel)(void* kodiInstance, ADSPHANDLE handle);
-    void (*SoundPlay_SetVolume)(void* kodiInstance, ADSPHANDLE handle, float volume);
-    float (*SoundPlay_GetVolume)(void* kodiInstance, ADSPHANDLE handle);
-  } AddonToKodiFuncTable_AudioDSP;
-
-  typedef struct KodiToAddonFuncTable_AudioDSP
-  {
-    const char*  (__cdecl* GetAudioDSPAPIVersion)                (void);
-    const char*  (__cdecl* GetMinimumAudioDSPAPIVersion)         (void);
-    const char*  (__cdecl* GetGUIAPIVersion)                     (void);
-    const char*  (__cdecl* GetMinimumGUIAPIVersion)              (void);
-    AE_DSP_ERROR (__cdecl* GetAddonCapabilities)                 (AE_DSP_ADDON_CAPABILITIES*);
-    const char*  (__cdecl* GetDSPName)                           (void);
-    const char*  (__cdecl* GetDSPVersion)                        (void);
-    AE_DSP_ERROR (__cdecl* MenuHook)                             (const AE_DSP_MENUHOOK&, const AE_DSP_MENUHOOK_DATA&);
-
-    AE_DSP_ERROR (__cdecl* StreamCreate)                         (const AE_DSP_SETTINGS*, const AE_DSP_STREAM_PROPERTIES*, ADDON_HANDLE);
-    AE_DSP_ERROR (__cdecl* StreamDestroy)                        (const ADDON_HANDLE);
-    AE_DSP_ERROR (__cdecl* StreamIsModeSupported)                (const ADDON_HANDLE, AE_DSP_MODE_TYPE, unsigned int, int);
-    AE_DSP_ERROR (__cdecl* StreamInitialize)                     (const ADDON_HANDLE, const AE_DSP_SETTINGS*);
-
-    bool         (__cdecl* InputProcess)                         (const ADDON_HANDLE, const float**, unsigned int);
-
-    unsigned int (__cdecl* InputResampleProcessNeededSamplesize) (const ADDON_HANDLE);
-    unsigned int (__cdecl* InputResampleProcess)                 (const ADDON_HANDLE, float**, float**, unsigned int);
-    float        (__cdecl* InputResampleGetDelay)                (const ADDON_HANDLE);
-    int          (__cdecl* InputResampleSampleRate)              (const ADDON_HANDLE);
-
-    unsigned int (__cdecl* PreProcessNeededSamplesize)           (const ADDON_HANDLE, unsigned int);
-    float        (__cdecl* PreProcessGetDelay)                   (const ADDON_HANDLE, unsigned int);
-    unsigned int (__cdecl* PreProcess)                           (const ADDON_HANDLE, unsigned int, float**, float**, unsigned int);
-
-    AE_DSP_ERROR (__cdecl* MasterProcessSetMode)                 (const ADDON_HANDLE, AE_DSP_STREAMTYPE, unsigned int, int);
-    unsigned int (__cdecl* MasterProcessNeededSamplesize)        (const ADDON_HANDLE);
-    float        (__cdecl* MasterProcessGetDelay)                (const ADDON_HANDLE);
-    int          (__cdecl* MasterProcessGetOutChannels)          (const ADDON_HANDLE, unsigned long&);
-    unsigned int (__cdecl* MasterProcess)                        (const ADDON_HANDLE, float**, float**, unsigned int);
-    const char*  (__cdecl* MasterProcessGetStreamInfoString)     (const ADDON_HANDLE);
-
-    unsigned int (__cdecl* PostProcessNeededSamplesize)          (const ADDON_HANDLE, unsigned int);
-    float        (__cdecl* PostProcessGetDelay)                  (const ADDON_HANDLE, unsigned int);
-    unsigned int (__cdecl* PostProcess)                          (const ADDON_HANDLE, unsigned int, float**, float**, unsigned int);
-
-    unsigned int (__cdecl* OutputResampleProcessNeededSamplesize)(const ADDON_HANDLE);
-    unsigned int (__cdecl* OutputResampleProcess)                (const ADDON_HANDLE, float**, float**, unsigned int);
-    float        (__cdecl* OutputResampleGetDelay)               (const ADDON_HANDLE);
-    int          (__cdecl* OutputResampleSampleRate)             (const ADDON_HANDLE);
-  } KodiToAddonFuncTable_AudioDSP;
-
-  typedef struct AddonInstance_AudioDSP
-  {
-    AddonProps_AudioDSP props;
-    AddonToKodiFuncTable_AudioDSP toKodi;
-    KodiToAddonFuncTable_AudioDSP toAddon;
-  } AddonInstance_AudioDSP;
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h
deleted file mode 100644
index 5232947..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include <stdint.h>
-#include "xbmc_addon_dll.h"
-#include "kodi_audiodec_types.h"
-
-extern "C"
-{
-  //! \copydoc AudioDecoder::Init
-  void* Init(const char* file, unsigned int filecache, int* channels,
-             int* samplerate, int* bitspersample, int64_t* totaltime,
-             int* bitrate, AEDataFormat* format, const AEChannel** channelinfo);
-
-  //! \copydoc AudioDecoder::ReadPCM
-  int ReadPCM(void* context, uint8_t* buffer, int size, int* actualsize);
-
-  //! \copydoc AudioDecoder::Seek
-  int64_t Seek(void* context, int64_t time);
-
-  //! \copydoc AudioDecoder::ReadTag
-  bool ReadTag(const char* file, char* title,
-               char* artist, int* length);
-
-  //! \copydoc AudioDecoder::TrackCount
-  int TrackCount(const char* file);
-
-  //! \copydoc AudioDecoder::DeInit
-  bool DeInit(void* context);
-
-  // function to export the above structure to XBMC
-  void __declspec(dllexport) get_addon(void* ptr)
-  {
-    AddonInstance_AudioDecoder* pScr = static_cast<AddonInstance_AudioDecoder*>(ptr);
-
-    pScr->toAddon.Init = Init;
-    pScr->toAddon.ReadPCM = ReadPCM;
-    pScr->toAddon.Seek = Seek;
-    pScr->toAddon.ReadTag = ReadTag;
-    pScr->toAddon.TrackCount = TrackCount;
-    pScr->toAddon.DeInit = DeInit;
-  };
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h
deleted file mode 100644
index 6820b91..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include <stdint.h>
-#ifdef BUILD_KODI_ADDON
-#include "AEChannelData.h"
-#else
-#include "cores/AudioEngine/Utils/AEChannelData.h"
-#endif
-
-extern "C"
-{
-  struct AUDIODEC_INFO
-  {
-    int dummy;
-  };
-
-  typedef struct AddonProps_AudioDecoder
-  {
-    const char* mimetype;
-  } AddonProps_AudioDecoder;
-
-  typedef struct AddonToKodiFuncTable_AudioDecoder
-  {
-    KODI_HANDLE kodiInstance;
-  } AddonToKodiFuncTable_AudioDecoder;
-
-  typedef struct KodiToAddonFuncTable_AudioDecoder
-  {
-    //! \brief Initialize a decoder
-    //! \param file The file to read
-    //! \param filecache The file cache size
-    //! \param channels Number of channels in output stream
-    //! \param samplerate Samplerate of output stream
-    //! \param bitspersample Bits per sample in output stream
-    //! \param totaltime Total time for stream
-    //! \param bitrate Average bitrate of input stream
-    //! \param format Data format for output stream
-    //! \param info Channel mapping for output stream
-    //! \return Context of output stream
-    //! \sa ICodec::Init
-    void* (__cdecl* Init) (const char* file, unsigned int filecache,
-                           int* channels, int* samplerate,
-                           int* bitspersample, int64_t* totaltime,
-                           int* bitrate, AEDataFormat* format,
-                           const AEChannel** info);
-
-    //! \brief Produce some noise
-    //! \param context Context of output stream
-    //! \param buffer Output buffer
-    //! \param size Size of output buffer
-    //! \param actualsize Actual number of bytes written to output buffer
-    //! \return 0 on success, -1 on end of stream, 1 on failure
-    //! \sa ICodec::ReadPCM
-    int  (__cdecl* ReadPCM) (void* context, uint8_t* buffer, int size, int* actualsize);
-
-
-    //! \brief Seek in output stream
-    //! \param context Context of output stream
-    //! \param time Time position to seek to in milliseconds
-    //! \return Time position seek ended up on
-    //! \sa ICodec::Seek
-    int64_t  (__cdecl* Seek) (void* context, int64_t time);
-
-    //! \brief Read tag of a file
-    //! \param file File to read tag for
-    //! \param title Title of file
-    //! \param artist Artist of file
-    //! \param length Length of file
-    //! \return True on success, false on failure
-    //! \sa IMusicInfoTagLoader::ReadTag
-    bool (__cdecl* ReadTag)(const char* file, char* title,
-                            char* artist, int* length);
-
-    //! \brief Get number of tracks in a file
-    //! \param file File to read tag for
-    //! \return Number of tracks in file
-    //! \sa CMusicFileDirectory
-    int  (__cdecl* TrackCount) (const char* file);
-
-    //! \brief Close down an output stream
-    //! \param context Context of stream
-    //! \return True on success, false on failure
-    //! \sa ICodec::DeInit
-    bool (__cdecl* DeInit)(void* context);
-  } KodiToAddonFuncTable_AudioDecoder;
-
-  typedef struct AddonInstance_AudioDecoder
-  {
-    AddonProps_AudioDecoder props;
-    AddonToKodiFuncTable_AudioDecoder toKodi;
-    KodiToAddonFuncTable_AudioDecoder toAddon;
-  } AddonInstance_AudioDecoder;
-}
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_dll.h
deleted file mode 100644
index a87c9c0..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_dll.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include <stdint.h>
-#include "xbmc_addon_dll.h"
-#include "kodi_imagedec_types.h"
-
-extern "C"
-{
-  void* LoadImage(unsigned char* buffer, unsigned int bufSize,
-                  unsigned int* width, unsigned int* height);
-
-  bool Decode(void* image, unsigned char* pixels,
-              unsigned int width, unsigned int height,
-              unsigned int pitch, unsigned int format);
-
-  void Close(void* image);
-
-  // function to export the above structure to Kodi
-  void __declspec(dllexport) get_addon(void* ptr)
-  {
-    AddonInstance_ImageDecoder* img = static_cast<AddonInstance_ImageDecoder*>(ptr);
-    img->toAddon.LoadImage = LoadImage;
-    img->toAddon.Decode = Decode;
-    img->toAddon.Close = Close;
-  }
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_types.h
deleted file mode 100644
index 7af585c..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_types.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include <stdint.h>
-
-#define ADDON_IMG_FMT_A8R8G8B8 1
-#define ADDON_IMG_FMT_A8       2
-#define ADDON_IMG_FMT_RGBA8    3
-#define ADDON_IMG_FMT_RGB8     4
-
-extern "C"
-{
-  typedef struct AddonProps_ImageDecoder
-  {
-    const char* mimetype;
-  } AddonProps_ImageDecoder;
-
-  typedef struct AddonToKodiFuncTable_ImageDecoder
-  {
-    KODI_HANDLE kodiInstance;
-  } AddonToKodiFuncTable_ImageDecoder;
-
-  typedef struct KodiToAddonFuncTable_ImageDecoder
-  {
-    //! \brief Initialize an encoder
-    //! \param buffer The data to read from memory
-    //! \param bufSize The buffer size
-    //! \param width The optimal width of image on entry, obtained width on return
-    //! \param height The optimal height of image, actual obtained height on return
-    //! \return Image or nullptr on error
-    void* (__cdecl* LoadImage) (unsigned char* buffer, unsigned int bufSize,
-                                unsigned int* width, unsigned int* height);
-
-    //! \brief Decode previously loaded image
-    //! \param image Image to decode
-    //! \param pixels Output buffer
-    //! \param width Width of output image
-    //! \param height Height of output image
-    //! \param pitch Pitch of output image
-    //! \param format Format of output image
-    bool (__cdecl* Decode) (void* image, unsigned char* pixels,
-                            unsigned int width, unsigned int height,
-                            unsigned int pitch, unsigned int format);
-
-    //! \brief Close an opened image
-    //! \param image Image to close
-    //! \return True on success, false on failure
-    void (__cdecl* Close)(void* image);
-  } KodiToAddonFuncTable_ImageDecoder;
-
-  typedef struct AddonInstance_ImageDecoder
-  {
-    AddonProps_ImageDecoder props;
-    AddonToKodiFuncTable_ImageDecoder toKodi;
-    KodiToAddonFuncTable_ImageDecoder toAddon;
-  } AddonInstance_ImageDecoder;
-}
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
deleted file mode 100644
index ab8475d..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
+++ /dev/null
@@ -1,256 +0,0 @@
-#pragma once
-
-/*
-*      Copyright (C) 2005-2016 Team Kodi
-*      http://kodi.tv
-*
-*  This Program is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*
-*  This Program is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-*  GNU General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with Kodi; see the file COPYING.  If not, see
-*  <http://www.gnu.org/licenses/>.
-*
-*/
-
-#include "kodi_inputstream_types.h"
-#include "xbmc_addon_dll.h"
-
-/*!
-* Functions that the InputStream 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"
-{
-  /*!
-   * Open a stream.
-   * @param props
-   * @return True if the stream has been opened successfully, false otherwise.
-   * @remarks
-   */
-  bool Open(INPUTSTREAM& props);
-
-  /*!
-   * Close an open stream.
-   * @remarks
-   */
-  void Close(void);
-
-  /*!
-   * Get path/url for this addon.
-   * @remarks
-   */
-  const char* GetPathList(void);
-
-  /*!
-  * Get Capabilities of this addon.
-  * @remarks
-  */
-  struct INPUTSTREAM_CAPABILITIES GetCapabilities();
-
-
-  /*!
-   * Get IDs of available streams
-   * @remarks
-   */
-  INPUTSTREAM_IDS GetStreamIds();
-
-  /*!
-   * Get stream properties of a stream.
-   * @param streamId unique id of stream
-   * @return struc of stream properties
-   * @remarks
-   */
-  INPUTSTREAM_INFO GetStream(int streamid);
-
-  /*!
-   * 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
-   */
-  void EnableStream(int streamid, bool enable);
-
-  /*!
-   * 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 XBMC'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 Return NULL if this add-on won't provide this function.
-   */
-  DemuxPacket* DemuxRead(void);
-
-  /*!
-   * Notify the InputStream addon/demuxer that XBMC 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
-   * @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.
-   */
-  bool DemuxSeekTime(double time, bool backwards, double *startpts);
-
-  /*!
-   * Notify the InputStream addon/demuxer that XBMC wishes to change playback speed
-   * @param speed The requested playback speed
-   * @remarks Optional, and only used if addon has its own demuxer.
-   */
-  void DemuxSetSpeed(int speed);
-
-  /*!
-   * Sets desired width / height
-   * @param width / hight
-   */
-  void SetVideoResolution(int width, int height);
-
-  /*!
-   * Totel time in ms
-   * @remarks
-   */
-  int GetTotalTime();
-
-  /*!
-   * Playing time in ms
-   * @remarks
-   */
-  int GetTime();
-
-  /*!
-   * Positions inputstream to playing time given in ms
-   * @remarks
-   */
-  bool PosTime(int ms);
-
-
-  /*!
-   * Check if the backend support pausing the currently playing stream
-   * This will enable/disable the pause button in XBMC based on the return value
-   * @return false if the InputStream 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 XBMC based on the return value
-   * @return false if the InputStream addon/backend does not support seeking, true if possible
-   */
-  bool CanSeekStream();
-
-  
-  /*!
-  * Read from an open 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 Return -1 if this add-on won't provide this function.
-  */
-  int ReadStream(uint8_t* pBuffer, unsigned int iBufferSize);
-
-  /*!
-  * Seek in a stream.
-  * @param iPosition The position to seek to.
-  * @param iWhence ?
-  * @return The new position.
-  * @remarks Return -1 if this add-on won't provide this function.
-  */
-  int64_t SeekStream(int64_t iPosition, int iWhence = SEEK_SET);
-
-  /*!
-  * @return The position in the stream that's currently being read.
-  * @remarks Return -1 if this add-on won't provide this function.
-  */
-  int64_t PositionStream(void);
-
-  /*!
-  * @return The total length of the stream that's currently being read.
-  * @remarks Return -1 if this add-on won't provide this function.
-  */
-  int64_t LengthStream(void);
-
-
-  /*!
-  * @brief Notify the InputStream addon that XBMC (un)paused the currently playing stream
-  */
-  void PauseStream(double time);
-
-
-  /*!
-  *  Check for real-time streaming
-  *  @return true if current stream is real-time
-  */
-  bool IsRealTimeStream();
-
-  /*!
-  * Called by XBMC to assign the function pointers of this add-on to pClient.
-  * @param pClient The struct to assign the function pointers to.
-  */
-  void __declspec(dllexport) get_addon(void* ptr)
-  {
-    AddonInstance_InputStream* pClient = static_cast<AddonInstance_InputStream*>(ptr);
-
-    pClient->toAddon.Open = Open;
-    pClient->toAddon.Close = Close;
-    pClient->toAddon.GetPathList = GetPathList;
-    pClient->toAddon.GetCapabilities = GetCapabilities;
-
-    pClient->toAddon.GetStreamIds = GetStreamIds;
-    pClient->toAddon.GetStream = GetStream;
-    pClient->toAddon.EnableStream = EnableStream;
-    pClient->toAddon.DemuxReset = DemuxReset;
-    pClient->toAddon.DemuxAbort = DemuxAbort;
-    pClient->toAddon.DemuxFlush = DemuxFlush;
-    pClient->toAddon.DemuxRead = DemuxRead;
-    pClient->toAddon.DemuxSeekTime = DemuxSeekTime;
-    pClient->toAddon.DemuxSetSpeed = DemuxSetSpeed;
-    pClient->toAddon.SetVideoResolution = SetVideoResolution;
-
-    pClient->toAddon.GetTotalTime = GetTotalTime;
-    pClient->toAddon.GetTime = GetTime;
-
-    pClient->toAddon.PosTime = PosTime;
-
-    pClient->toAddon.CanPauseStream = CanPauseStream;
-    pClient->toAddon.CanSeekStream = CanSeekStream;
-
-    pClient->toAddon.ReadStream = ReadStream;
-    pClient->toAddon.SeekStream = SeekStream;
-    pClient->toAddon.PositionStream = PositionStream;
-    pClient->toAddon.LengthStream = LengthStream;
-    pClient->toAddon.PauseStream = PauseStream;
-    pClient->toAddon.IsRealTimeStream = IsRealTimeStream;
-  };
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
deleted file mode 100644
index 9597e8a..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
+++ /dev/null
@@ -1,187 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2016 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TARGET_WINDOWS
-#ifndef __cdecl
-#define __cdecl
-#endif
-#ifndef __declspec
-#define __declspec(X)
-#endif
-#endif
-
-#include "xbmc_addon_types.h"
-
-#ifdef BUILD_KODI_ADDON
-#include "DVDDemuxPacket.h"
-#else
-#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
-#endif
-
-extern "C" {
-
-  /*!
-   * @brief InputStream add-on capabilities. All capabilities are set to "false" as default.
-   */
-  typedef struct INPUTSTREAM_CAPABILITIES
-  {
-    bool m_supportsIDemux;                  /*!< @brief supports interface IDemux */
-    bool m_supportsIPosTime;                /*!< @brief supports interface IPosTime */
-    bool m_supportsIDisplayTime;            /*!< @brief supports interface IDisplayTime */
-    bool m_supportsSeek;                    /*!< @brief supports seek */
-    bool m_supportsPause;                   /*!< @brief supports pause */
-  } INPUTSTREAM_CAPABILITIES;
-
-  /*!
-   * @brief structure of key/value pairs passed to addon on Open()
-   */
-  typedef struct INPUTSTREAM
-  {
-    static const unsigned int MAX_INFO_COUNT = 8;
-
-    const char *m_strURL;
-
-    unsigned int m_nCountInfoValues;
-    struct LISTITEMPROPERTY
-    {
-      const char *m_strKey;
-      const char *m_strValue;
-    } m_ListItemProperties[MAX_INFO_COUNT];
-
-    const char *m_libFolder;
-    const char *m_profileFolder;
-  } INPUTSTREAM;
-
-  /*!
-   * @brief Array of stream IDs
-   */
-  typedef struct INPUTSTREAM_IDS
-  {
-    static const unsigned int MAX_STREAM_COUNT = 32;
-    unsigned int m_streamCount;
-    unsigned int m_streamIds[MAX_STREAM_COUNT];
-  } INPUTSTREAM_IDS;
-
-  /*!
-   * @brief stream properties
-   */
-  typedef struct INPUTSTREAM_INFO
-  {
-    enum STREAM_TYPE
-    {
-      TYPE_NONE,
-      TYPE_VIDEO,
-      TYPE_AUDIO,
-      TYPE_SUBTITLE,
-      TYPE_TELETEXT
-    } m_streamType;
-
-    char m_codecName[32];                /*!< @brief (required) name of codec according to ffmpeg */
-    char m_codecInternalName[32];        /*!< @brief (optional) internal name of codec (selectionstream info) */
-    unsigned int m_pID;                  /*!< @brief (required) physical index */
-
-    const uint8_t *m_ExtraData;
-    unsigned int m_ExtraSize;
-
-    char m_language[4];                  /*!< @brief ISO 639 3-letter 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_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_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;
-  } INPUTSTREAM_INFO;
-
-  /*!
-   * @brief Structure to transfer the methods from xbmc_inputstream_dll.h to XBMC
-   */
-
-  // this are properties given to the addon on create
-  // at this time we have no parameters for the addon
-  typedef struct AddonProps_InputStream
-  {
-    int dummy;
-  } AddonProps_InputStream;
-  
-  typedef AddonProps_InputStream INPUTSTREAM_PROPS;
-  
-  typedef struct AddonToKodiFuncTable_InputStream
-  {
-    KODI_HANDLE kodiInstance;
-    DemuxPacket* (*AllocateDemuxPacket)(void* kodiInstance, int iDataSize);
-    void (*FreeDemuxPacket)(void* kodiInstance, DemuxPacket* pPacket);
-  } AddonToKodiFuncTable_InputStream;
-
-  typedef struct KodiToAddonFuncTable_InputStream
-  {
-    bool (__cdecl* Open)(INPUTSTREAM&);
-    void (__cdecl* Close)(void);
-    const char* (__cdecl* GetPathList)(void);
-    struct INPUTSTREAM_CAPABILITIES (__cdecl* GetCapabilities)(void);
-
-    // IDemux
-    struct INPUTSTREAM_IDS (__cdecl* GetStreamIds)();
-    struct INPUTSTREAM_INFO (__cdecl* GetStream)(int);
-    void (__cdecl* EnableStream)(int, bool);
-    void (__cdecl* DemuxReset)(void);
-    void (__cdecl* DemuxAbort)(void);
-    void (__cdecl* DemuxFlush)(void);
-    DemuxPacket* (__cdecl* DemuxRead)(void);
-    bool (__cdecl* DemuxSeekTime)(double, bool, double*);
-    void (__cdecl* DemuxSetSpeed)(int);
-    void (__cdecl* SetVideoResolution)(int, int);
-
-    // IDisplayTime
-    int (__cdecl* GetTotalTime)(void);
-    int (__cdecl* GetTime)(void);
-
-    // IPosTime
-    bool (__cdecl* PosTime)(int);
-
-    // Seekable (mandatory)
-    bool (__cdecl* CanPauseStream)(void);
-    bool (__cdecl* CanSeekStream)(void);
-
-    int (__cdecl* ReadStream)(uint8_t*, unsigned int);
-    int64_t(__cdecl* SeekStream)(int64_t, int);
-    int64_t (__cdecl* PositionStream)(void);
-    int64_t (__cdecl* LengthStream)(void);
-    void (__cdecl* PauseStream)(double);
-    bool (__cdecl* IsRealTimeStream)(void);
-  } KodiToAddonFuncTable_InputStream;
-
-  typedef struct AddonInstance_InputStream
-  {
-    AddonProps_InputStream props;
-    AddonToKodiFuncTable_InputStream toKodi;
-    KodiToAddonFuncTable_InputStream toAddon;
-  } AddonInstance_InputStream;
-
-}
-
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
deleted file mode 100644
index b353316..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- *      Copyright (C) 2014-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#ifndef __PERIPHERAL_DLL_H__
-#define __PERIPHERAL_DLL_H__
-
-#include "kodi_peripheral_types.h"
-
-#define PERIPHERAL_ADDON_JOYSTICKS //! @todo
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-  /// @name Peripheral operations
-  ///{
-  /*!
-   * @brief Get the list of features that this add-on provides
-   * @param pCapabilities The add-on's capabilities.
-   * @return PERIPHERAL_NO_ERROR if the properties were fetched successfully.
-   * @remarks Valid implementation required.
-   *
-   * Called by the frontend to query the add-on's capabilities and supported
-   * peripherals. All capabilities that the add-on supports should be set to true.
-   *
-   */
-  PERIPHERAL_ERROR GetAddonCapabilities(PERIPHERAL_CAPABILITIES *pCapabilities);
-
-  /*!
-   * @brief Perform a scan for joysticks
-   * @param peripheral_count  Assigned to the number of peripherals allocated
-   * @param scan_results      Assigned to allocated memory
-   * @return PERIPHERAL_NO_ERROR if successful; peripherals must be freed using
-   * FreeScanResults() in this case
-   *
-   * The frontend calls this when a hardware change is detected. If an add-on
-   * detects a hardware change, it can trigger this function using the
-   * TriggerScan() callback.
-   */
-  PERIPHERAL_ERROR PerformDeviceScan(unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results);
-
-  /*!
-   * @brief Free the memory allocated in PerformDeviceScan()
-   *
-   * Must be called if PerformDeviceScan() returns PERIPHERAL_NO_ERROR.
-   *
-   * @param peripheral_count  The number of events allocated for the events array
-   * @param scan_results      The array of allocated peripherals
-   */
-  void FreeScanResults(unsigned int peripheral_count, PERIPHERAL_INFO* scan_results);
-
-  /*!
-   * @brief Get all events that have occurred since the last call to GetEvents()
-   * @return PERIPHERAL_NO_ERROR if successful; events must be freed using
-   * FreeEvents() in this case
-   */
-  PERIPHERAL_ERROR GetEvents(unsigned int* event_count, PERIPHERAL_EVENT** events);
-
-  /*!
-   * @brief Free the memory allocated in GetEvents()
-   *
-   * Must be called if GetEvents() returns PERIPHERAL_NO_ERROR.
-   *
-   * @param event_count  The number of events allocated for the events array
-   * @param events       The array of allocated events
-   */
-  void FreeEvents(unsigned int event_count, PERIPHERAL_EVENT* events);
-
-  /*!
-   * @brief Send an input event to the specified peripheral
-   * @param peripheralIndex The index of the device receiving the input event
-   * @param event The input event
-   * @return true if the event was handled, false otherwise
-   */
-  bool SendEvent(const PERIPHERAL_EVENT* event);
-  ///}
-
-  /// @name Joystick operations
-  /*!
-   * @note #define PERIPHERAL_ADDON_JOYSTICKS before including kodi_peripheral_dll.h
-   * in the add-on if the add-on provides joysticks and add provides_joysticks="true"
-   * to the kodi.peripheral extension point node in addon.xml.
-   */
-  ///{
-#ifdef PERIPHERAL_ADDON_JOYSTICKS
-  /*!
-   * @brief Get extended info about an attached joystick
-   * @param index  The joystick's driver index
-   * @param info   The container for the allocated joystick info
-   * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
-   *         FreeJoystickInfo() in this case
-   */
-  PERIPHERAL_ERROR GetJoystickInfo(unsigned int index, JOYSTICK_INFO* info);
-
-  /*!
-   * @brief Free the memory allocated in GetJoystickInfo()
-   */
-  void FreeJoystickInfo(JOYSTICK_INFO* info);
-
-  /*!
-   * @brief Get the features that allow translating the joystick into the controller profile
-   * @param joystick      The device's joystick properties; unknown values may be left at their default
-   * @param controller_id The controller profile being requested, e.g. game.controller.default
-   * @param feature_count The number of features allocated for the features array
-   * @param features      The array of allocated features
-   * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
-   *         FreeButtonMap() in this case
-   */
-  PERIPHERAL_ERROR GetFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
-                               unsigned int* feature_count, JOYSTICK_FEATURE** features);
-
-  /*!
-   * @brief Free the memory allocated in GetFeatures()
-   *
-   * Must be called if GetFeatures() returns PERIPHERAL_NO_ERROR.
-   *
-   * @param feature_count  The number of features allocated for the features array
-   * @param features       The array of allocated features
-   */
-  void FreeFeatures(unsigned int feature_count, JOYSTICK_FEATURE* features);
-
-  /*!
-   * @brief Add or update joystick features
-   * @param joystick      The device's joystick properties; unknown values may be left at their default
-   * @param controller_id The game controller profile being updated
-   * @param feature_count The number of features in the features array
-   * @param features      The array of features
-   * @return PERIPHERAL_NO_ERROR if successful
-   */
-  PERIPHERAL_ERROR MapFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
-                               unsigned int feature_count, const JOYSTICK_FEATURE* features);
-
-  /*!
-   * @brief Get the driver primitives that should be ignored while mapping the device
-   * @param joystick        The device's joystick properties; unknown values may be left at their default
-   * @param primitive_count The number of features allocated for the primitives array
-   * @param primitives      The array of allocated driver primitives to be ignored
-   * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
-   *         FreePrimitives() in this case
-   */
-  PERIPHERAL_ERROR GetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
-                                        unsigned int* primitive_count,
-                                        JOYSTICK_DRIVER_PRIMITIVE** primitives);
-
-  /*!
-   * @brief Free the memory allocated in GetIgnoredPrimitives()
-   *
-   * Must be called if GetIgnoredPrimitives() returns PERIPHERAL_NO_ERROR.
-   *
-   * @param primitive_count  The number of driver primitives allocated for the primitives array
-   * @param primitives       The array of allocated driver primitives
-   */
-  void FreePrimitives(unsigned int primitive_count, JOYSTICK_DRIVER_PRIMITIVE* primitives);
-
-  /*!
-   * @brief Set the list of driver primitives that are ignored for the device
-   * @param joystick         The device's joystick properties; unknown values may be left at their default
-   * @param primitive_count  The number of driver features in the primitives array
-   * @param primitives       The array of driver primitives to ignore
-   * @return PERIPHERAL_NO_ERROR if successful
-   */
-  PERIPHERAL_ERROR SetIgnoredPrimitives(const JOYSTICK_INFO* joystick,
-                                        unsigned int primitive_count,
-                                        const JOYSTICK_DRIVER_PRIMITIVE* primitives);
-
-  /*!
-   * @brief Save the button map for the given joystick
-   * @param joystick      The device's joystick properties
-   */
-  void SaveButtonMap(const JOYSTICK_INFO* joystick);
-
-  /*!
-  * @brief Revert the button map to the last time it was loaded or committed to disk
-  * @param joystick      The device's joystick properties
-  */
-  void RevertButtonMap(const JOYSTICK_INFO* joystick);
-
-  /*!
-   * @brief Reset the button map for the given joystick and controller profile ID
-   * @param joystick      The device's joystick properties
-   * @param controller_id The game controller profile being reset
-   */
-  void ResetButtonMap(const JOYSTICK_INFO* joystick, const char* controller_id);
-
-  /*!
-   * @brief Powers off the given joystick if supported
-   * @param index  The joystick's driver index
-   */
-  void PowerOffJoystick(unsigned int index);
-#endif
-  ///}
-
-  /*!
-   * Called by the frontend 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 peripheral add-ons.
-   */
-  void __declspec(dllexport) get_addon(void* ptr)
-  {
-    AddonInstance_Peripheral* pClient = static_cast<AddonInstance_Peripheral*>(ptr);
-
-    pClient->toAddon.GetAddonCapabilities           = GetAddonCapabilities;
-    pClient->toAddon.PerformDeviceScan              = PerformDeviceScan;
-    pClient->toAddon.FreeScanResults                = FreeScanResults;
-    pClient->toAddon.GetEvents                      = GetEvents;
-    pClient->toAddon.FreeEvents                     = FreeEvents;
-    pClient->toAddon.SendEvent                      = SendEvent;
-
-#ifdef PERIPHERAL_ADDON_JOYSTICKS
-    pClient->toAddon.GetJoystickInfo                = GetJoystickInfo;
-    pClient->toAddon.FreeJoystickInfo               = FreeJoystickInfo;
-    pClient->toAddon.GetFeatures                    = GetFeatures;
-    pClient->toAddon.FreeFeatures                   = FreeFeatures;
-    pClient->toAddon.MapFeatures                    = MapFeatures;
-    pClient->toAddon.GetIgnoredPrimitives           = GetIgnoredPrimitives;
-    pClient->toAddon.FreePrimitives                 = FreePrimitives;
-    pClient->toAddon.SetIgnoredPrimitives           = SetIgnoredPrimitives;
-    pClient->toAddon.SaveButtonMap                  = SaveButtonMap;
-    pClient->toAddon.RevertButtonMap                = RevertButtonMap;
-    pClient->toAddon.ResetButtonMap                 = ResetButtonMap;
-    pClient->toAddon.PowerOffJoystick               = PowerOffJoystick;
-#endif
-  }
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __PERIPHERAL_DLL_H__
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h
deleted file mode 100644
index 0786aa8..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- *      Copyright (C) 2014-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#ifndef __PERIPHERAL_TYPES_H__
-#define __PERIPHERAL_TYPES_H__
-
-#include "versions.h"
-#include "xbmc_addon_types.h"
-
-#ifndef TARGET_WINDOWS
-  #ifndef __cdecl
-    #define __cdecl
-  #endif
-  #ifndef __declspec
-    #define __declspec(X)
-  #endif
-#endif
-
-#include <stdint.h>
-
-#undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN
-#undef PRAGMA_PACK_END
-
-#if defined(__GNUC__)
-  #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-    #define ATTRIBUTE_PACKED __attribute__ ((packed))
-    #define PRAGMA_PACK 0
-  #endif
-#endif
-
-#if !defined(ATTRIBUTE_PACKED)
-  #define ATTRIBUTE_PACKED
-  #define PRAGMA_PACK 1
-#endif
-
-/* indicates a joystick has no preference for port number */
-#define NO_PORT_REQUESTED     (-1)
-
-/* joystick's driver button/hat/axis index is unknown */
-#define DRIVER_INDEX_UNKNOWN  (-1)
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-  /// @name Peripheral types
-  ///{
-  typedef enum PERIPHERAL_ERROR
-  {
-    PERIPHERAL_NO_ERROR                      =  0, // no error occurred
-    PERIPHERAL_ERROR_UNKNOWN                 = -1, // an unknown error occurred
-    PERIPHERAL_ERROR_FAILED                  = -2, // the command failed
-    PERIPHERAL_ERROR_INVALID_PARAMETERS      = -3, // the parameters of the method are invalid for this operation
-    PERIPHERAL_ERROR_NOT_IMPLEMENTED         = -4, // the method that the frontend called is not implemented
-    PERIPHERAL_ERROR_NOT_CONNECTED           = -5, // no peripherals are connected
-    PERIPHERAL_ERROR_CONNECTION_FAILED       = -6, // peripherals are connected, but command was interrupted
-  } PERIPHERAL_ERROR;
-
-  typedef enum PERIPHERAL_TYPE
-  {
-    PERIPHERAL_TYPE_UNKNOWN,
-    PERIPHERAL_TYPE_JOYSTICK,
-    PERIPHERAL_TYPE_KEYBOARD,
-  } PERIPHERAL_TYPE;
-
-  typedef struct PERIPHERAL_INFO
-  {
-    PERIPHERAL_TYPE type;           /*!< @brief type of peripheral */
-    char*           name;           /*!< @brief name of peripheral */
-    uint16_t        vendor_id;      /*!< @brief vendor ID of peripheral, 0x0000 if unknown */
-    uint16_t        product_id;     /*!< @brief product ID of peripheral, 0x0000 if unknown */
-    unsigned int    index;          /*!< @brief the order in which the add-on identified this peripheral */
-  } ATTRIBUTE_PACKED PERIPHERAL_INFO;
-
-  /*!
-   * @brief Properties passed to the Create() method of an add-on.
-   */
-  typedef struct PERIPHERAL_PROPERTIES
-  {
-    const char* user_path;              /*!< @brief path to the user profile */
-    const char* addon_path;             /*!< @brief path to this add-on */
-  } ATTRIBUTE_PACKED PERIPHERAL_PROPERTIES;
-
-  /*!
-   * @brief Peripheral add-on capabilities.
-   * If a capability is set to true, then the corresponding methods from
-   * kodi_peripheral_dll.h need to be implemented.
-   */
-  typedef struct PERIPHERAL_CAPABILITIES
-  {
-    bool provides_joysticks;            /*!< @brief true if the add-on provides joysticks */
-    bool provides_joystick_rumble;
-    bool provides_joystick_power_off;
-    bool provides_buttonmaps;           /*!< @brief true if the add-on provides button maps */
-  } ATTRIBUTE_PACKED PERIPHERAL_CAPABILITIES;
-  ///}
-
-  /// @name Event types
-  ///{
-  typedef enum PERIPHERAL_EVENT_TYPE
-  {
-    PERIPHERAL_EVENT_TYPE_NONE,           /*!< @brief unknown event */
-    PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON,  /*!< @brief state changed for joystick driver button */
-    PERIPHERAL_EVENT_TYPE_DRIVER_HAT,     /*!< @brief state changed for joystick driver hat */
-    PERIPHERAL_EVENT_TYPE_DRIVER_AXIS,    /*!< @brief state changed for joystick driver axis */
-    PERIPHERAL_EVENT_TYPE_SET_MOTOR,      /*!< @brief set the state for joystick rumble motor */
-  } PERIPHERAL_EVENT_TYPE;
-
-  typedef enum JOYSTICK_STATE_BUTTON
-  {
-    JOYSTICK_STATE_BUTTON_UNPRESSED = 0x0,    /*!< @brief button is released */
-    JOYSTICK_STATE_BUTTON_PRESSED   = 0x1,    /*!< @brief button is pressed */
-  } JOYSTICK_STATE_BUTTON;
-
-  typedef enum JOYSTICK_STATE_HAT
-  {
-    JOYSTICK_STATE_HAT_UNPRESSED  = 0x0,    /*!< @brief no directions are pressed */
-    JOYSTICK_STATE_HAT_LEFT       = 0x1,    /*!< @brief only left is pressed */
-    JOYSTICK_STATE_HAT_RIGHT      = 0x2,    /*!< @brief only right is pressed */
-    JOYSTICK_STATE_HAT_UP         = 0x4,    /*!< @brief only up is pressed */
-    JOYSTICK_STATE_HAT_DOWN       = 0x8,    /*!< @brief only down is pressed */
-    JOYSTICK_STATE_HAT_LEFT_UP    = JOYSTICK_STATE_HAT_LEFT  | JOYSTICK_STATE_HAT_UP,
-    JOYSTICK_STATE_HAT_LEFT_DOWN  = JOYSTICK_STATE_HAT_LEFT  | JOYSTICK_STATE_HAT_DOWN,
-    JOYSTICK_STATE_HAT_RIGHT_UP   = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_UP,
-    JOYSTICK_STATE_HAT_RIGHT_DOWN = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_DOWN,
-  } JOYSTICK_STATE_HAT;
-
-  /*!
-   * @brief value in the closed interval [-1.0, 1.0]
-   *
-   * The axis state uses the XInput coordinate system:
-   *   - Negative values signify down or to the left
-   *   - Positive values signify up or to the right
-   */
-  typedef float JOYSTICK_STATE_AXIS;
-
-  typedef float JOYSTICK_STATE_MOTOR;
-
-  typedef struct PERIPHERAL_EVENT
-  {
-    unsigned int             peripheral_index;
-    PERIPHERAL_EVENT_TYPE    type;
-    unsigned int             driver_index;
-    JOYSTICK_STATE_BUTTON    driver_button_state;
-    JOYSTICK_STATE_HAT       driver_hat_state;
-    JOYSTICK_STATE_AXIS      driver_axis_state;
-    JOYSTICK_STATE_MOTOR     motor_state;
-  } ATTRIBUTE_PACKED PERIPHERAL_EVENT;
-  ///}
-
-  /// @name Joystick types
-  ///{
-  typedef struct JOYSTICK_INFO
-  {
-    PERIPHERAL_INFO peripheral;         /*!< @brief peripheral info for this joystick */
-    char*           provider;           /*!< @brief name of the driver or interface providing the joystick */
-    int             requested_port;     /*!< @brief requested port number (such as for 360 controllers), or NO_PORT_REQUESTED */
-    unsigned int    button_count;       /*!< @brief number of buttons reported by the driver */
-    unsigned int    hat_count;          /*!< @brief number of hats reported by the driver */
-    unsigned int    axis_count;         /*!< @brief number of axes reported by the driver */
-    unsigned int    motor_count;        /*!< @brief number of motors reported by the driver */
-    bool            supports_poweroff;  /*!< @brief whether the joystick supports being powered off */
-  } ATTRIBUTE_PACKED JOYSTICK_INFO;
-
-  typedef enum JOYSTICK_DRIVER_PRIMITIVE_TYPE
-  {
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS,
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR,
-  } JOYSTICK_DRIVER_PRIMITIVE_TYPE;
-
-  typedef struct JOYSTICK_DRIVER_BUTTON
-  {
-    int              index;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_BUTTON;
-
-  typedef enum JOYSTICK_DRIVER_HAT_DIRECTION
-  {
-    JOYSTICK_DRIVER_HAT_UNKNOWN,
-    JOYSTICK_DRIVER_HAT_LEFT,
-    JOYSTICK_DRIVER_HAT_RIGHT,
-    JOYSTICK_DRIVER_HAT_UP,
-    JOYSTICK_DRIVER_HAT_DOWN,
-  } JOYSTICK_DRIVER_HAT_DIRECTION;
-
-  typedef struct JOYSTICK_DRIVER_HAT
-  {
-    int                           index;
-    JOYSTICK_DRIVER_HAT_DIRECTION direction;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_HAT;
-
-  typedef enum JOYSTICK_DRIVER_SEMIAXIS_DIRECTION
-  {
-    JOYSTICK_DRIVER_SEMIAXIS_NEGATIVE = -1, /*!< @brief negative half of the axis */
-    JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN  =  0, /*!< @brief unknown direction */
-    JOYSTICK_DRIVER_SEMIAXIS_POSITIVE =  1, /*!< @brief positive half of the axis */
-  } JOYSTICK_DRIVER_SEMIAXIS_DIRECTION;
-
-  typedef struct JOYSTICK_DRIVER_SEMIAXIS
-  {
-    int                                index;
-    int                                center;
-    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction;
-    unsigned int                       range;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_SEMIAXIS;
-
-  typedef struct JOYSTICK_DRIVER_MOTOR
-  {
-    int              index;
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_MOTOR;
-
-  typedef struct JOYSTICK_DRIVER_PRIMITIVE
-  {
-    JOYSTICK_DRIVER_PRIMITIVE_TYPE    type;
-    union
-    {
-      struct JOYSTICK_DRIVER_BUTTON   button;
-      struct JOYSTICK_DRIVER_HAT      hat;
-      struct JOYSTICK_DRIVER_SEMIAXIS semiaxis;
-      struct JOYSTICK_DRIVER_MOTOR    motor;
-    };
-  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_PRIMITIVE;
-
-  typedef enum JOYSTICK_FEATURE_TYPE
-  {
-    JOYSTICK_FEATURE_TYPE_UNKNOWN,
-    JOYSTICK_FEATURE_TYPE_SCALAR,
-    JOYSTICK_FEATURE_TYPE_ANALOG_STICK,
-    JOYSTICK_FEATURE_TYPE_ACCELEROMETER,
-    JOYSTICK_FEATURE_TYPE_MOTOR,
-  } JOYSTICK_FEATURE_TYPE;
-
-  typedef enum JOYSTICK_FEATURE_PRIMITIVE
-  {
-    // Scalar feature
-    JOYSTICK_SCALAR_PRIMITIVE = 0,
-
-    // Analog stick
-    JOYSTICK_ANALOG_STICK_UP = 0,
-    JOYSTICK_ANALOG_STICK_DOWN = 1,
-    JOYSTICK_ANALOG_STICK_RIGHT = 2,
-    JOYSTICK_ANALOG_STICK_LEFT = 3,
-
-    // Accelerometer
-    JOYSTICK_ACCELEROMETER_POSITIVE_X = 0,
-    JOYSTICK_ACCELEROMETER_POSITIVE_Y = 1,
-    JOYSTICK_ACCELEROMETER_POSITIVE_Z = 2,
-
-    // Motor
-    JOYSTICK_MOTOR_PRIMITIVE = 0,
-
-    // Maximum number of primitives
-    JOYSTICK_PRIMITIVE_MAX = 4,
-  } JOYSTICK_FEATURE_PRIMITIVE;
-
-  typedef struct JOYSTICK_FEATURE
-  {
-    char*                                   name;
-    JOYSTICK_FEATURE_TYPE                   type;
-    struct JOYSTICK_DRIVER_PRIMITIVE        primitives[JOYSTICK_PRIMITIVE_MAX];
-  } ATTRIBUTE_PACKED JOYSTICK_FEATURE;
-  ///}
-
-  //! @todo Mouse, light gun, multitouch
-
-  /*!
-   * @brief Structure to transfer the methods from kodi_peripheral_dll.h to the frontend
-   */
-  
-  typedef PERIPHERAL_PROPERTIES AddonProps_Peripheral;
-
-  typedef struct AddonToKodiFuncTable_Peripheral
-  {
-    KODI_HANDLE kodiInstance;
-    void (*TriggerScan)(void* kodiInstance);
-    void (*RefreshButtonMaps)(void* kodiInstance, const char* deviceName, const char* controllerId);
-    unsigned int (*FeatureCount)(void* kodiInstance, const char* controllerId, JOYSTICK_FEATURE_TYPE type);
-  } AddonToKodiFuncTable_Peripheral;
-
-  typedef struct KodiToAddonFuncTable_Peripheral
-  {
-    PERIPHERAL_ERROR (__cdecl* GetAddonCapabilities)(PERIPHERAL_CAPABILITIES*);
-    PERIPHERAL_ERROR (__cdecl* PerformDeviceScan)(unsigned int*, PERIPHERAL_INFO**);
-    void             (__cdecl* FreeScanResults)(unsigned int, PERIPHERAL_INFO*);
-    PERIPHERAL_ERROR (__cdecl* GetEvents)(unsigned int*, PERIPHERAL_EVENT**);
-    void             (__cdecl* FreeEvents)(unsigned int, PERIPHERAL_EVENT*);
-    bool             (__cdecl* SendEvent)(const PERIPHERAL_EVENT*);
-
-    /// @name Joystick operations
-    ///{
-    PERIPHERAL_ERROR (__cdecl* GetJoystickInfo)(unsigned int, JOYSTICK_INFO*);
-    void             (__cdecl* FreeJoystickInfo)(JOYSTICK_INFO*);
-    PERIPHERAL_ERROR (__cdecl* GetFeatures)(const JOYSTICK_INFO*, const char*, unsigned int*, JOYSTICK_FEATURE**);
-    void             (__cdecl* FreeFeatures)(unsigned int, JOYSTICK_FEATURE*);
-    PERIPHERAL_ERROR (__cdecl* MapFeatures)(const JOYSTICK_INFO*, const char*, unsigned int, const JOYSTICK_FEATURE*);
-    PERIPHERAL_ERROR (__cdecl* GetIgnoredPrimitives)(const JOYSTICK_INFO*, unsigned int*, JOYSTICK_DRIVER_PRIMITIVE**);
-    void             (__cdecl* FreePrimitives)(unsigned int, JOYSTICK_DRIVER_PRIMITIVE*);
-    PERIPHERAL_ERROR (__cdecl* SetIgnoredPrimitives)(const JOYSTICK_INFO*, unsigned int, const JOYSTICK_DRIVER_PRIMITIVE*);
-    void             (__cdecl* SaveButtonMap)(const JOYSTICK_INFO*);
-    void             (__cdecl* RevertButtonMap)(const JOYSTICK_INFO*);
-    void             (__cdecl* ResetButtonMap)(const JOYSTICK_INFO*, const char*);
-    void             (__cdecl* PowerOffJoystick)(unsigned int);
-    ///}
-  } KodiToAddonFuncTable_Peripheral;
-
-  typedef struct AddonInstance_Peripheral
-  {
-    AddonProps_Peripheral props;
-    AddonToKodiFuncTable_Peripheral toKodi;
-    KodiToAddonFuncTable_Peripheral toAddon;
-  } AddonInstance_Peripheral;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __PERIPHERAL_TYPES_H__
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_dll.h
deleted file mode 100644
index 30741a6..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_dll.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *      Copyright (C) 2013 Arne Morten Kvarving
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include <stdint.h>
-#include "xbmc_addon_dll.h"
-#include "kodi_vfs_types.h"
-
-extern "C"
-{
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Open
-  void* Open(VFSURL* url);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::OpenForWrite
-  void* OpenForWrite(VFSURL* url, bool bOverWrite);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Read
-  ssize_t Read(void* context, void* buffer, size_t size);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Write
-  ssize_t Write(void* context, const void* buffer, size_t size);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Seek
-  int64_t Seek(void* context, int64_t position, int whence);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Truncate
-  int Truncate(void* context, int64_t size);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::GetLength
-  int64_t GetLength(void* context);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::GetPosition
-  int64_t GetPosition(void* context);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::GetChunkSize
-  int GetChunkSize(void* context);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::IoControl
-  int IoControl(void* context, XFILE::EIoControl request, void* param);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Stat
-  int Stat(VFSURL* url, struct __stat64* buffer);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Close
-  bool Close(void* context);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Exists
-  bool Exists(VFSURL* url);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::ContainsFiles
-  void* ContainsFiles(VFSURL* url, VFSDirEntry** entries, int* num_entries,
-                      char* rootpath);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::ClearOutIdle
-  void ClearOutIdle();
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::DisconnectAll
-  void DisconnectAll();
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::DirectoryExists
-  bool DirectoryExists(VFSURL* url);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::RemoveDirectory
-  bool RemoveDirectory(VFSURL* url);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::CreateDirectory
-  bool CreateDirectory(VFSURL* url);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::GetDirectory
-  void* GetDirectory(VFSURL* url, VFSDirEntry** entries, int* num_entries,
-                     VFSCallbacks* callbacks);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::FreeDirectory
-  void FreeDirectory(void* ctx);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Delete
-  bool Delete(VFSURL* url);
-
-  //! \copydoc KodiToAddonFuncTable_VFSEntry::Rename
-  bool Rename(VFSURL* url, VFSURL* url2);
-
-  //! \brief Function to export the above structure to Kodi
-  void __declspec(dllexport) get_addon(void* ptr)
-  {
-    AddonInstance_VFSEntry* vfs = static_cast<AddonInstance_VFSEntry*>(ptr);
-    vfs->toAddon.Open = Open;
-    vfs->toAddon.OpenForWrite = OpenForWrite;
-    vfs->toAddon.Read = Read;
-    vfs->toAddon.Write = Write;
-    vfs->toAddon.Seek = Seek;
-    vfs->toAddon.GetLength = GetLength;
-    vfs->toAddon.GetPosition = GetPosition;
-    vfs->toAddon.IoControl = IoControl;
-    vfs->toAddon.Stat = Stat;
-    vfs->toAddon.Close = Close;
-    vfs->toAddon.Exists = Exists;
-    vfs->toAddon.ClearOutIdle = ClearOutIdle;
-    vfs->toAddon.DisconnectAll = DisconnectAll;
-    vfs->toAddon.DirectoryExists = DirectoryExists;
-    vfs->toAddon.GetDirectory = GetDirectory;
-    vfs->toAddon.FreeDirectory = FreeDirectory;
-    vfs->toAddon.Truncate = Truncate;
-    vfs->toAddon.Delete = Delete;
-    vfs->toAddon.Rename = Rename;
-    vfs->toAddon.RemoveDirectory = RemoveDirectory;
-    vfs->toAddon.CreateDirectory = CreateDirectory;
-    vfs->toAddon.ContainsFiles = ContainsFiles;
-    vfs->toAddon.GetChunkSize = GetChunkSize;
-  };
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp
deleted file mode 100644
index cebce7e..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *      Copyright (C) 2015-2016 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/*!
- * @file kodi_vfs_utils.hpp - C++ wrappers for Kodi's VFS operations
- */
-
-#include "libXBMC_addon.h"
-#include "kodi_vfs_types.h"
-
-#include <stdint.h>
-#include <string>
-#include <vector>
-
-namespace ADDON
-{
-  class CVFSDirEntry
-  {
-  public:
-    CVFSDirEntry(const std::string& label = "",
-                 const std::string& path = "",
-                 bool bFolder = false,
-                 int64_t size = -1) :
-      m_label(label),
-      m_path(path),
-      m_bFolder(bFolder),
-      m_size(size)
-    {
-    }
-
-    CVFSDirEntry(const VFSDirEntry& dirEntry) :
-      m_label(dirEntry.label ? dirEntry.label : ""),
-      m_path(dirEntry.path ? dirEntry.path : ""),
-      m_bFolder(dirEntry.folder),
-      m_size(dirEntry.size)
-    {
-    }
-
-    const std::string& Label(void) const { return m_label; }
-    const std::string& Path(void) const { return m_path; }
-    bool IsFolder(void) const { return m_bFolder; }
-    int64_t Size(void) const { return m_size; }
-
-    void SetLabel(const std::string& label) { m_label = label; }
-    void SetPath(const std::string& path) { m_path = path; }
-    void SetFolder(bool bFolder) { m_bFolder = bFolder; }
-    void SetSize(int64_t size) { m_size = size; }
-
-  private:
-    std::string m_label;
-    std::string m_path;
-    bool m_bFolder;
-    int64_t m_size;
-  };
-
-  class VFSUtils
-  {
-  public:
-    static bool GetDirectory(ADDON::CHelper_libXBMC_addon* frontend,
-                             const std::string& path,
-                             const std::string& mask,
-                             std::vector<CVFSDirEntry>& items)
-    {
-      VFSDirEntry* dir_list = nullptr;
-      unsigned int num_items = 0;
-      if (frontend->GetDirectory(path.c_str(), mask.c_str(), &dir_list, &num_items))
-      {
-        for (unsigned int i = 0; i < num_items; i++)
-          items.push_back(CVFSDirEntry(dir_list[i]));
-
-        frontend->FreeDirectory(dir_list, num_items);
-
-        return true;
-      }
-      return false;
-    }
-  };
-}
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
deleted file mode 100644
index d4ea283..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
+++ /dev/null
@@ -1,204 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2014 Team KODI
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with KODI; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <string>
-#include <vector>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "kodi_adsp_types.h"
-#include "libXBMC_addon.h"
-
-class CAddonSoundPlay
-{
-public:
-  CAddonSoundPlay(AddonCB* hdl, AddonInstance_AudioDSP* cb, const char* filename)
-    : m_Filename(filename),
-      m_Handle(hdl),
-      m_cb(cb)
-  {
-    m_PlayHandle = nullptr;
-    if (!hdl || !cb)
-      fprintf(stderr, "libKODI_adsp-ERROR: ADSP_get_sound_play is called with NULL handle !!!\n");
-    else
-    {
-      m_PlayHandle = m_cb->toKodi.SoundPlay_GetHandle(m_cb->toKodi.kodiInstance, m_Filename.c_str());
-      if (!m_PlayHandle)
-        fprintf(stderr, "libKODI_adsp-ERROR: ADSP_get_sound_play can't get callback table from KODI !!!\n");
-    }
-  }
-
-  ~CAddonSoundPlay()
-  {
-    if (m_PlayHandle)
-      m_cb->toKodi.SoundPlay_ReleaseHandle(m_cb->toKodi.kodiInstance, m_PlayHandle);
-  }
-
-  /*! play the sound this object represents */
-  void Play()
-  {
-    if (m_PlayHandle)
-      m_cb->toKodi.SoundPlay_Play(m_cb->toKodi.kodiInstance, m_PlayHandle);
-  }
-
-
-  /*! stop playing the sound this object represents */
-  void Stop()
-  {
-    if (m_PlayHandle)
-      m_cb->toKodi.SoundPlay_Stop(m_cb->toKodi.kodiInstance, m_PlayHandle);
-  }
-
-  /*! return true if the sound is currently playing */
-  bool IsPlaying()
-  {
-    if (!m_PlayHandle)
-      return false;
-
-    return m_cb->toKodi.SoundPlay_IsPlaying(m_cb->toKodi.kodiInstance, m_PlayHandle);
-  }
-
-  /*! set the playback channel position of this sound, AE_DSP_CH_INVALID for all */
-  void SetChannel(AE_DSP_CHANNEL channel)
-  {
-    if (m_PlayHandle)
-      m_cb->toKodi.SoundPlay_SetChannel(m_cb->toKodi.kodiInstance, m_PlayHandle, channel);
-  }
-
-  /*! get the current playback volume of this sound, AE_DSP_CH_INVALID for all */
-  AE_DSP_CHANNEL GetChannel()
-  {
-    if (!m_PlayHandle)
-      return AE_DSP_CH_INVALID;
-    return m_cb->toKodi.SoundPlay_GetChannel(m_cb->toKodi.kodiInstance, m_PlayHandle);
-  }
-
-  /*! set the playback volume of this sound */
-  void SetVolume(float volume)
-  {
-    if (m_PlayHandle)
-      m_cb->toKodi.SoundPlay_SetVolume(m_cb->toKodi.kodiInstance, m_PlayHandle, volume);
-  }
-
-  /*! get the current playback volume of this sound */
-  float GetVolume()
-  {
-    if (!m_PlayHandle)
-      return 0.0f;
-
-    return m_cb->toKodi.SoundPlay_GetVolume(m_cb->toKodi.kodiInstance, m_PlayHandle);
-  }
-
-private:
-  std::string m_Filename;
-  AddonCB* m_Handle;
-  AddonInstance_AudioDSP *m_cb;
-  ADSPHANDLE  m_PlayHandle;
-};
-
-class CHelper_libKODI_adsp
-{
-public:
-  CHelper_libKODI_adsp(void)
-  {
-    m_Handle    = nullptr;
-    m_Callbacks = nullptr;
-  }
-
-  ~CHelper_libKODI_adsp(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_AudioDSP*)m_Handle->ADSPLib_RegisterMe(m_Handle->addonData);
-    if (!m_Callbacks)
-      fprintf(stderr, "libKODI_adsp-ERROR: ADSLib_RegisterMe can't get callback table from Kodi !!!\n");
-
-    return m_Callbacks != nullptr;
-  }
-
-  /*!
-   * @brief Add or replace a menu hook for the context menu for this add-on
-   * @param hook The hook to add
-   */
-  void AddMenuHook(AE_DSP_MENUHOOK* hook)
-  {
-    return m_Callbacks->toKodi.AddMenuHook(m_Callbacks->toKodi.kodiInstance, hook);
-  }
-
-  /*!
-   * @brief Remove a menu hook for the context menu for this add-on
-   * @param hook The hook to remove
-   */
-  void RemoveMenuHook(AE_DSP_MENUHOOK* hook)
-  {
-    return m_Callbacks->toKodi.RemoveMenuHook(m_Callbacks->toKodi.kodiInstance, hook);
-  }
-
-  /*!
-   * @brief Add or replace master mode information inside audio dsp database.
-   * Becomes identifier written inside mode to iModeID if it was 0 (undefined)
-   * @param mode The master mode to add or update inside database
-   */
-  void RegisterMode(AE_DSP_MODES::AE_DSP_MODE* mode)
-  {
-    return m_Callbacks->toKodi.RegisterMode(m_Callbacks->toKodi.kodiInstance, mode);
-  }
-
-  /*!
-   * @brief Remove a master mode from audio dsp database
-   * @param mode The Mode to remove
-   */
-  void UnregisterMode(AE_DSP_MODES::AE_DSP_MODE* mode)
-  {
-    return m_Callbacks->toKodi.UnregisterMode(m_Callbacks->toKodi.kodiInstance, mode);
-  }
-
-  /*!
-   * @brief Open a sound playing class
-   * @param filename The wav filename to open
-   */
-  CAddonSoundPlay* GetSoundPlay(const char *filename)
-  {
-    return new CAddonSoundPlay(m_Handle, m_Callbacks, filename);
-  }
-
-  /*!
-   * @brief Remove a played file class
-   * @param p The playback to remove
-   */
-  void ReleaseSoundPlay(CAddonSoundPlay* p)
-  {
-    delete p;
-  }
-
-private:
-  AddonCB* m_Handle;
-  AddonInstance_AudioDSP *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
index d6f0f4f..c844c73 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
@@ -203,7 +203,7 @@ public:
     m_controlHandle = m_cb->ListItem_Create(m_Handle->addonData, label, label2, iconImage, thumbnailImage, path);
   }
 
-  virtual ~CAddonListItem() = default;
+  ~CAddonListItem() override = default;
 
   const char *GetLabel()
   {
@@ -293,7 +293,7 @@ public:
     }
   }
 
-  virtual ~CAddonGUIWindow()
+  ~CAddonGUIWindow() override
   {
     if (m_Handle && m_cb && m_controlHandle)
     {
@@ -506,7 +506,7 @@ public:
   {
     m_controlHandle = m_cb->Window_GetControl_Spin(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
   }
-  ~CAddonGUISpinControl(void) {}
+  ~CAddonGUISpinControl(void) override = default;
 
   void SetVisible(bool yesNo)
   {
@@ -555,7 +555,7 @@ public:
   {
     m_controlHandle = m_cb->Window_GetControl_RadioButton(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
   }
-  ~CAddonGUIRadioButton() {}
+  ~CAddonGUIRadioButton() override = default;
 
   void SetVisible(bool yesNo)
   {
@@ -593,7 +593,7 @@ public:
     m_controlHandle = m_cb->Window_GetControl_Progress(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
   }
 
-  ~CAddonGUIProgressControl(void) {}
+  ~CAddonGUIProgressControl(void) override = default;
 
   void SetPercentage(float fPercent)
   {
@@ -641,7 +641,7 @@ public:
     m_controlHandle = m_cb->Window_GetControl_Slider(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
   }
 
-  ~CAddonGUISliderControl(void) {}
+  ~CAddonGUISliderControl(void) override = default;
 
   void SetVisible(bool yesNo)
   {
@@ -731,7 +731,7 @@ public:
     m_controlHandle = m_cb->Window_GetControl_SettingsSlider(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
   }
   
-  ~CAddonGUISettingsSliderControl(void) {}
+  ~CAddonGUISettingsSliderControl(void) override = default;
 
   void SetVisible(bool yesNo)
   {
@@ -832,7 +832,7 @@ public:
     m_controlHandle = m_cb->Window_GetControl_RenderAddon(m_Handle->addonData, m_Window->GetControlHandle(), controlId);
   }
 
-  virtual ~CAddonGUIRenderingControl()
+  ~CAddonGUIRenderingControl() override
   {
     m_cb->RenderAddon_Delete(m_Handle->addonData, m_controlHandle);
   }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
deleted file mode 100644
index d37d24e..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *      Copyright (C) 2005-2016 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "kodi_inputstream_types.h"
-#include "versions.h"
-
-#ifdef BUILD_KODI_ADDON
-#include "DVDDemuxPacket.h"
-#else
-#include "cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h"
-#endif
-
-class CHelper_libKODI_inputstream
-{
-public:
-  CHelper_libKODI_inputstream(void)
-  {
-    m_Handle = nullptr;
-    m_Callbacks = nullptr;
-  }
-
-  ~CHelper_libKODI_inputstream(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_InputStream*)m_Handle->INPUTSTREAMLib_RegisterMe(m_Handle->addonData);
-    if (!m_Callbacks)
-      fprintf(stderr, "libKODI_inputstream-ERROR: InputStream_RegisterMe can't get callback table from Kodi !!!\n");
-
-    return m_Callbacks != nullptr;
-  }
-
-  /*!
-   * @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);
-  }
-
-  /*!
-   * @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);
-  }
-
-private:
-  AddonCB* m_Handle;
-  AddonInstance_InputStream* m_Callbacks;
-};
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h
deleted file mode 100644
index d1d8e4b..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *      Copyright (C) 2014-2017 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this Program; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include "libXBMC_addon.h"
-#include "kodi_peripheral_types.h"
-
-#include <string>
-#include <stdio.h>
-
-#if defined(ANDROID)
-  #include <sys/stat.h>
-#endif
-
-namespace ADDON
-{
-
-class CHelper_libKODI_peripheral
-{
-public:
-  CHelper_libKODI_peripheral(void)
-  {
-    m_Handle = nullptr;
-    m_Callbacks = nullptr;
-  }
-
-  ~CHelper_libKODI_peripheral(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_Peripheral*)m_Handle->PeripheralLib_RegisterMe(m_Handle->addonData);
-    if (!m_Callbacks)
-      fprintf(stderr, "libKODI_peripheral-ERROR: PeripheralLib_register_me can't get callback table from Kodi !!!\n");
-
-    return m_Callbacks != nullptr;
-  }
-
-  /*!
-   * @brief Trigger a scan for peripherals
-   *
-   * The add-on calls this if a change in hardware is detected.
-   */
-  void TriggerScan(void)
-  {
-    return m_Callbacks->toKodi.TriggerScan(m_Callbacks->toKodi.kodiInstance);
-  }
-
-  /*!
-   * @brief Notify the frontend that button maps have changed
-   *
-   * @param[optional] deviceName The name of the device to refresh, or empty/null for all devices
-   * @param[optional] controllerId The controller ID to refresh, or empty/null for all controllers
-   */
-  void RefreshButtonMaps(const std::string& strDeviceName = "", const std::string& strControllerId = "")
-  {
-    return m_Callbacks->toKodi.RefreshButtonMaps(m_Callbacks->toKodi.kodiInstance, strDeviceName.c_str(), strControllerId.c_str());
-  }
-
-  /*!
-   * @brief Return the number of features belonging to the specified controller
-   *
-   * @param controllerId    The controller ID to enumerate
-   * @param type[optional]  Type to filter by, or JOYSTICK_FEATURE_TYPE_UNKNOWN for all features
-   *
-   * @return The number of features matching the request parameters
-   */
-  unsigned int FeatureCount(const std::string& strControllerId, JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN)
-  {
-    return m_Callbacks->toKodi.FeatureCount(m_Callbacks->toKodi.kodiInstance, strControllerId.c_str(), type);
-  }
-
-private:
-  AddonCB* m_Handle;
-  AddonInstance_Peripheral* m_Callbacks;
-};
-
-} /* namespace ADDON */
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
new file mode 100644
index 0000000..232f67d
--- /dev/null
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/tools/DllHelper.h
@@ -0,0 +1,129 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2017 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string>
+#include <kodi/AddonBase.h>
+
+#ifdef _WIN32                   // windows
+#include <p8-platform/windows/dlfcn-win32.h>
+#else
+#include <dlfcn.h>              // linux+osx
+#endif
+
+#define REGISTER_DLL_SYMBOL(functionPtr) \
+  CDllHelper::RegisterSymbol(functionPtr, #functionPtr)
+
+/// @brief Class to help with load of shared library functions
+///
+/// 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!
+///
+///
+/// ----------------------------------------------------------------------------
+///
+/// **Example:**
+/// ~~~~~~~~~~~~~{.cpp}
+///
+/// #include <kodi/tools/DllHelper.h>
+///
+/// ...
+/// class CMyInstance : public kodi::addon::CInstanceAudioDecoder,
+///                     private CDllHelper
+/// {
+/// public:
+///   CMyInstance(KODI_HANDLE instance);
+///   bool Start();
+///
+///   ...
+///
+///   /* The pointers for on shared library exported functions */
+///   int (*Init)();
+///   void (*Cleanup)();
+///   int (*GetLength)();
+/// };
+///
+/// CMyInstance::CMyInstance(KODI_HANDLE instance)
+///   : CInstanceAudioDecoder(instance)
+/// {
+/// }
+///
+/// bool CMyInstance::Start()
+/// {
+///   std::string lib = kodi::GetAddonPath("myLib.so");
+///   if (!LoadDll(lib)) return false;
+///   if (!REGISTER_DLL_SYMBOL(Init)) return false;
+///   if (!REGISTER_DLL_SYMBOL(Cleanup)) return false;
+///   if (!REGISTER_DLL_SYMBOL(GetLength)) return false;
+///
+///   Init();
+///   return true;
+/// }
+/// ...
+/// ~~~~~~~~~~~~~
+///
+class CDllHelper
+{
+public:
+  CDllHelper() : m_dll(nullptr) { }
+  virtual ~CDllHelper()
+  {
+    if (m_dll)
+      dlclose(m_dll);
+  }
+
+  /// @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
+  ///
+  bool LoadDll(const std::string& path)
+  {
+    m_dll = dlopen(path.c_str(), RTLD_LAZY);
+    if (m_dll == nullptr)
+    {
+      kodi::Log(ADDON_LOG_ERROR, "Unable to load %s", dlerror());
+      return false;
+    }
+    return true;
+  }
+
+  /// @brief Function to register requested library symbol
+  ///
+  /// @note This function should not be used, use instead the macro
+  /// REGISTER_DLL_SYMBOL to register the symbol pointer.
+  ///
+  template <typename T>
+  bool RegisterSymbol(T& functionPtr, const char* strFunctionPtr)
+  {
+    functionPtr = reinterpret_cast<T>(dlsym(m_dll, strFunctionPtr));
+    if (functionPtr == nullptr)
+    {
+      kodi::Log(ADDON_LOG_ERROR, "Unable to assign function %s", dlerror());
+      return false;
+    }
+    return true;
+  }
+
+private:
+  void* m_dll;
+};
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 fa90f77..b9d37b4 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
@@ -41,8 +41,8 @@
  * overview.
  */
 
-#define ADDON_GLOBAL_VERSION_MAIN                     "1.0.7"
-#define ADDON_GLOBAL_VERSION_MAIN_MIN                 "1.0.2"
+#define ADDON_GLOBAL_VERSION_MAIN                     "1.0.10"
+#define ADDON_GLOBAL_VERSION_MAIN_MIN                 "1.0.10"
 #define ADDON_GLOBAL_VERSION_MAIN_XML_ID              "kodi.binary.global.main"
 #define ADDON_GLOBAL_VERSION_MAIN_DEPENDS             "AddonBase.h" \
                                                       "xbmc_addon_dll.h" \
@@ -50,8 +50,8 @@
                                                       "libXBMC_addon.h" \
                                                       "addon-instance/"
 
-#define ADDON_GLOBAL_VERSION_GENERAL                  "1.0.0"
-#define ADDON_GLOBAL_VERSION_GENERAL_MIN              "1.0.0"
+#define ADDON_GLOBAL_VERSION_GENERAL                  "1.0.2"
+#define ADDON_GLOBAL_VERSION_GENERAL_MIN              "1.0.2"
 #define ADDON_GLOBAL_VERSION_GENERAL_XML_ID           "kodi.binary.global.general"
 #define ADDON_GLOBAL_VERSION_GENERAL_DEPENDS          "General.h"
 
@@ -75,24 +75,20 @@
 #define ADDON_GLOBAL_VERSION_NETWORK_XML_ID           "kodi.binary.global.network"
 #define ADDON_GLOBAL_VERSION_NETWORK_DEPENDS          "Network.h"
 
-#define ADDON_INSTANCE_VERSION_ADSP                   "0.1.10"
-#define ADDON_INSTANCE_VERSION_ADSP_MIN               "0.1.10"
+#define ADDON_INSTANCE_VERSION_ADSP                   "0.2.0"
+#define ADDON_INSTANCE_VERSION_ADSP_MIN               "0.2.0"
 #define ADDON_INSTANCE_VERSION_ADSP_XML_ID            "kodi.binary.instance.adsp"
-#define ADDON_INSTANCE_VERSION_ADSP_DEPENDS           "kodi_adsp_dll.h" \
-                                                      "kodi_adsp_types.h" \
-                                                      "libKODI_adsp.h"
+#define ADDON_INSTANCE_VERSION_ADSP_DEPENDS           "addon-instance/AudioDSP.h"
 
-#define ADDON_INSTANCE_VERSION_AUDIODECODER           "1.0.1"
-#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER           "2.0.0"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_MIN       "2.0.0"
 #define ADDON_INSTANCE_VERSION_AUDIODECODER_XML_ID    "kodi.binary.instance.audiodecoder"
-#define ADDON_INSTANCE_VERSION_AUDIODECODER_DEPENDS   "kodi_audiodec_dll.h" \
-                                                      "kodi_audiodec_types.h"
+#define ADDON_INSTANCE_VERSION_AUDIODECODER_DEPENDS   "addon-instance/AudioDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "1.0.1"
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER           "2.0.0"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN       "2.0.0"
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_XML_ID    "kodi.binary.instance.audioencoder"
-#define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "xbmc_audioenc_dll.h" \
-                                                      "xbmc_audioenc_types.h"
+#define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "addon-instance/AudioEncoder.h"
 
 #define ADDON_INSTANCE_VERSION_GAME                   "1.0.32"
 #define ADDON_INSTANCE_VERSION_GAME_MIN               "1.0.32"
@@ -101,29 +97,24 @@
                                                       "kodi_game_types.h" \
                                                       "libKODI_game.h"
 
-#define ADDON_INSTANCE_VERSION_IMAGEDECODER           "1.0.1"
-#define ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN       "1.0.1"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER           "2.0.0"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN       "2.0.0"
 #define ADDON_INSTANCE_VERSION_IMAGEDECODER_XML_ID    "kodi.binary.instance.imagedecoder"
-#define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "kodi_imagedec_dll.h" \
-                                                      "kodi_imagedec_types.h"
+#define ADDON_INSTANCE_VERSION_IMAGEDECODER_DEPENDS   "addon-instance/ImageDecoder.h"
 
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "1.0.8"
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "1.0.8"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM            "2.0.2"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN        "2.0.2"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID     "kodi.binary.instance.inputstream"
-#define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "libKODI_inputstream.h" \
-                                                      "kodi_inputstream_dll.h" \
-                                                      "kodi_inputstream_types.h"
+#define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "addon-instance/Inputstream.h"
 
 #define ADDON_INSTANCE_VERSION_PERIPHERAL             "1.3.3"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "1.3.3"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_XML_ID      "kodi.binary.instance.peripheral"
-#define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "kodi_peripheral_dll.h" \
-                                                      "kodi_peripheral_types.h" \
-                                                      "kodi_peripheral_utils.hpp" \
-                                                      "libKODI_peripheral.h"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "addon-instance/Peripheral.h" \
+                                                      "addon-instance/PeripheralUtils.h"
 
-#define ADDON_INSTANCE_VERSION_PVR                    "5.2.4"
-#define ADDON_INSTANCE_VERSION_PVR_MIN                "5.2.4"
+#define ADDON_INSTANCE_VERSION_PVR                    "5.3.0"
+#define ADDON_INSTANCE_VERSION_PVR_MIN                "5.3.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" \
@@ -135,18 +126,22 @@
 #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                    "1.0.1"
-#define ADDON_INSTANCE_VERSION_VFS_MIN                "1.0.1"
+#define ADDON_INSTANCE_VERSION_VFS                    "2.0.0"
+#define ADDON_INSTANCE_VERSION_VFS_MIN                "2.0.0"
 #define ADDON_INSTANCE_VERSION_VFS_XML_ID             "kodi.binary.instance.vfs"
-#define ADDON_INSTANCE_VERSION_VFS_DEPENDS            "kodi_vfs_dll.h" \
-                                                      "kodi_vfs_types.h" \
-                                                      "kodi_vfs_utils.hpp"
+#define ADDON_INSTANCE_VERSION_VFS_DEPENDS            "addon-instance/VFS.h"
 
-#define ADDON_INSTANCE_VERSION_VISUALIZATION          "1.0.1"
-#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "1.0.1"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION          "2.0.1"
+#define ADDON_INSTANCE_VERSION_VISUALIZATION_MIN      "2.0.0"
 #define ADDON_INSTANCE_VERSION_VISUALIZATION_XML_ID   "kodi.binary.instance.visualization"
-#define ADDON_INSTANCE_VERSION_VISUALIZATION_DEPENDS  "xbmc_vis_dll.h" \
-                                                      "xbmc_vis_types.h"
+#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_XML_ID      "kodi.binary.instance.videocodec"
+#define ADDON_INSTANCE_VERSION_VIDEOCODEC_DEPENDS     "addon-instance/VideoCodec.h" \
+                                                      "StreamCodec.h" \
+                                                      "StreamCrypto.h"
 
 ///
 /// The currently available instance types for Kodi add-ons
@@ -179,6 +174,7 @@ typedef enum ADDON_TYPE
   ADDON_INSTANCE_VISUALIZATION = 109,
   ADDON_INSTANCE_VFS = 110,
   ADDON_INSTANCE_IMAGEDECODER = 111,
+  ADDON_INSTANCE_VIDEOCODEC = 112,
 } ADDON_TYPE;
 
 #ifdef __cplusplus
@@ -271,6 +267,10 @@ inline const char* GetTypeVersion(int type)
     case ADDON_INSTANCE_VISUALIZATION:
       return ADDON_INSTANCE_VERSION_VISUALIZATION;
 #endif
+#if !defined(BUILD_KODI_ADDON) || defined(ADDON_INSTANCE_VERSION_VIDEOCODEC_USED)
+    case ADDON_INSTANCE_VIDEOCODEC:
+      return ADDON_INSTANCE_VERSION_VIDEOCODEC;
+#endif
   }
   return "0.0.0";
 }
@@ -324,6 +324,8 @@ inline const char* GetTypeMinVersion(int type)
       return ADDON_INSTANCE_VERSION_VFS_MIN;
     case ADDON_INSTANCE_VISUALIZATION:
       return ADDON_INSTANCE_VERSION_VISUALIZATION_MIN;
+    case ADDON_INSTANCE_VIDEOCODEC:
+      return ADDON_INSTANCE_VERSION_VIDEOCODEC_MIN;
   }
   return "0.0.0";
 }
@@ -374,6 +376,8 @@ inline const char* GetTypeName(int type)
       return "ScreenSaver";
     case ADDON_INSTANCE_VISUALIZATION:
       return "Visualization";
+    case ADDON_INSTANCE_VIDEOCODEC:
+      return "VideoCodec";
   }
   return "unknown";
 }
@@ -425,6 +429,8 @@ inline int GetTypeId(const char* name)
       return ADDON_INSTANCE_VFS;
     else if (strcmp(name, "visualization") == 0)
       return ADDON_INSTANCE_VISUALIZATION;
+    else if (strcmp(name, "videocodec") == 0)
+      return ADDON_INSTANCE_VIDEOCODEC;
   }
   return -1;
 }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h
deleted file mode 100644
index 9ba259c..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <stdint.h>
-#include "xbmc_addon_dll.h"
-#include "xbmc_audioenc_types.h"
-
-extern "C"
-{
-  //! \copydoc AudioEncoder::Create
-  void* Create(audioenc_callbacks *callbacks);
-
-  //! \copydoc AudioEncoder::Start
-  bool Start(void* context, int iInChannels, int iInRate, int iInBits,
-             const char* title, const char* artist,
-             const char* albumartist, const char* album,
-             const char* year, const char* track,
-             const char* genre, const char* comment, int iTrackLength);
-
-  //! \copydoc AudioEncoder::Encode
-  int Encode(void* context, int nNumBytesRead, uint8_t* pbtStream);
-
-  //! \copydoc AudioEncoder::Finish
-  bool Finish(void* context);
-
-  //! \copydoc AudioEncoder::Free
-  void Free(void* context);
-
-  // function to export the above structure to XBMC
-  void __declspec(dllexport) get_addon(void* enc)
-  {
-    AddonInstance_AudioEncoder* pScr = static_cast<AddonInstance_AudioEncoder*>(enc);
-
-    pScr->toAddon.Create = Create;
-    pScr->toAddon.Start  = Start;
-    pScr->toAddon.Encode = Encode;
-    pScr->toAddon.Finish = Finish;
-    pScr->toAddon.Free   = Free;
-  };
-};
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h
deleted file mode 100644
index 25142c2..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h
+++ /dev/null
@@ -1,121 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TARGET_WINDOWS
-#ifndef __cdecl
-#define __cdecl
-#endif
-#ifndef __declspec
-#define __declspec(X)
-#endif
-#endif
-
-#include "xbmc_addon_types.h"
-#include <stdint.h>
-
-extern "C"
-{
-  struct AUDIOENC_INFO
-  {
-    int dummy;
-  };
-
-  typedef int (*audioenc_write_callback)(void* opaque, uint8_t* data, int len);
-  typedef int64_t (*audioenc_seek_callback)(void* opaque, int64_t pos, int whence);
-
-  typedef struct
-  {
-    void*                   opaque;
-    audioenc_write_callback write;
-    audioenc_seek_callback  seek;
-  } audioenc_callbacks;
-
-  typedef struct AddonProps_AudioEncoder
-  {
-    int dummy;
-  } AddonProps_AudioEncoder;
-
-  typedef struct AddonToKodiFuncTable_AudioEncoder
-  {
-    KODI_HANDLE kodiInstance;
-  } AddonToKodiFuncTable_AudioEncoder;
-
-  typedef struct KodiToAddonFuncTable_AudioEncoder
-  {
-    /*! \brief Create encoder context
-     \param callbacks Pointer to audioenc_callbacks structure.
-     \return opaque pointer to encoder context, to be passed to other methods.
-     \sa IEncoder::Init
-     */
-    void (*(__cdecl *Create) (audioenc_callbacks* callbacks));
-
-    /*! \brief Start encoder
-     \param context Encoder context from Create.
-     \param iInChannels Number of channels
-     \param iInRate Sample rate of input data
-     \param iInBits Bits per sample in input data
-     \param title The title of the song
-     \param artist The artist of the song
-     \param albumartist The albumartist of the song
-     \param year The year of the song
-     \param track The track number of the song
-     \param genre The genre of the song
-     \param comment A comment to attach to the song
-     \param iTrackLength Total track length in seconds
-     \sa IEncoder::Init
-     */
-    bool (__cdecl* Start) (void* context, int iInChannels, int iInRate, int iInBits,
-                           const char* title, const char* artist,
-                           const char* albumartist, const char* album,
-                           const char* year, const char* track,
-                           const char* genre, const char* comment,
-                           int iTrackLength);
-
-    /*! \brief Encode a chunk of audio
-     \param context Encoder context from Create.
-     \param nNumBytesRead Number of bytes in input buffer
-     \param pbtStream the input buffer
-     \return Number of bytes consumed
-     \sa IEncoder::Encode
-     */
-    int  (__cdecl* Encode) (void* context, int nNumBytesRead, uint8_t* pbtStream);
-
-    /*! \brief Finalize encoding
-     \param context Encoder context from Create.
-     \return True on success, false on failure.
-     */
-    bool (__cdecl* Finish) (void* context);
-
-    /*! \brief Free encoder context
-     \param context Encoder context to free.
-     */
-    void (__cdecl* Free)(void* context);
-  } KodiToAddonFuncTable_AudioEncoder;
-
-  typedef struct AddonInstance_AudioEncoder
-  {
-    AddonProps_AudioEncoder props;
-    AddonToKodiFuncTable_AudioEncoder toKodi;
-    KodiToAddonFuncTable_AudioEncoder toAddon;
-  } AddonInstance_AudioEncoder;
-}
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
index d504f4b..11e39f8 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
@@ -262,6 +262,14 @@ extern "C"
   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.
@@ -413,11 +421,19 @@ extern "C"
    * Get the signal status of the stream that's currently open.
    * @param signalStatus The signal status.
    * @return True if the signal status has been read successfully, false otherwise.
-   * @remarks Optional, and only used if bHandlesInputStream or bHandlesDemuxing is set to true. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function.
+   * @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 True if the decramble 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 URL for a channel from the backend. Used by the MediaPortal add-on.
    * @param channel The channel to get the stream URL for.
    * @return The requested URL.
@@ -660,6 +676,7 @@ extern "C"
     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;
@@ -680,6 +697,7 @@ extern "C"
     pClient->toAddon.LengthLiveStream               = LengthLiveStream;
     pClient->toAddon.SwitchChannel                  = SwitchChannel;
     pClient->toAddon.SignalStatus                   = SignalStatus;
+    pClient->toAddon.GetDescrambleInfo              = GetDescrambleInfo;
     pClient->toAddon.GetLiveStreamURL               = GetLiveStreamURL;
     pClient->toAddon.GetChannelSwitchDelay          = GetChannelSwitchDelay;
     pClient->toAddon.CanPauseStream                 = CanPauseStream;
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
index f3a4ccf..e7fed7b 100644
--- 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
@@ -70,6 +70,9 @@ struct DemuxPacket;
 #define PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE 512
 #define PVR_ADDON_TIMERTYPE_VALUES_ARRAY_SIZE_SMALL 128
 #define PVR_ADDON_TIMERTYPE_STRING_LENGTH     64
+#define PVR_ADDON_ATTRIBUTE_DESC_LENGTH 64
+#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 }
@@ -155,6 +158,7 @@ extern "C" {
   const unsigned int PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE        = 0x00200000; /*!< @brief this type shold 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 */
 
   /*!
    * @brief PVR timer weekdays (PVR_TIMER.iWeekdays values)
@@ -182,6 +186,11 @@ extern "C" {
   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
@@ -266,7 +275,16 @@ extern "C" {
   } PVR_PROPERTIES;
 
   /*!
-   * @brief PVR add-on capabilities. All capabilities are set to "false" as default.
+   * @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
@@ -285,6 +303,12 @@ extern "C" {
     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. */
+
+    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;
 
   /*!
@@ -330,6 +354,22 @@ extern "C" {
   } 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
    */
@@ -375,14 +415,9 @@ extern "C" {
   } ATTRIBUTE_PACKED PVR_CHANNEL_GROUP_MEMBER;
 
   /*!
-   * @brief Representation of a timer's attribute integer value.
+   * @brief Representation of a timer type's attribute integer value.
    */
-  typedef struct PVR_TIMER_TYPE_ATTRIBUTE_INT_VALUE
-  {
-    int iValue;                                              /*!< @brief (required) an integer value for a certain timer attribute */
-    char strDescription[PVR_ADDON_TIMERTYPE_STRING_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_TIMER_TYPE_ATTRIBUTE_INT_VALUE;
+  typedef PVR_ATTRIBUTE_INT_VALUE PVR_TIMER_TYPE_ATTRIBUTE_INT_VALUE;
 
   /*!
    * @brief Representation of a timer type.
@@ -485,11 +520,11 @@ extern "C" {
     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   strStreamURL[PVR_ADDON_URL_STRING_LENGTH];     /*!< @brief (required) stream URL to access this recording */
     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) icon path */
     char   strThumbnailPath[PVR_ADDON_URL_STRING_LENGTH]; /*!< @brief (optional) thumbnail path */
@@ -600,6 +635,7 @@ extern "C" {
     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&);
@@ -618,6 +654,7 @@ extern "C" {
     long long (__cdecl* LengthLiveStream)(void);
     bool (__cdecl* SwitchChannel)(const PVR_CHANNEL&);
     PVR_ERROR (__cdecl* SignalStatus)(PVR_SIGNAL_STATUS&);
+    PVR_ERROR (__cdecl* GetDescrambleInfo)(PVR_DESCRAMBLE_INFO*);
     const char*  (__cdecl* GetLiveStreamURL)(const PVR_CHANNEL&);
     bool (__cdecl* OpenRecordedStream)(const PVR_RECORDING&);
     void (__cdecl* CloseRecordedStream)(void);
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h
deleted file mode 100644
index 7252721..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "xbmc_addon_dll.h"
-#include "xbmc_vis_types.h"
-
-extern "C"
-{
-  // Functions that your visualisation must implement
-  void Start(int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName);
-  void Stop();
-  void AudioData(const float* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength);
-  void Render();
-  bool OnAction(long action, const void *param);
-  void GetInfo(VIS_INFO* pInfo);
-  unsigned int GetPresets(char ***presets);
-  unsigned GetPreset();
-  unsigned int GetSubModules(char ***presets);
-  bool IsLocked();
-
-  // function to export the above structure to XBMC
-  void __declspec(dllexport) get_addon(void* ptr)
-  {
-    AddonInstance_Visualization* pVisz = static_cast<AddonInstance_Visualization*>(ptr);
-
-    pVisz->toAddon.Start = Start;
-    pVisz->toAddon.Stop = Stop;
-    pVisz->toAddon.AudioData = AudioData;
-    pVisz->toAddon.Render = Render;
-    pVisz->toAddon.OnAction = OnAction;
-    pVisz->toAddon.GetInfo = GetInfo;
-    pVisz->toAddon.GetPresets = GetPresets;
-    pVisz->toAddon.GetPreset = GetPreset;
-    pVisz->toAddon.GetSubModules = GetSubModules;
-    pVisz->toAddon.IsLocked = IsLocked;
-  };
-};
-
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h
deleted file mode 100644
index be11c89..0000000
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma once
-
-/*
- *      Copyright (C) 2005-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-/*
-  Common data structures shared between Kodi and Kodi's visualisations
- */
-
-#include "xbmc_addon_types.h"
-#include <cstddef>
-
-extern "C"
-{
-  struct VIS_INFO
-  {
-    int bWantsFreq;
-    int iSyncDelay;
-  };
-
-  enum VIS_ACTION
-  { 
-    VIS_ACTION_NONE = 0,
-    VIS_ACTION_NEXT_PRESET,
-    VIS_ACTION_PREV_PRESET,
-    VIS_ACTION_LOAD_PRESET,
-    VIS_ACTION_RANDOM_PRESET,
-    VIS_ACTION_LOCK_PRESET,
-    VIS_ACTION_RATE_PRESET_PLUS,
-    VIS_ACTION_RATE_PRESET_MINUS,
-    VIS_ACTION_UPDATE_ALBUMART,
-    VIS_ACTION_UPDATE_TRACK
-  };
-
-  class VisTrack
-  {
-  public:
-    VisTrack()
-    {
-      title = artist = album = albumArtist = NULL;
-      genre = comment = lyrics = reserved1 = reserved2 = NULL;
-      trackNumber = discNumber = duration = year = 0;
-      rating = 0;
-      reserved3 = reserved4 = 0;
-    }
-
-    const char *title;
-    const char *artist;
-    const char *album;
-    const char *albumArtist;
-    const char *genre;
-    const char *comment;
-    const char *lyrics;
-    const char *reserved1;
-    const char *reserved2;
-
-    int        trackNumber;
-    int        discNumber;
-    int        duration;
-    int        year;
-    char       rating;
-    int        reserved3;
-    int        reserved4;
-  };
-
-  typedef struct AddonProps_Visualization /* internal */
-  {
-    void *device;
-    int x;
-    int y;
-    int width;
-    int height;
-    float pixelRatio;
-    const char *name;
-    const char *presets;
-    const char *profile;
-    const char *submodule;
-  } AddonProps_Visualization;
-
-  typedef struct AddonToKodiFuncTable_Visualization /* internal */
-  {
-    KODI_HANDLE kodiInstance;
-  } AddonToKodiFuncTable_Visualization;
-
-  typedef struct KodiToAddonFuncTable_Visualization /* internal */
-  {
-    void (__cdecl* Start)(int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName);
-    void (__cdecl* Stop)();
-    void (__cdecl* AudioData)(const float* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength);
-    void (__cdecl* Render) ();
-    void (__cdecl* GetInfo)(VIS_INFO *info);
-    bool (__cdecl* OnAction)(long flags, const void *param);
-    int (__cdecl* HasPresets)();
-    unsigned int (__cdecl *GetPresets)(char ***presets);
-    unsigned int (__cdecl *GetPreset)();
-    unsigned int (__cdecl *GetSubModules)(char ***modules);
-    bool (__cdecl* IsLocked)();
-  } KodiToAddonFuncTable_Visualization;
-
-  typedef struct AddonInstance_Visualization /* internal */
-  {
-    AddonProps_Visualization props;
-    AddonToKodiFuncTable_Visualization toKodi;
-    KodiToAddonFuncTable_Visualization toAddon;
-  } AddonInstance_Visualization;
-}
-
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
index a769788..77d796e 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
@@ -30,7 +30,7 @@ struct DemuxCryptoInfo;
 
 typedef struct DemuxPacket
 {
-  DemuxPacket() {};
+  DemuxPacket() = default;
 
   DemuxPacket(unsigned char *pData, int const iSize, double const pts, double const dts)
     : pData(pData)
diff --git a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxCrypto.h b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxCrypto.h
index 522def6..59d5fdf 100644
--- a/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxCrypto.h
+++ b/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxCrypto.h
@@ -1,81 +1,85 @@
-/*

-*      Copyright (C) 2005-2016 Team XBMC

-*      http://xbmc.org

-*

-*  This Program is free software; you can redistribute it and/or modify

-*  it under the terms of the GNU General Public License as published by

-*  the Free Software Foundation; either version 2, or (at your option)

-*  any later version.

-*

-*  This Program is distributed in the hope that it will be useful,

-*  but WITHOUT ANY WARRANTY; without even the implied warranty of

-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-*  GNU General Public License for more details.

-*

-*  You should have received a copy of the GNU General Public License

-*  along with XBMC; see the file COPYING.  If not, see

-*  <http://www.gnu.org/licenses/>.

-*

-*/

-

-#pragma once

-

-#include <inttypes.h>

-#include <string.h>

-

-//CryptoSession is usually obtained once per stream, but could change if an key expires

-

-enum CryptoSessionSystem :uint16_t

-{

-  CRYPTO_SESSION_SYSTEM_NONE,

-  CRYPTO_SESSION_SYSTEM_WIDEVINE,

-  CRYPTO_SESSION_SYSTEM_PLAYREADY

-};

-

-struct DemuxCryptoSession

-{

-  DemuxCryptoSession(const CryptoSessionSystem sys, const uint16_t sSize, const char *sData)

-    : sessionId(new char[sSize])

-    , sessionIdSize(sSize)

-    , keySystem(sys)

-  {

-    memcpy(sessionId, sData, sSize);

-  };

-

-  ~DemuxCryptoSession()

-  {

-    delete[] sessionId;

-  }

-

-  // encryped stream infos

-  char * sessionId;

-  uint16_t sessionIdSize;

-  CryptoSessionSystem keySystem;

-};

-

-//CryptoInfo stores the information to decrypt a sample

-

-struct DemuxCryptoInfo

-{

-  DemuxCryptoInfo(const unsigned int numSubs)

-    : numSubSamples(numSubs)

-    , flags(0)

-    , clearBytes(new uint16_t[numSubs])

-    , cipherBytes(new uint32_t[numSubs])

-  {};

-  

-  ~DemuxCryptoInfo()

-  {

-    delete[] clearBytes;

-    delete[] cipherBytes;

-  }

-

-  uint16_t numSubSamples; //number of subsamples

-  uint16_t flags; //flags for later use

-

-  uint16_t *clearBytes; // numSubSamples uint16_t's wich define the size of clear size of a subsample

-  uint32_t *cipherBytes; // numSubSamples uint32_t's wich define the size of cipher size of a subsample

-

-  uint8_t iv[16]; // initialization vector

-  uint8_t kid[16]; // key id

-};

+/*
+*      Copyright (C) 2005-2016 Team XBMC
+*      http://xbmc.org
+*
+*  This Program is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*
+*  This Program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with XBMC; see the file COPYING.  If not, see
+*  <http://www.gnu.org/licenses/>.
+*
+*/
+
+#pragma once
+
+#include <inttypes.h>
+#include <string.h>
+
+//CryptoSession is usually obtained once per stream, but could change if an key expires
+
+enum CryptoSessionSystem :uint8_t
+{
+  CRYPTO_SESSION_SYSTEM_NONE,
+  CRYPTO_SESSION_SYSTEM_WIDEVINE,
+  CRYPTO_SESSION_SYSTEM_PLAYREADY
+};
+
+struct DemuxCryptoSession
+{
+  DemuxCryptoSession(const CryptoSessionSystem sys, const uint16_t sSize, const char *sData, const uint8_t flags)
+    : sessionId(new char[sSize])
+    , sessionIdSize(sSize)
+    , keySystem(sys)
+    , flags(flags)
+  {
+    memcpy(sessionId, sData, sSize);
+  };
+
+  ~DemuxCryptoSession()
+  {
+    delete[] sessionId;
+  }
+
+  // encryped stream infos
+  char * sessionId;
+  uint16_t sessionIdSize;
+  CryptoSessionSystem keySystem;
+
+  static const uint8_t FLAG_SECURE_DECODER = 1;
+  uint8_t flags;
+};
+
+//CryptoInfo stores the information to decrypt a sample
+
+struct DemuxCryptoInfo
+{
+  DemuxCryptoInfo(const unsigned int numSubs)
+    : numSubSamples(numSubs)
+    , flags(0)
+    , clearBytes(new uint16_t[numSubs])
+    , cipherBytes(new uint32_t[numSubs])
+  {};
+
+  ~DemuxCryptoInfo()
+  {
+    delete[] clearBytes;
+    delete[] cipherBytes;
+  }
+
+  uint16_t numSubSamples; //number of subsamples
+  uint16_t flags; //flags for later use
+
+  uint16_t *clearBytes; // numSubSamples uint16_t's wich define the size of clear size of a subsample
+  uint32_t *cipherBytes; // numSubSamples uint32_t's wich define the size of cipher size of a subsample
+
+  uint8_t iv[16]; // initialization vector
+  uint8_t kid[16]; // key id
+};
diff --git a/xbmc/input/ActionIDs.h b/xbmc/input/ActionIDs.h
index ce77ce0..14b8927 100644
--- a/xbmc/input/ActionIDs.h
+++ b/xbmc/input/ActionIDs.h
@@ -272,6 +272,8 @@
 #define ACTION_VOLUME_SET             245
 #define ACTION_TOGGLE_COMMSKIP        246
 
+#define ACTION_PLAYER_RESET           248 //!< Send a reset command to the active game
+
 // Voice actions
 #define ACTION_VOICE_RECOGNIZE        300