10 files changed, 51 insertions, 32 deletions

diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
index 03b3752..d58aa3c 100644
--- a/project/cmake/CMakeLists.txt
+++ b/project/cmake/CMakeLists.txt
@@ -280,6 +280,7 @@ core_link_library(XBMC_codec addons/library.xbmc.codec/libXBMC_codec)
 core_link_library(KODI_guilib addons/library.kodi.guilib/libKODI_guilib)
 core_link_library(KODI_adsp addons/library.kodi.adsp/libKODI_adsp)
 core_link_library(XBMC_pvr   addons/library.xbmc.pvr/libXBMC_pvr)
+core_link_library(KODI_peripheral addons/library.kodi.peripheral/libKODI_peripheral)
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/system/players/VideoPlayer)
 add_custom_target(wrap-libraries ALL DEPENDS ${WRAP_FILES})
diff --git a/project/cmake/addons/addons/pvr.dvbviewer/platforms.txt b/project/cmake/addons/addons/pvr.dvbviewer/platforms.txt
index 0702cb5..baa6044 100644
--- a/project/cmake/addons/addons/pvr.dvbviewer/platforms.txt
+++ b/project/cmake/addons/addons/pvr.dvbviewer/platforms.txt
@@ -1 +1 @@
-all
+all
\ No newline at end of file
diff --git a/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt b/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
index 0924150..db25aa2 100644
--- a/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
+++ b/project/cmake/addons/addons/pvr.dvbviewer/pvr.dvbviewer.txt
@@ -1 +1 @@
-pvr.dvbviewer https://github.com/manuelm/pvr.dvbviewer 
\ No newline at end of file
+pvr.dvbviewer https://github.com/manuelm/pvr.dvbviewer master
\ No newline at end of file
diff --git a/project/cmake/installdata/addon-bindings.txt b/project/cmake/installdata/addon-bindings.txt
index 9bebac6..61d2bc1 100644
--- a/project/cmake/installdata/addon-bindings.txt
+++ b/project/cmake/installdata/addon-bindings.txt
@@ -13,20 +13,21 @@ xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_callbacks.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_dll.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_types.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_utils.hpp
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h
-xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_stream_utils.hpp
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
+xbmc/addons/kodi-addon-dev-kit-include/kodi/libKODI_peripheral.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h
-xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h
-xbmc/cores/AudioEngine/Utils/AEChannelData.h
-xbmc/filesystem/IFileTypes.h
diff --git a/project/cmake/treedata/android/subdirs.txt b/project/cmake/treedata/android/subdirs.txt
index 1c75fa6..599017c 100644
--- a/project/cmake/treedata/android/subdirs.txt
+++ b/project/cmake/treedata/android/subdirs.txt
@@ -3,6 +3,7 @@ xbmc/input/touch                        input/touch
 xbmc/input/touch/generic                input/touch/generic
 xbmc/network/linux                      network/linux
 xbmc/peripherals/bus/linux              peripherals/bus/linux
+xbmc/peripherals/bus/android            peripherals/bus/android
 xbmc/powermanagement/android            powermanagement/android
 xbmc/storage/android                    storage/android
 xbmc/filesystem/posix                   filesystem/posix
diff --git a/project/cmake/treedata/common/addons.txt b/project/cmake/treedata/common/addons.txt
index 29b7990..76410b7 100644
--- a/project/cmake/treedata/common/addons.txt
+++ b/project/cmake/treedata/common/addons.txt
@@ -2,6 +2,7 @@ lib/addons/library.kodi.adsp        KODI_adsp
 lib/addons/library.kodi.audioengine KODI_audioengine
 lib/addons/library.kodi.guilib      KODI_guilib
 lib/addons/library.kodi.inputstream KODI_inputstream
+lib/addons/library.kodi.peripheral  KODI_peripheral
 lib/addons/library.xbmc.addon       XBMC_addon
 lib/addons/library.xbmc.codec       XBMC_codec
 lib/addons/library.xbmc.pvr         XBMC_pvr
