Merge pull request xbmc#18950 from HiassofT/gbm-settings

windowing/gbm: hide and disable setting Use Display As Clock
johnrvt · Dec 21, 2020 · babe1c5 · babe1c5
2 parents c9da8b4 + cacf601
commit babe1c5
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
@@ -77,14 +77,28 @@ bool CWinSystemGbm::InitWindowSystem()
  return false;
  }
 
- CServiceBroker::GetSettingsComponent()
- ->GetSettings()
- ->GetSetting(CSettings::SETTING_VIDEOSCREEN_LIMITEDRANGE)
- ->SetVisible(true);
- CServiceBroker::GetSettingsComponent()
- ->GetSettings()
- ->GetSetting("videoscreen.limitguisize")
- ->SetVisible(true);
+ auto settingsComponent = CServiceBroker::GetSettingsComponent();
+ if (!settingsComponent)
+ return false;
+
+ auto settings = settingsComponent->GetSettings();
+ if (!settings)
+ return false;
+
+ auto setting = settings->GetSetting(CSettings::SETTING_VIDEOSCREEN_LIMITEDRANGE);
+ if (setting)
+ setting->SetVisible(true);
+
+ setting = settings->GetSetting("videoscreen.limitguisize");
+ if (setting)
+ setting->SetVisible(true);
+
+ setting = settings->GetSetting(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK);
+ if (setting)
+ {
+ setting->SetVisible(false);
+ settings->SetBool(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK, false);
+ }
 
  CLog::Log(LOGDEBUG, "CWinSystemGbm::%s - initialized DRM", __FUNCTION__);
  return CWinSystemBase::InitWindowSystem();