sync with upstream

17 files changed, 76 insertions, 74 deletions

diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt
index 036fd24..335c331 100644
--- a/cmake/treedata/android/subdirs.txt
+++ b/cmake/treedata/android/subdirs.txt
@@ -1,17 +1,20 @@
-xbmc/cores/RetroPlayer/process/android  cores/RetroPlayer/process/android
-xbmc/input/touch                        input/touch
-xbmc/input/touch/generic                input/touch/generic
-xbmc/windowing/android                  windowing/android
-xbmc/platform/posix                     platform/posix
-xbmc/platform/posix/filesystem          platform/posix/filesystem
-xbmc/platform/posix/utils               platform/posix/utils
-xbmc/platform/linux                     platform/linux
-xbmc/platform/linux/peripherals         platform/linux/peripherals
-xbmc/platform/android/activity          platform/android/activity
-xbmc/platform/android/bionic_supplement platform/android/bionicsupplement
-xbmc/platform/android/drm               platform/android/drm
-xbmc/platform/android/filesystem        platform/android/filesystem
-xbmc/platform/android/network           platform/android/network
-xbmc/platform/android/peripherals       platform/android/peripherals
-xbmc/platform/android/powermanagement   platform/android/powermanagement
-xbmc/platform/android/storage           platform/android/storage
+xbmc/cores/RetroPlayer/process/android      cores/RetroPlayer/process/android
+xbmc/cores/VideoPlayer/Process/android      cores/VideoPlayer/Process/android
+xbmc/input/touch                            input/touch
+xbmc/input/touch/generic                    input/touch/generic
+xbmc/media/decoderfilter                    media/decoderfilter
+xbmc/platform/android/activity              platform/android/activity
+xbmc/platform/android/bionic_supplement     platform/android/bionicsupplement
+xbmc/platform/android/filesystem            platform/android/filesystem
+xbmc/platform/android/media/decoderfilter   platform/android/media/decoderfilter
+xbmc/platform/android/media/drm             platform/android/media/drm
+xbmc/platform/android/network               platform/android/network
+xbmc/platform/android/peripherals           platform/android/peripherals
+xbmc/platform/android/powermanagement       platform/android/powermanagement
+xbmc/platform/android/storage               platform/android/storage
+xbmc/platform/linux                         platform/linux
+xbmc/platform/linux/peripherals             platform/linux/peripherals
+xbmc/platform/posix                         platform/posix
+xbmc/platform/posix/filesystem              platform/posix/filesystem
+xbmc/platform/posix/utils                   platform/posix/utils
+xbmc/windowing/android                      windowing/android
diff --git a/cmake/treedata/common/drm.txt b/cmake/treedata/common/drm.txt
deleted file mode 100644
index fbcc906..0000000
--- a/cmake/treedata/common/drm.txt
+++ /dev/null
@@ -1 +0,0 @@
-xbmc/drm drm
diff --git a/cmake/treedata/common/filesystem.txt b/cmake/treedata/common/filesystem.txt
index 1c49a74..37a2536 100644
--- a/cmake/treedata/common/filesystem.txt
+++ b/cmake/treedata/common/filesystem.txt
@@ -1,3 +1,3 @@
 xbmc/filesystem                         filesystem
-xbmc/filesystem/VideoDatabaseDirectory  filesystem/videodatabase
 xbmc/filesystem/MusicDatabaseDirectory  filesystem/musicdatabase
+xbmc/filesystem/VideoDatabaseDirectory  filesystem/videodatabase
diff --git a/cmake/treedata/common/media.txt b/cmake/treedata/common/media.txt
new file mode 100644
index 0000000..519fece
--- /dev/null
+++ b/cmake/treedata/common/media.txt
@@ -0,0 +1,2 @@
+xbmc/media                                      media
+xbmc/media/drm                                  drm
diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt
index 368f473..083e8ef 100644
--- a/cmake/treedata/common/subdirs.txt
+++ b/cmake/treedata/common/subdirs.txt
@@ -20,6 +20,7 @@ xbmc/favourites                                 favourites
 xbmc/guilib                                     guilib
 xbmc/guilib/guiinfo                             guilib_guiinfo
 xbmc/input                                      input
+xbmc/input/actions                              input/actions
 xbmc/input/joysticks                            input/joysticks
 xbmc/input/joysticks/dialogs                    input/joysticks/dialogs
 xbmc/input/joysticks/generic                    input/joysticks/generic
@@ -29,7 +30,6 @@ xbmc/input/keyboard/generic                     input/keyboard/generic
 xbmc/input/mouse                                input/mouse
 xbmc/input/mouse/generic                        input/mouse/generic
 xbmc/listproviders                              listproviders
