Permalink
Browse files

[settings] enable/disable audio setting controls based on state rathe…

…r than hiding them
  • Loading branch information...
1 parent f603f22 commit 27ece5ab424a18ea71771342131aea6fd13143db Jonathan Marshall committed Feb 26, 2014
Showing with 12 additions and 25 deletions.
  1. +12 −25 system/settings/settings.xml
@@ -2429,11 +2429,11 @@
<dependencies>
<dependency type="visible">
<and>
- <condition setting="audiooutput.passthrough" operator="is">true</condition>
<condition on="property" name="aesettingvisible" setting="audiooutput.passthrough">audiooutput.passthrough</condition>
<condition on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.passthrough</condition>
</and>
</dependency>
+ <dependency type="enable" setting="audiooutput.passthrough" operator="is">true</dependency>
</dependencies>
<constraints>
<options>audiodevicespassthrough</options>
@@ -2444,53 +2444,40 @@
<level>2</level>
<default>true</default>
<dependencies>
- <dependency type="visible">
- <and>
- <condition setting="audiooutput.passthrough" operator="is">true</condition>
- <condition on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.passthrough</condition>
- </and>
- </dependency>
+ <dependency type="visible" on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.passthrough</dependency>
+ <dependency type="enable" setting="audiooutput.passthrough" operator="is">true</dependency>
</dependencies>
<control type="toggle" />
</setting>
- <setting id="audiooutput.ac3transcode" type="boolean" label="667" help="36429">
+ <setting id="audiooutput.ac3transcode" type="boolean" parent="audiooutput.ac3passthrough" label="667" help="36429">
<level>2</level>
<default>false</default>
<dependencies>
- <dependency type="visible">
+ <dependency type="enable">
<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>
+ <dependency type="visible" on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.ac3transcode</dependency>
</dependencies>
<control type="toggle" />
</setting>
<setting id="audiooutput.eac3passthrough" type="boolean" label="448" help="37016">
<level>2</level>
<default>false</default>
<dependencies>
- <dependency type="visible">
- <and>
- <condition setting="audiooutput.passthrough" operator="is">true</condition>
- <condition on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.eac3passthrough</condition>
- <condition on="property" name="aesettingvisible" setting="audiooutput.passthroughdevice">audiooutput.eac3passthrough</condition>
- </and>
- </dependency>
+ <dependency type="visible" on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.passthrough</dependency>
+ <dependency type="enable" setting="audiooutput.passthrough" operator="is">true</dependency>
</dependencies>
<control type="toggle" />
</setting>
<setting id="audiooutput.dtspassthrough" type="boolean" label="254" help="36366">
<level>2</level>
<default>false</default>
<dependencies>
- <dependency type="visible">
- <and>
- <condition setting="audiooutput.passthrough" operator="is">true</condition>
- <condition on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.passthrough</condition>
- </and>
- </dependency>
+ <dependency type="visible" on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.passthrough</dependency>
+ <dependency type="enable" setting="audiooutput.passthrough" operator="is">true</dependency>
</dependencies>
<control type="toggle" />
</setting>
@@ -2500,11 +2487,11 @@
<dependencies>
<dependency type="visible">
<and>
- <condition setting="audiooutput.passthrough" operator="is">true</condition>
<condition on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.truehdpassthrough</condition>
<condition on="property" name="aesettingvisible" setting="audiooutput.passthroughdevice">audiooutput.truehdpassthrough</condition>
</and>
</dependency>
+ <dependency type="enable" setting="audiooutput.passthrough" operator="is">true</dependency>
</dependencies>
<control type="toggle" />
</setting>
@@ -2514,11 +2501,11 @@
<dependencies>
<dependency type="visible">
<and>
- <condition setting="audiooutput.passthrough" operator="is">true</condition>
<condition on="property" name="aesettingvisible" setting="audiooutput.config">audiooutput.dtshdpassthrough</condition>
<condition on="property" name="aesettingvisible" setting="audiooutput.passthroughdevice">audiooutput.dtshdpassthrough</condition>
</and>
</dependency>
+ <dependency type="enable" setting="audiooutput.passthrough" operator="is">true</dependency>
</dependencies>
<control type="toggle" />
</setting>

0 comments on commit 27ece5a

Please sign in to comment.