aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Haupt <haupt.wolfgang@gmail.com>2018-04-17 23:50:49 -0700
committerLukas Rusak <lorusak@gmail.com>2018-04-18 09:43:05 -0700
commita1bb80111b3a43e8dac75a5035a41b0b4622e1eb (patch)
treee38ce83fa4541da4f21f1f4727cc8d79988ea052
parent479732f10334c082a1253f15814435c6a8ca9534 (diff)
handle limit color setting per platform
Remove the limited color setting from the generic settings.xml and add it to the platforms that support limited range. Create missing platform xml's for x11 and wayland.
-rw-r--r--cmake/platform/linux/wayland.cmake1
-rw-r--r--cmake/platform/linux/x11.cmake1
-rw-r--r--system/settings/gbm.xml11
-rwxr-xr-xsystem/settings/settings.xml8
-rw-r--r--system/settings/wayland.xml14
-rw-r--r--system/settings/windows.xml9
-rw-r--r--system/settings/x11.xml17
7 files changed, 53 insertions, 8 deletions
diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake
index f42dbf5e93..7ecc6a34df 100644
--- a/cmake/platform/linux/wayland.cmake
+++ b/cmake/platform/linux/wayland.cmake
@@ -15,5 +15,6 @@ endif()
set(PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-extra-protocols)
set(WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}")
+list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=wayland.xml)
# for wayland-extra-protocols.hpp
include_directories("${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}")
diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake
index 09cebde3db..72d9640766 100644
--- a/cmake/platform/linux/x11.cmake
+++ b/cmake/platform/linux/x11.cmake
@@ -1,3 +1,4 @@
set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM)
set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX)
set(APP_RENDER_SYSTEM gl)
+list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=x11.xml) \ No newline at end of file
diff --git a/system/settings/gbm.xml b/system/settings/gbm.xml
index a46768c11d..66a4b44482 100644
--- a/system/settings/gbm.xml
+++ b/system/settings/gbm.xml
@@ -11,4 +11,15 @@
</group>
</category>
</section>
+ <section id="system">
+ <category id="display">
+ <group id="1">
+ <setting id="videoscreen.limitedrange" type="boolean" label="36042" help="36359">
+ <level>3</level>
+ <default>false</default>
+ <control type="toggle" />
+ </setting>
+ </group>
+ </category>
+ </section>
</settings>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index f818cb5b95..c788d2e6c3 100755
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -2063,14 +2063,6 @@
</constraints>
<control type="spinner" format="string" />
</setting>
- <setting id="videoscreen.limitedrange" type="boolean" label="36042" help="36359">
- <level>3</level>
- <default>false</default>
- <updates>
- <update type="rename">videoplayer.vdpaustudiolevel</update>
- </updates>
- <control type="toggle" />
- </setting>
<setting id="videoscreen.dither" type="boolean" label="36099" help="36598">
<requirement>
<or>
diff --git a/system/settings/wayland.xml b/system/settings/wayland.xml
new file mode 100644
index 0000000000..2e214fc5ea
--- /dev/null
+++ b/system/settings/wayland.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<settings version="1">
+ <section id="system">
+ <category id="display">
+ <group id="1">
+ <setting id="videoscreen.limitedrange" type="boolean" label="36042" help="36359">
+ <level>3</level>
+ <default>false</default>
+ <control type="toggle" />
+ </setting>
+ </group>
+ </category>
+ </section>
+</settings> \ No newline at end of file
diff --git a/system/settings/windows.xml b/system/settings/windows.xml
index 699fa9a0ee..095a627db2 100644
--- a/system/settings/windows.xml
+++ b/system/settings/windows.xml
@@ -43,6 +43,15 @@
</setting>
</group>
</category>
+ <category id="display">
+ <group id="1">
+ <setting id="videoscreen.limitedrange" type="boolean" label="36042" help="36359">
+ <level>3</level>
+ <default>false</default>
+ <control type="toggle" />
+ </setting>
+ </group>
+ </category>
</section>
<section id="interface">
<category id="regional">
diff --git a/system/settings/x11.xml b/system/settings/x11.xml
new file mode 100644
index 0000000000..ae0c493047
--- /dev/null
+++ b/system/settings/x11.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<settings version="1">
+ <section id="system">
+ <category id="display">
+ <group id="1">
+ <setting id="videoscreen.limitedrange" type="boolean" label="36042" help="36359">
+ <level>3</level>
+ <default>false</default>
+ <updates>
+ <update type="rename">videoplayer.vdpaustudiolevel</update>
+ </updates>
+ <control type="toggle" />
+ </setting>
+ </group>
+ </category>
+ </section>
+</settings>