aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMarkus Pfau <pfau@peak3d.de>2019-03-19 15:42:12 +0100
committerGitHub <noreply@github.com>2019-03-19 15:42:12 +0100
commit76db73d1020c91378572fc4fb2b627b71293ea0b (patch)
tree486513c9c03eeb73d0166f3d2048c0696427378e /cmake
parente0e175332363397141810a8784e0b81613c8b76d (diff)
parent21912bb37d22edef271b8969d08380f43f9c1911 (diff)
Merge pull request #15744 from peak3d/hwdecoder
Decoderfilter implementation
Diffstat (limited to 'cmake')
-rw-r--r--cmake/treedata/android/subdirs.txt38
-rw-r--r--cmake/treedata/common/drm.txt1
-rw-r--r--cmake/treedata/common/media.txt2
-rw-r--r--cmake/treedata/common/subdirs.txt1
4 files changed, 22 insertions, 20 deletions
diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt
index 9c4232caff..53a04f04be 100644
--- a/cmake/treedata/android/subdirs.txt
+++ b/cmake/treedata/android/subdirs.txt
@@ -1,18 +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/VideoPlayer/Process/android/ cores/VideoPlayer/Process/android/
+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/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/media/drm platform/android/media/drm
+xbmc/platform/android/media/decoderfilter platform/android/media/decoderfilter
+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
diff --git a/cmake/treedata/common/drm.txt b/cmake/treedata/common/drm.txt
deleted file mode 100644
index fbcc906b9b..0000000000
--- a/cmake/treedata/common/drm.txt
+++ /dev/null
@@ -1 +0,0 @@
-xbmc/drm drm
diff --git a/cmake/treedata/common/media.txt b/cmake/treedata/common/media.txt
new file mode 100644
index 0000000000..519fece955
--- /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 4a5f3a8434..083e8ef314 100644
--- a/cmake/treedata/common/subdirs.txt
+++ b/cmake/treedata/common/subdirs.txt
@@ -30,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