aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/settings/android.xml9
-rw-r--r--system/settings/darwin.xml3
-rw-r--r--system/settings/rbp.xml8
-rw-r--r--system/settings/settings.xml238
4 files changed, 152 insertions, 106 deletions
diff --git a/system/settings/android.xml b/system/settings/android.xml
index d121511976..54d8f571b8 100644
--- a/system/settings/android.xml
+++ b/system/settings/android.xml
@@ -10,15 +10,6 @@
<section id="videos">
<category id="videoplayer">
<group id="2">
- <setting id="videoplayer.useamcodec" type="boolean" label="13438" help="36422">
- <requirement>HAVE_AMCODEC</requirement>
- <level>2</level>
- <default>true</default>
- <updates>
- <update type="change" />
- </updates>
- <control type="toggle" />
- </setting>
<setting id="videoplayer.usestagefright" type="boolean" label="13436" help="36260">
<requirement>HAVE_LIBSTAGEFRIGHTDECODER</requirement>
<level>2</level>
diff --git a/system/settings/darwin.xml b/system/settings/darwin.xml
index b31d017dbe..1a132a7023 100644
--- a/system/settings/darwin.xml
+++ b/system/settings/darwin.xml
@@ -11,6 +11,9 @@
<setting id="audiooutput.channels" help="36367" />
</group>
<group id="3">
+ <setting id="audiooutput.ac3transcode">
+ <visible>false</visible>
+ </setting>
<setting id="audiooutput.truehdpassthrough">
<visible>false</visible>
</setting>
diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
index 857a562ad1..b5d5b7bae8 100644
--- a/system/settings/rbp.xml
+++ b/system/settings/rbp.xml
@@ -61,6 +61,14 @@
<control type="toggle" />
</setting>
</group>
+ <group id="3">
+ <setting id="audiooutput.truehdpassthrough">
+ <visible>false</visible>
+ </setting>
+ <setting id="audiooutput.dtshdpassthrough">
+ <visible>false</visible>
+ </setting>
+ </group>
</category>
</section>
</settings>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 687912183b..c7ef591c65 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -173,14 +173,6 @@
</constraints>
<control type="list" format="string" />
</setting>
- <setting id="locale.subtitlelanguage" type="string" label="286" help="36120">
- <level>1</level>
- <default>original</default>
- <constraints>
- <options>streamlanguages</options>
- </constraints>
- <control type="list" format="string" />
- </setting>
</group>
</category>
<category id="filelists" label="14081" help="36121">
@@ -415,8 +407,28 @@
<formatlabel>14047</formatlabel>
</control>
</setting>
+ <setting id="videoplayer.useframemtdec" type="boolean" label="13440" help="36423">
+ <level>2</level>
+ <default>false</default>
+ <control type="toggle" />
+ </setting>
+ <setting id="videoplayer.useamcodec" type="boolean" label="13438" help="36422">
+ <requirement>HAVE_AMCODEC</requirement>
+ <dependencies>
+ <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active -->
+ </dependencies>
+ <level>2</level>
+ <default>true</default>
+ <updates>
+ <update type="change" />
+ </updates>
+ <control type="toggle" />
+ </setting>
<setting id="videoplayer.usevdpau" type="boolean" label="13425" help="36155">
<requirement>HAVE_LIBVDPAU</requirement>
+ <dependencies>
+ <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active -->
+ </dependencies>
<level>2</level>
<default>true</default>
<control type="toggle" />
@@ -426,30 +438,47 @@
<level>2</level>
<default>true</default>
<dependencies>
- <dependency type="enable" setting="videoplayer.usevdpau" operator="is">true</dependency> <!-- USE VDPAU -->
+ <dependency type="enable">
+ <and>
+ <condition setting="videoplayer.usevdpau" operator="is">true</condition> <!-- USE VDPAU -->
+ <condition setting="videoplayer.useframemtdec" operator="is">false</condition> <!-- disable when frame threading is active -->
+ </and>
+ </dependency>
</dependencies>
<control type="toggle" />
</setting>
<setting id="videoplayer.usevaapi" type="boolean" label="13426" help="36156">
<requirement>HAVE_LIBVA</requirement>
+ <dependencies>
+ <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active -->
+ </dependencies>
<level>2</level>
<default>true</default>
<control type="toggle" />
</setting>
<setting id="videoplayer.usedxva2" type="boolean" label="13427" help="36158">
<requirement>HasDXVA2</requirement>
+ <dependencies>
+ <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active -->
+ </dependencies>
<level>2</level>
<default>true</default>
<control type="toggle" />
</setting>
<setting id="videoplayer.usechd" type="boolean" label="13428" help="36159">
<requirement>HasCrystalHDDevice</requirement>
+ <dependencies>
+ <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active -->
+ </dependencies>
<level>2</level>
<default>true</default>
<control type="toggle" />
</setting>
<setting id="videoplayer.useomx" type="boolean" label="13430" help="36161">
<requirement>HAVE_LIBOPENMAX</requirement>
+ <dependencies>
+ <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active -->
+ </dependencies>
<level>2</level>
<default>true</default>
<control type="toggle" />
@@ -466,11 +495,6 @@
<default>true</default>
<control type="toggle" />
</setting>
- <setting id="videoplayer.useframemtdec" type="boolean" label="13440" help="36423">
- <level>3</level>
- <default>false</default>
- <control type="toggle" />
- </setting>
<setting id="videoplayer.adjustrefreshrate" type="integer" label="170" help="36164">
<level>2</level>
<default>0</default> <!-- ADJUST_REFRESHRATE_OFF -->
@@ -661,6 +685,92 @@
</category>
<category id="subtitles" label="287" help="36184">
<group id="1">
+ <setting id="locale.subtitlelanguage" type="string" label="286" help="36120">
+ <level>1</level>
+ <default>original</default>
+ <constraints>
+ <options>streamlanguages</options>
+ </constraints>
+ <control type="list" format="string" />
+ </setting>
+ </group>
+ <group id="2">
+ <setting id="subtitles.preferexternal" type="boolean" label="21600" help="21601">
+ <level>1</level>
+ <default>true</default>
+ <control type="toggle" />
+ </setting>
+ <setting id="subtitles.custompath" type="path" label="21366" help="36191">
+ <level>1</level>
+ <default></default>
+ <constraints>
+ <allowempty>true</allowempty>
+ <writable>false</writable>
+ <sources>
+ <source>videos</source>
+ </sources>
+ </constraints>
+ <control type="button" format="path">
+ <heading>657</heading>
+ </control>
+ </setting>
+ <setting id="subtitles.languages" type="list[string]" label="24111" help="24112">
+ <level>1</level>
+ <default>English</default>
+ <constraints>
+ <options>languages</options>
+ <delimiter>,</delimiter>
+ <minimum>1</minimum>
+ <maximum>3</maximum>
+ </constraints>
+ <control type="list" format="string">
+ <multiselect>true</multiselect>
+ </control>
+ </setting>
+ <setting id="subtitles.tv" type="addon" label="24116" help="24117">
+ <level>1</level>
+ <default>-</default>
+ <constraints>
+ <addontype>xbmc.subtitle.module</addontype>
+ <allowempty>true</allowempty>
+ </constraints>
+ <control type="button" format="addon" />
+ </setting>
+ <setting id="subtitles.movie" type="addon" label="24118" help="24119">
+ <level>1</level>
+ <default>-</default>
+ <constraints>
+ <addontype>xbmc.subtitle.module</addontype>
+ <allowempty>true</allowempty>
+ </constraints>
+ <control type="button" format="addon" />
+ </setting>
+ <setting id="subtitles.pauseonsearch" type="boolean" label="24105" help="">
+ <level>1</level>
+ <default>true</default>
+ <control type="toggle" />
+ </setting>
+ <setting id="subtitles.savetomoviefolder" type="boolean" label="24115" help="24106">
+ <level>1</level>
+ <default>true</default>
+ <control type="toggle" />
+ </setting>
+ </group>
+ <group id="3">
+ <setting id="subtitles.align" type="integer" label="21460" help="36192">
+ <level>1</level>
+ <default>0</default> <!-- SUBTITLE_ALIGN_MANUAL -->
+ <constraints>
+ <options>
+ <option label="21461">0</option> <!-- SUBTITLE_ALIGN_MANUAL -->
+ <option label="21462">1</option> <!-- SUBTITLE_ALIGN_BOTTOM_INSIDE -->
+ <option label="21463">2</option> <!-- SUBTITLE_ALIGN_BOTTOM_OUTSIDE -->
+ <option label="21464">3</option> <!-- SUBTITLE_ALIGN_TOP_INSIDE -->
+ <option label="21465">4</option> <!-- SUBTITLE_ALIGN_TOP_OUTSIDE -->
+ </options>
+ </constraints>
+ <control type="spinner" format="string" />
+ </setting>
<setting id="subtitles.font" type="string" label="14089" help="36185">
<level>1</level>
<default>arial.ttf</default>
@@ -735,83 +845,9 @@
<control type="toggle" />
</setting>
</group>
- <group id="2">
- <setting id="subtitles.savetomoviefolder" type="boolean" label="24115" help="24106">
- <level>1</level>
- <default>true</default>
- <control type="toggle" />
- </setting>
- <setting id="subtitles.pauseonsearch" type="boolean" label="24105" help="">
- <level>1</level>
- <default>true</default>
- <control type="toggle" />
- </setting>
- <setting id="subtitles.languages" type="list[string]" label="24111" help="24112">
- <level>1</level>
- <default>English</default>
- <constraints>
- <options>languages</options>
- <delimiter>,</delimiter>
- <minimum>1</minimum>
- <maximum>3</maximum>
- </constraints>
- <control type="list" format="string">
- <multiselect>true</multiselect>
- </control>
- </setting>
- <setting id="subtitles.tv" type="addon" label="24116" help="24117">
- <level>1</level>
- <default>-</default>
- <constraints>
- <addontype>xbmc.subtitle.module</addontype>
- </constraints>
- <control type="button" format="addon" />
- </setting>
- <setting id="subtitles.movie" type="addon" label="24118" help="24119">
- <level>1</level>
- <default>-</default>
- <constraints>
- <addontype>xbmc.subtitle.module</addontype>
- </constraints>
- <control type="button" format="addon" />
- </setting>
- <setting id="subtitles.custompath" type="path" label="21366" help="36191">
- <level>1</level>
- <default></default>
- <constraints>
- <allowempty>true</allowempty>
- <writable>false</writable>
- <sources>
- <source>videos</source>
- </sources>
- </constraints>
- <control type="button" format="path">
- <heading>657</heading>
- </control>
- </setting>
- <setting id="subtitles.align" type="integer" label="21460" help="36192">
- <level>1</level>
- <default>0</default> <!-- SUBTITLE_ALIGN_MANUAL -->
- <constraints>
- <options>
- <option label="21461">0</option> <!-- SUBTITLE_ALIGN_MANUAL -->
- <option label="21462">1</option> <!-- SUBTITLE_ALIGN_BOTTOM_INSIDE -->
- <option label="21463">2</option> <!-- SUBTITLE_ALIGN_BOTTOM_OUTSIDE -->
- <option label="21464">3</option> <!-- SUBTITLE_ALIGN_TOP_INSIDE -->
- <option label="21465">4</option> <!-- SUBTITLE_ALIGN_TOP_OUTSIDE -->
- </options>
- </constraints>
- <control type="spinner" format="string" />
- </setting>
- <setting id="subtitles.preferexternal" type="boolean" label="21600" help="21601">
- <level>1</level>
- <default>true</default>
- <control type="toggle" />
- </setting>
- </group>
- <group id="3">
+ <group id="4">
<setting id="subtitles.stereoscopicdepth" type="integer" label="36545" help="36546">
- <level>0</level>
+ <level>1</level>
<default>0</default>
<constraints>
<minimum>0</minimum>
@@ -2252,13 +2288,7 @@
<level>2</level>
<default>false</default>
<dependencies>
- <dependency type="visible">
- <or>
- <condition on="property" name="aesettingvisible" setting="audiooutput.channels">audiooutput.stereoupmix</condition>
- <condition on="property" name="aesettingvisible" setting="audiooutput.passthrough">audiooutput.stereoupmix</condition>
- <condition on="property" name="aesettingvisible" setting="audiooutput.ac3passthrough">audiooutput.stereoupmix</condition>
- </or>
- </dependency>
+ <dependency type="visible" on="property" name="aesettingvisible" setting="audiooutput.channels">audiooutput.stereoupmix</dependency>
</dependencies>
<control type="toggle" />
</setting>
@@ -2343,6 +2373,20 @@
</dependencies>
<control type="toggle" />
</setting>
+ <setting id="audiooutput.ac3transcode" type="boolean" label="667" help="36429">
+ <level>2</level>
+ <default>true</default>
+ <dependencies>
+ <dependency type="visible">
+ <and>
+ <condition setting="audiooutput.passthrough" operator="is">true</condition>
+ <condition setting="audiooutput.ac3passthrough" operator="is">true</condition>
+ <condition on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.ac3transcode</condition>
+ </and>
+ </dependency>
+ </dependencies>
+ <control type="toggle" />
+ </setting>
<setting id="audiooutput.eac3passthrough" type="boolean" label="448" help="37016">
<level>2</level>
<default>false</default>
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-26 08:57:58 +0000