diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-07-30 13:51:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 13:51:46 +0200 |
| commit | fd19b14094b921966fb64eb0237331f8ea21b7cc (patch) | |
| tree | 179c1f186bb609f781aa2e9cf80002f0a3ccafe4 /system | |
| parent | 65e47fe13e5a095b9d1e9822cff68904892c0c88 (diff) | |
| parent | b4ea215570c5c97225963ea9a13151b45c9d6ed7 (diff) | |
Merge pull request #10184 from jjd-uk/cleanup
[cleanup] remove unused leftovers from settings removals
Diffstat (limited to 'system')
| -rw-r--r-- | system/settings/darwin_ios.xml | 2 | ||||
| -rw-r--r-- | system/settings/imx6.xml | 2 | ||||
| -rw-r--r-- | system/settings/rbp.xml | 2 | ||||
| -rw-r--r-- | system/settings/rbp2.xml | 2 | ||||
| -rw-r--r-- | system/settings/settings.xml | 17 |
5 files changed, 7 insertions, 18 deletions
diff --git a/system/settings/darwin_ios.xml b/system/settings/darwin_ios.xml index 09f07a9ff4..ea9c482e71 100644 --- a/system/settings/darwin_ios.xml +++ b/system/settings/darwin_ios.xml @@ -7,7 +7,7 @@ <visible>false</visible> </setting> </group> - <group id="4"> + <group id="3"> <setting id="videoplayer.hqscalers"> <visible>false</visible> </setting> diff --git a/system/settings/imx6.xml b/system/settings/imx6.xml index b8c90a5115..3af9b3f9d2 100644 --- a/system/settings/imx6.xml +++ b/system/settings/imx6.xml @@ -2,7 +2,7 @@ <settings> <section id="player"> <category id="videoplayer"> - <group id="4"> + <group id="3"> <setting id="videoplayer.limitguiupdate" type="integer" label="38013" help="38014"> <level>2</level> <default>10</default> diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml index 806eadf44d..c3238c00dd 100644 --- a/system/settings/rbp.xml +++ b/system/settings/rbp.xml @@ -2,7 +2,7 @@ <settings> <section id="player"> <category id="videoplayer"> - <group id="4"> + <group id="3"> <setting id="videoplayer.rendermethod"> <visible>false</visible> </setting> diff --git a/system/settings/rbp2.xml b/system/settings/rbp2.xml index a0f9b683d8..e87e32ef2e 100644 --- a/system/settings/rbp2.xml +++ b/system/settings/rbp2.xml @@ -2,7 +2,7 @@ <settings> <section id="player"> <category id="videoplayer"> - <group id="4"> + <group id="3"> <setting id="videoplayer.useomxplayer"> <default>false</default> </setting> diff --git a/system/settings/settings.xml b/system/settings/settings.xml index 91d57a254b..5d3bfc1e5d 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -78,18 +78,7 @@ <control type="list" format="string" /> </setting> </group> - <group id="3"> - <requirement> - <and> - <or> - <condition>HAS_GL</condition> - <condition>HAS_GLESv2</condition> - </or> - <condition>HAVE_LIBVDPAU</condition> - </and> - </requirement> - </group> - <group id="4" label="14231"> + <group id="3" label="14231"> <setting id="videoplayer.rendermethod" type="integer" label="13415" help="36153"> <level>2</level> <default>0</default> <!-- RENDER_METHOD_AUTO --> @@ -335,7 +324,7 @@ <control type="toggle" /> </setting> </group> - <group id="5" label="14232"> + <group id="4" label="14232"> <setting id="videoplayer.stereoscopicplaybackmode" type="integer" label="36520" help="36537"> <level>2</level> <default>0</default> @@ -355,7 +344,7 @@ <control type="toggle" /> </setting> </group> - <group id="6" label="14233"> + <group id="5" label="14233"> <setting id="videoplayer.teletextenabled" type="boolean" label="23050" help="36174"> <level>3</level> <default>true</default> |