diff options
| author | Memphiz <memphis@machzwo.de> | 2014-05-21 18:39:32 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2014-05-21 18:43:01 +0200 |
| commit | 44f468961559c033461967c21d827644f5e54bb9 (patch) | |
| tree | bcdf2caf7775e468ef73d0e9e8a7fdf9bd5d2f60 | |
| parent | 3394c58c55e74d6b06212825288c6298813ed813 (diff) | |
[osx] - handle the VDA HW Acceleration setting same as all others (instead of overwriting in darwin_osx.xml - introduce HasVDA dependency and use that one)
| -rw-r--r-- | system/settings/darwin_osx.xml | 14 | ||||
| -rw-r--r-- | system/settings/settings.xml | 9 | ||||
| -rw-r--r-- | xbmc/settings/SettingConditions.cpp | 3 |
3 files changed, 12 insertions, 14 deletions
diff --git a/system/settings/darwin_osx.xml b/system/settings/darwin_osx.xml index 0a772775a8..9a5538ba44 100644 --- a/system/settings/darwin_osx.xml +++ b/system/settings/darwin_osx.xml @@ -9,20 +9,6 @@ </group> </category> </section> - <section id="videos"> - <category id="videoacceleration"> - <group id="3"> - <setting id="videoplayer.usevda" type="boolean" parent="videoplayer.decodingmethod" label="13429" help="36160"> - <dependencies> - <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> - </dependencies> - <level>2</level> - <default>true</default> - <control type="toggle" /> - </setting> - </group> - </category> - </section> </settings> diff --git a/system/settings/settings.xml b/system/settings/settings.xml index 391bcee967..fc9d6be9ea 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -748,6 +748,15 @@ <default>true</default> <control type="toggle" /> </setting> + <setting id="videoplayer.usevda" type="boolean" label="13429" help="36160"> + <requirement>HasVDA</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> + </dependencies> + <level>2</level> + <default>true</default> + <control type="toggle" /> + </setting> </group> </category> <category id="myvideos" label="14081" help="36601"> diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp index ff10d49601..9a9915d8d6 100644 --- a/xbmc/settings/SettingConditions.cpp +++ b/xbmc/settings/SettingConditions.cpp @@ -250,6 +250,9 @@ void CSettingConditions::Initialize() if (g_sysinfo.HasVideoToolBoxDecoder()) m_simpleConditions.insert("hasvideotoolboxdecoder"); #endif +#ifdef TARGET_DARWIN_OSX + m_simpleConditions.insert("HasVDA"); +#endif #ifdef HAS_LIBAMCODEC if (aml_present()) m_simpleConditions.insert("have_amcodec"); |