diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2013-08-01 07:40:06 -0700 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2013-08-01 07:40:06 -0700 |
| commit | 60b8a343b215df1d21bd87992ec7bc212a491391 (patch) | |
| tree | ad6adcc228a97630944557185ab56e2590af343f /system | |
| parent | 711c2df7150410f611f2f87ac51679ec56933f9e (diff) | |
| parent | 385b2f773937a907003e4e32054f84fe5270c1b3 (diff) | |
Merge pull request #2970 from FernetMenta/sledgehammer
grAEken: add ActiveAE as an additional audio engine
Diffstat (limited to 'system')
| -rw-r--r-- | system/settings/settings.xml | 14 | ||||
| -rw-r--r-- | system/settings/win32.xml | 28 |
2 files changed, 42 insertions, 0 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml index d5e05ac071..32573dcfd0 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1959,6 +1959,15 @@ <level>2</level> <default>true</default> </setting> + <setting id="audiooutput.processquality" type="integer" label="13505" help="36169"> + <visible>HAS_AE_QUALITY_LEVELS</visible> + <level>2</level> + <default>30</default> <!-- AE_QUALITY_MID --> + <constraints> + <options>aequalitylevels</options> + </constraints> + <control type="spinner" format="string" /> + </setting> <setting id="audiooutput.stereoupmix" type="boolean" label="252" help="36364"> <level>2</level> <default>false</default> @@ -2025,6 +2034,11 @@ </dependency> </dependencies> </setting> + <setting id="audiooutput.streamsilence" type="boolean" label="421" help="34111"> + <level>2</level> + <visible>audiosupportsdrain</visible> + <default>true</default> + </setting> </group> <group id="2"> <setting id="audiooutput.audiodevice" type="string" label="545" help="36371"> diff --git a/system/settings/win32.xml b/system/settings/win32.xml index 76bc2bf989..1e0a97bc80 100644 --- a/system/settings/win32.xml +++ b/system/settings/win32.xml @@ -39,5 +39,33 @@ </setting> </group> </category> + <category id="audiooutput" label="772" help="36360"> + <group id="2"> + <setting id="audiooutput.audiodevice" type="string" label="545" help="36371"> + <level>2</level> + <default>WASAPI:default</default> <!-- will be properly set on startup --> + <constraints> + <options>audiodevices</options> + </constraints> + <control type="spinner" format="string" /> + </setting> + <setting id="audiooutput.passthroughdevice" type="string" label="546" help="36372"> + <level>2</level> + <default>WASAPI:default</default> <!-- will be properly set on startup --> + <constraints> + <options>audiodevicespassthrough</options> + </constraints> + <dependencies> + <dependency type="enable"> + <or> + <condition setting="audiooutput.mode">1</condition> <!-- AUDIO_IEC958 --> + <condition setting="audiooutput.mode">2</condition> <!-- AUDIO_HDMI --> + </or> + </dependency> + </dependencies> + <control type="spinner" format="string" /> + </setting> + </group> + </category> </section> </settings> |