diff --git a/project/cmake/treedata/common/games.txt b/project/cmake/treedata/common/games.txt
new file mode 100644
index 0000000..e4e8b89
--- /dev/null
+++ b/project/cmake/treedata/common/games.txt
@@ -0,0 +1,3 @@
+xbmc/games/controllers             games/controllers
+xbmc/games/controllers/guicontrols games/controllers/guicontrols
+xbmc/games/controllers/windows     games/controllers/windows
diff --git a/project/cmake/treedata/common/peripherals.txt b/project/cmake/treedata/common/peripherals.txt
index e6d9283..903b537 100644
--- a/project/cmake/treedata/common/peripherals.txt
+++ b/project/cmake/treedata/common/peripherals.txt
@@ -1,4 +1,6 @@
 xbmc/peripherals                peripherals
+xbmc/peripherals/addons         peripherals/addons
 xbmc/peripherals/bus            peripherals/bus
+xbmc/peripherals/bus/virtual    peripherals/bus/virtual
 xbmc/peripherals/devices        peripherals/devices
 xbmc/peripherals/dialogs        peripherals/dialogs
diff --git a/project/cmake/treedata/common/subdirs.txt b/project/cmake/treedata/common/subdirs.txt
index 762547e..c2828e0 100644
--- a/project/cmake/treedata/common/subdirs.txt
+++ b/project/cmake/treedata/common/subdirs.txt
@@ -1,25 +1,36 @@
-xbmc                            xbmc
-xbmc/addons                     addons
-xbmc/commons                    commons
-xbmc/cdrip                      cdrip
-xbmc/dbwrappers                 dbwrappers
-xbmc/dialogs                    dialogs
-xbmc/epg                        epg
-xbmc/guilib                     guilib
-xbmc/input                      input
-xbmc/listproviders              listproviders
-xbmc/media                      media
-xbmc/messaging                  messaging
-xbmc/messaging/helpers          messagingHelpers
-xbmc/pictures                   pictures
-xbmc/platform                   platform
-xbmc/playlists                  playlists
-xbmc/powermanagement            powermanagement
-xbmc/programs                   programs
-xbmc/rendering                  rendering
-xbmc/storage                    storage
-xbmc/threads                    threads
-xbmc/utils                      utils
-xbmc/view                       view
-xbmc/windowing                  windowing
-xbmc/windows                    windows
+xbmc                                            xbmc
+xbmc/addons                                     addons
+xbmc/addons/binary/interfaces                   addonsBinaryInterfaces
+xbmc/addons/binary/interfaces/api1/Addon        api1AddonCallbacks_Addon
+xbmc/addons/binary/interfaces/api1/AudioDSP     api1AddonCallbacks_AudioDSP
+xbmc/addons/binary/interfaces/api1/AudioEngine  api1AddonCallbacks_AudioEngine
+xbmc/addons/binary/interfaces/api1/Codec        api1AddonCallbacks_Codec
+xbmc/addons/binary/interfaces/api1/GUI          api1AddonCallbacks_GUI
+xbmc/addons/binary/interfaces/api1/InputStream  api1AddonCallbacks_InputStream
+xbmc/addons/binary/interfaces/api1/Peripheral   api1AddonCallbacks_Peripheral
+xbmc/addons/binary/interfaces/api1/PVR          api1AddonCallbacks_PVR
+xbmc/commons                                    commons
+xbmc/cdrip                                      cdrip
+xbmc/dbwrappers                                 dbwrappers
+xbmc/dialogs                                    dialogs
+xbmc/epg                                        epg
+xbmc/guilib                                     guilib
+xbmc/input                                      input
+xbmc/input/joysticks                            input/joysticks
+xbmc/input/joysticks/generic                    input/joysticks/generic
+xbmc/listproviders                              listproviders
+xbmc/media                                      media
+xbmc/messaging                                  messaging
+xbmc/messaging/helpers                          messagingHelpers
+xbmc/pictures                                   pictures
+xbmc/platform                                   platform
+xbmc/playlists                                  playlists
+xbmc/powermanagement                            powermanagement
+xbmc/programs                                   programs
+xbmc/rendering                                  rendering
+xbmc/storage                                    storage
+xbmc/threads                                    threads
+xbmc/utils                                      utils
+xbmc/view                                       view
+xbmc/windowing                                  windowing
+xbmc/windows                                    windows
diff --git a/project/cmake/treedata/optional/common/cec.txt b/project/cmake/treedata/optional/common/cec.txt
deleted file mode 100644
index 19cd7f7..0000000
--- a/project/cmake/treedata/optional/common/cec.txt
+++ /dev/null
@@ -1 +0,0 @@
-xbmc/peripherals/bus/virtual peripherals/bus/virtual # CEC