-xbmc/media                                      media
 xbmc/messaging                                  messaging
 xbmc/messaging/helpers                          messagingHelpers
 xbmc/pictures                                   pictures
diff --git a/cmake/treedata/common/tests.txt b/cmake/treedata/common/tests.txt
index 358bc4d..415eae6 100644
--- a/cmake/treedata/common/tests.txt
+++ b/cmake/treedata/common/tests.txt
@@ -1,10 +1,11 @@
-xbmc/test                         test
 xbmc/addons/test                  test/addons
+xbmc/cores/AudioEngine/Sinks/test test/audioengine_sinks
 xbmc/filesystem/test              test/filesystem
 xbmc/interfaces/python/test       test/python
 xbmc/music/tags/test              test/music_tags
 xbmc/network/test                 test/network
+xbmc/playlists/test               test/playlists
+xbmc/test                         test
 xbmc/threads/test                 test/threads
 xbmc/utils/test                   test/utils
 xbmc/video/test                   test/video
-xbmc/cores/AudioEngine/Sinks/test test/audioengine_sinks
diff --git a/cmake/treedata/common/videoplayer.txt b/cmake/treedata/common/videoplayer.txt
index 8c8d45d..ce6a757 100644
--- a/cmake/treedata/common/videoplayer.txt
+++ b/cmake/treedata/common/videoplayer.txt
@@ -8,5 +8,5 @@ xbmc/cores/VideoPlayer/DVDInputStreams             cores/VideoPlayer/inputstream
 xbmc/cores/VideoPlayer/DVDSubtitles                cores/VideoPlayer/subtitles
 xbmc/cores/VideoPlayer/Process                     cores/VideoPlayer/process
 xbmc/cores/VideoPlayer/VideoRenderers              cores/VideoPlayer/videorenderers
-xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders cores/VideoPlayer/videorenderers/shaders
 xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender  cores/VideoPlayer/videorenderers/hwdec
+xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders cores/VideoPlayer/videorenderers/shaders
diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt
index e4edf23..fd8ed5f 100644
--- a/cmake/treedata/freebsd/subdirs.txt
+++ b/cmake/treedata/freebsd/subdirs.txt
@@ -1,6 +1,7 @@
-xbmc/platform/posix                 platform/posix
-xbmc/platform/posix/filesystem      platform/posix/filesystem
-xbmc/platform/posix/utils           platform/posix/utils
+xbmc/cores/RetroPlayer/process/rbpi cores/RetroPlayer/process/rbpi
+xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi
+xbmc/input/touch                    input/touch
+xbmc/input/touch/generic            input/touch/generic
 xbmc/platform/freebsd               platform/freebsd
 xbmc/platform/linux                 platform/linux
 xbmc/platform/linux/input           platform/linux/input
@@ -8,8 +9,7 @@ xbmc/platform/linux/network         platform/linux/network
 xbmc/platform/linux/peripherals     platform/linux/peripherals
 xbmc/platform/linux/powermanagement platform/linux/powermanagement
 xbmc/platform/linux/storage         platform/linux/storage
-xbmc/input/touch                    input/touch
-xbmc/input/touch/generic            input/touch/generic
-xbmc/cores/RetroPlayer/process/rbpi cores/RetroPlayer/process/rbpi
-xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi
+xbmc/platform/posix                 platform/posix
+xbmc/platform/posix/filesystem      platform/posix/filesystem
+xbmc/platform/posix/utils           platform/posix/utils
 xbmc/windowing/linux                windowing/linux
diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt
index a287418..a3a03be 100644
--- a/cmake/treedata/ios/subdirs.txt
+++ b/cmake/treedata/ios/subdirs.txt
@@ -1,17 +1,15 @@
-xbmc/platform/linux                   platform/linux
-xbmc/platform/linux/network           platform/linux/network
+xbmc/cores/RetroPlayer/process/ios    cores/RetroPlayer/process/ios
+xbmc/cores/VideoPlayer/Process/ios    cores/VideoPlayer/Process/ios
 xbmc/input/touch                      input/touch
 xbmc/input/touch/generic              input/touch/generic
-xbmc/platform/posix                   posix
-xbmc/platform/posix/filesystem        platform/posix/filesystem
-xbmc/platform/posix/utils             platform/posix/utils
 xbmc/platform/darwin                  platform/darwin
 xbmc/platform/darwin/ios              platform/ios
 xbmc/platform/darwin/ios-common       platform/ios-common
