diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2017-09-08 10:53:10 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2017-09-18 15:50:17 -0700 |
| commit | f2ca8d0d9fecfbedcab60519d0bed2975081d793 (patch) | |
| tree | a952150d6c780ca62ed3bd8b98227d971168ca40 | |
| parent | 6d18ff7cfdf93af8cf2f9f3c8f02be2ac5ede91a (diff) | |
[cleanup] exchange HAS_GLX for HAVE_X11
| -rwxr-xr-x | system/settings/settings.xml | 2 | ||||
| -rw-r--r-- | xbmc/Application.cpp | 2 | ||||
| -rw-r--r-- | xbmc/settings/DisplaySettings.cpp | 6 | ||||
| -rw-r--r-- | xbmc/settings/SettingConditions.cpp | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml index cd12dfdc56..6d10a4d632 100755 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2117,7 +2117,7 @@ <setting id="videoscreen.monitor" type="string" label="246" help=""> <requirement> <or> - <condition>HAS_GLX</condition> + <condition>HAVE_X11</condition> <condition>HAVE_WAYLAND</condition> </or> </requirement> diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 4b4af2ca55..424c0f30b7 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -285,7 +285,7 @@ CApplication::CApplication(void) { TiXmlBase::SetCondenseWhiteSpace(false); -#ifdef HAS_GLX +#ifdef HAVE_X11 XInitThreads(); #endif } diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp index 1abc964535..c14e1febc9 100644 --- a/xbmc/settings/DisplaySettings.cpp +++ b/xbmc/settings/DisplaySettings.cpp @@ -326,7 +326,7 @@ bool CDisplaySettings::OnSettingChanging(std::shared_ptr<const CSetting> setting return true; } -#if defined(HAS_GLX) +#if defined(HAVE_X11) else if (settingId == CSettings::SETTING_VIDEOSCREEN_BLANKDISPLAYS) { g_Windowing.UpdateResolutions(); @@ -727,7 +727,7 @@ void CDisplaySettings::SettingOptionsScreensFiller(SettingConstPtr setting, std: if (g_advancedSettings.m_canWindowed && g_Windowing.CanDoWindowed()) list.push_back(std::make_pair(g_localizeStrings.Get(242), DM_WINDOWED)); -#if defined(HAS_GLX) || defined(HAVE_WAYLAND) +#if defined(HAVE_X11) || defined(HAVE_WAYLAND) list.push_back(std::make_pair(g_localizeStrings.Get(244), 0)); #else @@ -778,7 +778,7 @@ void CDisplaySettings::SettingOptionsPreferredStereoscopicViewModesFiller(Settin void CDisplaySettings::SettingOptionsMonitorsFiller(SettingConstPtr setting, std::vector< std::pair<std::string, std::string> > &list, std::string ¤t, void *data) { -#if defined(HAS_GLX) +#if defined(HAVE_X11) std::vector<std::string> monitors; g_Windowing.GetConnectedOutputs(&monitors); std::string currentMonitor = CServiceBroker::GetSettings().GetString(CSettings::SETTING_VIDEOSCREEN_MONITOR); diff --git a/xbmc/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp index 456d37a4cb..d7cb995e63 100644 --- a/xbmc/settings/SettingConditions.cpp +++ b/xbmc/settings/SettingConditions.cpp @@ -294,9 +294,6 @@ void CSettingConditions::Initialize() #ifdef HAS_GL m_simpleConditions.insert("has_gl"); #endif -#ifdef HAS_GLX - m_simpleConditions.insert("has_glx"); -#endif #ifdef HAS_GLES m_simpleConditions.insert("has_gles"); #endif |