sync with upstream

6 files changed, 8 insertions, 6 deletions

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