-xbmc/platform/darwin/osx/network      platform/osx/network
-xbmc/platform/darwin/osx/peripherals  platform/osx/peripherals
-xbmc/platform/darwin/osx/powermanagement platform/darwin/osx/powermanagement
-xbmc/platform/darwin/osx/storage      platform/osx/storage
-xbmc/windowing/osx                    windowing/osx
-xbmc/cores/RetroPlayer/process/ios    cores/RetroPlayer/process/ios
-xbmc/cores/VideoPlayer/Process/ios    cores/VideoPlayer/Process/ios
+xbmc/platform/darwin/network          platform/darwin/network
+xbmc/platform/darwin/storage          platform/storage
+xbmc/platform/linux                   platform/linux
+xbmc/platform/linux/network           platform/linux/network
+xbmc/platform/posix                   posix
+xbmc/platform/posix/filesystem        platform/posix/filesystem
+xbmc/platform/posix/utils             platform/posix/utils
+xbmc/windowing/ios                    windowing/ios
diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt
index 6e1d013..7619e2e 100644
--- a/cmake/treedata/linux/subdirs.txt
+++ b/cmake/treedata/linux/subdirs.txt
@@ -1,14 +1,14 @@
-xbmc/platform/posix                 platform/posix
-xbmc/platform/posix/filesystem      platform/posix/filesystem
-xbmc/platform/posix/utils           platform/posix/utils
+xbmc/cores/RetroPlayer/process/rbpi cores/RetroPlayer/process/rbpi
+xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi
+xbmc/input/touch                    input/touch
+xbmc/input/touch/generic            input/touch/generic
 xbmc/platform/linux                 platform/linux
 xbmc/platform/linux/input           platform/linux/input
 xbmc/platform/linux/network         platform/linux/network
 xbmc/platform/linux/peripherals     platform/linux/peripherals
 xbmc/platform/linux/powermanagement platform/linux/powermanagement
 xbmc/platform/linux/storage         platform/linux/storage
-xbmc/input/touch                    input/touch
-xbmc/input/touch/generic            input/touch/generic
-xbmc/cores/RetroPlayer/process/rbpi cores/RetroPlayer/process/rbpi
-xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi
+xbmc/platform/posix                 platform/posix
+xbmc/platform/posix/filesystem      platform/posix/filesystem
+xbmc/platform/posix/utils           platform/posix/utils
 xbmc/windowing/linux                windowing/linux
diff --git a/cmake/treedata/optional/common/X.txt b/cmake/treedata/optional/common/X.txt
index e66ad80..a250537 100644
--- a/cmake/treedata/optional/common/X.txt
+++ b/cmake/treedata/optional/common/X.txt
@@ -1,3 +1,3 @@
-xbmc/windowing/X11 windowing/X11 # X
 xbmc/cores/RetroPlayer/process/X11 cores/RetroPlayer/process/X11 # X
 xbmc/cores/VideoPlayer/Process/X11 cores/VideoPlayer/Process/X11 # X
+xbmc/windowing/X11 windowing/X11 # X
diff --git a/cmake/treedata/optional/common/aml.txt b/cmake/treedata/optional/common/aml.txt
index 3d412d0..09bf2db 100644
--- a/cmake/treedata/optional/common/aml.txt
+++ b/cmake/treedata/optional/common/aml.txt
@@ -1,3 +1,2 @@
 xbmc/cores/RetroPlayer/process/amlogic cores/RetroPlayer/process/amlogic # AML
 xbmc/windowing/amlogic windowing/amlogic # AML
-
diff --git a/cmake/treedata/optional/common/gbm.txt b/cmake/treedata/optional/common/gbm.txt
index 196b323..5d898d4 100644
--- a/cmake/treedata/optional/common/gbm.txt
+++ b/cmake/treedata/optional/common/gbm.txt
@@ -1,2 +1,2 @@
 xbmc/cores/RetroPlayer/process/gbm cores/RetroPlayer/process/gbm # GBM
-xbmc/windowing/gbm windowing/gbm # GBM
\ No newline at end of file
+xbmc/windowing/gbm windowing/gbm # GBM
diff --git a/cmake/treedata/optional/common/wayland.txt b/cmake/treedata/optional/common/wayland.txt
index 4664b35..f8f77a6 100644
--- a/cmake/treedata/optional/common/wayland.txt
+++ b/cmake/treedata/optional/common/wayland.txt
@@ -1,3 +1,3 @@
-xbmc/windowing/wayland windowing/wayland # WAYLANDPP
 xbmc/cores/RetroPlayer/process/wayland cores/RetroPlayer/process/wayland # WAYLANDPP
