system/settings: merge x11.xml wayland.xml and gbm.xml into linux.xml

4 files changed, 73 insertions, 163 deletions

diff --git a/system/settings/gbm.xml b/system/settings/gbm.xml
deleted file mode 100644
index 02b819fe05..0000000000
--- a/system/settings/gbm.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<settings version="1">
-  <section id="player">
-    <category id="videoplayer">
-       <group id="2">
-        <setting id="videoplayer.usedisplayasclock">
-          <visible>false</visible>
-          <default>false</default>
-        </setting>
-      </group>
-      <group id="3">
-        <setting id="videoplayer.useprimedecoder" type="boolean" label="13430" help="36172">
-          <visible>false</visible>
-          <level>2</level>
-          <default>true</default>
-          <control type="toggle" />
-        </setting>
-        <setting id="videoplayer.useprimedecoderforhw" type="boolean" parent="videoplayer.useprimedecoder" label="13438" help="36172">
-          <visible>true</visible>
-          <dependencies>
-            <dependency type="enable">
-              <condition setting="videoplayer.useprimedecoder" operator="is">true</condition>
-            </dependency>
-          </dependencies>
-          <level>3</level>
-          <default>true</default>
-          <control type="toggle" />
-        </setting>
-        <setting id="videoplayer.useprimerenderer" type="integer" label="13462" help="13463">
-          <visible>false</visible>
-          <level>2</level>
-          <default>0</default>
-          <constraints>
-            <options>
-              <option label="13464">0</option> <!-- DIRECT -->
-              <option label="13465">1</option> <!-- GLES -->
-            </options>
-          </constraints>
-          <control type="spinner" format="string" />
-        </setting>
-      </group>
-    </category>
-  </section>
-  <section id="system">
-    <category id="display">
-      <group id="1">
-        <setting id="videoscreen.screen">
-          <visible>false</visible>
-        </setting>
-        <setting id="videoscreen.hwscalingfilter" type="boolean" label="39151" help="39152">
-          <visible>false</visible>
-          <level>3</level>
-          <default>true</default>
-          <control type="toggle" />
-        </setting>
-        <setting id="videoscreen.limitguisize" type="integer" label="37021" help="36548">
-          <visible>false</visible>
-          <level>3</level>
-          <default>0</default>
-          <constraints>
-            <options>
-              <option label="37030">0</option> <!-- Unlimited -->
-              <option label="37028">1</option> <!-- 720 -->
-              <option label="13466">2</option> <!-- 1080 / 720 (>30Hz) -->
-              <option label="37046">3</option> <!-- 1080 -->
-              <option label="13467">4</option> <!-- Unlimited / 1080 (>30Hz) -->
-            </options>
-          </constraints>
-          <control type="list" format="string" />
-        </setting>
-        <setting id="videoscreen.limitedrange" type="boolean" label="36042" help="36359">
-          <level>3</level>
-          <default>false</default>
-          <control type="toggle" />
-        </setting>
-      </group>
-    </category>
-    <category id="input">
-      <group id="4" label="35150">
-        <setting id="input.libinputkeyboardlayout" type="string" label="310" help="36436">
-          <level>0</level>
-          <default>us</default>
-          <visible>true</visible>
-          <constraints>
-            <options>libinputkeyboardlayout</options>
-          </constraints>
-          <control type="list" format="string">
-            <multiselect>false</multiselect>
-          </control>
-        </setting>
-      </group>
-    </category>
-  </section>
-</settings>
diff --git a/system/settings/linux.xml b/system/settings/linux.xml
index 801be4848c..6d1fb9cd49 100644
--- a/system/settings/linux.xml
+++ b/system/settings/linux.xml
@@ -149,6 +149,38 @@
           <default>true</default>
           <control type="toggle" />
         </setting>
+        <setting id="videoplayer.useprimedecoder" type="boolean" label="13430" help="36172">
+          <requirement>HAS_GLES</requirement>
+          <visible>false</visible>
+          <level>2</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
+        <setting id="videoplayer.useprimedecoderforhw" type="boolean" parent="videoplayer.useprimedecoder" label="13438" help="36172">
+          <requirement>HAS_GLES</requirement>
+          <visible>false</visible>
+          <dependencies>
+            <dependency type="enable">
+              <condition setting="videoplayer.useprimedecoder" operator="is">true</condition>
+            </dependency>
+          </dependencies>
+          <level>3</level>
+          <default>true</default>
+          <control type="toggle" />
+        </setting>
+        <setting id="videoplayer.useprimerenderer" type="integer" label="13462" help="13463">
+          <requirement>HAS_GLES</requirement>
+          <visible>false</visible>
+          <level>2</level>
+          <default>1</default>
+          <constraints>
+            <options>
+              <option label="13464">0</option> <!-- DIRECT -->
+              <option label="13465">1</option> <!-- GLES -->
+            </options>
+          </constraints>
+          <control type="spinner" format="string" />
+        </setting>
       </group>
     </category>
   </section>
@@ -158,6 +190,47 @@
         <setting id="videoscreen.fakefullscreen">
           <visible>false</visible>
         </setting>
+        <setting id="videoscreen.hwscalingfilter" type="boolean" label="39151" help="39152">
+          <visible>false</visible>
+          <level>3</level>
+          <default>true</default>
+          <control type="toggle" />
+        </setting>
+        <setting id="videoscreen.limitguisize" type="integer" label="37021" help="36548">
+          <visible>false</visible>
+          <level>3</level>
+          <default>0</default>
+          <constraints>
+            <options>
+              <option label="37030">0</option> <!-- Unlimited -->
+              <option label="37028">1</option> <!-- 720 -->
+              <option label="13466">2</option> <!-- 1080 / 720 (>30Hz) -->
+              <option label="37046">3</option> <!-- 1080 -->
+              <option label="13467">4</option> <!-- Unlimited / 1080 (>30Hz) -->
+            </options>
+          </constraints>
+          <control type="list" format="string" />
+        </setting>
+        <setting id="videoscreen.limitedrange" type="boolean" label="36042" help="36359">
+          <level>3</level>
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
+      </group>
+    </category>
+    <category id="input">
+      <group id="4" label="35150">
+        <setting id="input.libinputkeyboardlayout" type="string" label="310" help="36436">
+          <level>0</level>
+          <default>us</default>
+          <visible>false</visible>
+          <constraints>
+            <options>libinputkeyboardlayout</options>
+          </constraints>
+          <control type="list" format="string">
+            <multiselect>false</multiselect>
+          </control>
+        </setting>
       </group>
     </category>
   </section>
diff --git a/system/settings/wayland.xml b/system/settings/wayland.xml
deleted file mode 100644
index 6fcc42ad48..0000000000
--- a/system/settings/wayland.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<settings version="1">
-  <section id="player">
-    <category id="videoplayer">
-      <group id="3">
-        <setting id="videoplayer.useprimedecoder" type="boolean" label="13430" help="36172">
-          <requirement>HAS_GLES</requirement>
-          <visible>false</visible>
-          <level>2</level>
-          <default>false</default>
-          <control type="toggle" />
-        </setting>
-        <setting id="videoplayer.useprimedecoderforhw" type="boolean" parent="videoplayer.useprimedecoder" label="13438" help="36172">
-          <requirement>HAS_GLES</requirement>
-          <visible>true</visible>
-          <dependencies>
-            <dependency type="enable">
-              <condition setting="videoplayer.useprimedecoder" operator="is">true</condition>
-            </dependency>
-          </dependencies>
-          <level>3</level>
-          <default>true</default>
-          <control type="toggle" />
-        </setting>
-        <setting id="videoplayer.useprimerenderer" type="integer" label="13462" help="13463">
-          <requirement>HAS_GLES</requirement>
-          <visible>false</visible>
-          <level>2</level>
-          <default>1</default>
-          <constraints>
-            <options>
-              <option label="13464">0</option> <!-- DIRECT -->
-              <option label="13465">1</option> <!-- GLES -->
-            </options>
-          </constraints>
-          <control type="spinner" format="string" />
-        </setting>
-      </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/x11.xml b/system/settings/x11.xml
deleted file mode 100644
index ae0c493047..0000000000
--- a/system/settings/x11.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>