-xbmc/cores/VideoPlayer/Process/wayland cores/VideoPlayer/Process/wayland # WAYLANDPP
\ No newline at end of file
+xbmc/cores/VideoPlayer/Process/wayland cores/VideoPlayer/Process/wayland # WAYLANDPP
+xbmc/windowing/wayland windowing/wayland # WAYLANDPP
diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt
index 166a966..943c366 100644
--- a/cmake/treedata/osx/subdirs.txt
+++ b/cmake/treedata/osx/subdirs.txt
@@ -1,14 +1,14 @@
-xbmc/platform/posix                   posix
-xbmc/platform/posix/filesystem        platform/posix/filesystem
-xbmc/platform/posix/utils             platform/posix/utils
-xbmc/platform/linux                   platform/linux
-xbmc/platform/linux/network           platform/linux/network
+xbmc/cores/RetroPlayer/process/osx    cores/RetroPlayer/process/osx
+xbmc/cores/VideoPlayer/Process/osx    cores/VideoPlayer/Process/osx
 xbmc/platform/darwin                  platform/darwin
+xbmc/platform/darwin/network          platform/darwin/network
 xbmc/platform/darwin/osx              platform/osx
-xbmc/platform/darwin/osx/network      platform/osx/network
 xbmc/platform/darwin/osx/peripherals  platform/osx/peripherals
 xbmc/platform/darwin/osx/powermanagement platform/darwin/osx/powermanagement
-xbmc/platform/darwin/osx/storage      platform/osx/storage
+xbmc/platform/darwin/storage          platform/storage
+xbmc/platform/linux                   platform/linux
+xbmc/platform/linux/network           platform/linux/network
+xbmc/platform/posix                   posix
+xbmc/platform/posix/filesystem        platform/posix/filesystem
+xbmc/platform/posix/utils             platform/posix/utils
 xbmc/windowing/osx                    windowing/osx
-xbmc/cores/RetroPlayer/process/osx    cores/RetroPlayer/process/osx
-xbmc/cores/VideoPlayer/Process/osx    cores/VideoPlayer/Process/osx
diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt
index a2c8c29..0078758 100644
--- a/cmake/treedata/windows/subdirs.txt
+++ b/cmake/treedata/windows/subdirs.txt
@@ -1,17 +1,17 @@
+xbmc/cores/RetroPlayer/process/windows cores/RetroPlayer/process/windows
+xbmc/cores/RetroPlayer/rendering/VideoShaders/windows cores/RetroPlayer/rendering/VideoShaders/windows
+xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows
+xbmc/input/touch                       input/touch
+xbmc/input/touch/generic               input/touch/generic
+xbmc/network/mdns                      network/mdns
 xbmc/platform/win32                    platform/win32
-xbmc/platform/win32/input              platform/win32/input
 xbmc/platform/win32/filesystem         platform/win32/filesystem
+xbmc/platform/win32/input              platform/win32/input
 xbmc/platform/win32/network            platform/win32/network
 xbmc/platform/win32/peripherals        platform/win32/peripherals
 xbmc/platform/win32/powermanagement    platform/win32/powermanagement
 xbmc/platform/win32/storage            platform/win32/storage
 xbmc/platform/win32/utils              platform/win32/utils
-xbmc/input/touch                       input/touch
-xbmc/input/touch/generic               input/touch/generic
-xbmc/network/mdns                      network/mdns
 xbmc/rendering/dx                      rendering/dx
 xbmc/threads/platform/win              threads/win
 xbmc/windowing/windows                 windowing/windows
-xbmc/cores/RetroPlayer/process/windows cores/RetroPlayer/process/windows
-xbmc/cores/RetroPlayer/rendering/VideoShaders/windows cores/RetroPlayer/rendering/VideoShaders/windows
-xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows
diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt
index 604be08..0644fd2 100644
--- a/cmake/treedata/windowsstore/subdirs.txt
+++ b/cmake/treedata/windowsstore/subdirs.txt
@@ -1,3 +1,7 @@
+xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows
+xbmc/input/touch                       input/touch
+xbmc/input/touch/generic               input/touch/generic
+xbmc/network/mdns                      network/mdns
 xbmc/platform/win10                    platform/win10
 xbmc/platform/win10/filesystem         platform/win10/filesystem
 xbmc/platform/win10/network            platform/win10/network
@@ -6,10 +10,6 @@ xbmc/platform/win10/powermanagement    platfrom/win10/powermanagement
 xbmc/platform/win10/storage            platfrom/win10/storage
 xbmc/platform/win32/filesystem         platform/win32/filesystem
 xbmc/platform/win32/utils              platform/win32/utils
-xbmc/input/touch                       input/touch
-xbmc/input/touch/generic               input/touch/generic
-xbmc/network/mdns                      network/mdns
 xbmc/rendering/dx                      rendering/dx
 xbmc/threads/platform/win              threads/win
 xbmc/windowing/win10                   windowing/win10
-xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows