New advancedsettings option 'autoHDR' to turn on display HDR when Kod…

…i starts
thexai · Jan 10, 2020 · 5db8da7 · 5db8da7
1 parent 6a11e3d
commit 5db8da7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -562,6 +562,13 @@ bool CApplication::Create(const CAppParamParser &params)
   //! @todo - move to CPlatformXXX
 #ifdef TARGET_WINDOWS
   CWIN32Util::SetThreadLocalLocale(true); // enable independent locale for each thread, see https://connect.microsoft.com/VisualStudio/feedback/details/794122
+  if (CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_bAutoHDR &&
+      CWIN32Util::GetWindowsHDRStatus() == 1)
+  {
+    CLog::Log(LOGNOTICE, "Turning display HDR on due advancedsettings");
+    CWIN32Util::ToggleWindowsHDR();
+    Sleep(2000);
+  }
 #endif // TARGET_WINDOWS
 
   // application inbound service
@@ -2636,6 +2643,15 @@ void CApplication::Stop(int exitCode)
 
   cleanup_emu_environ();
 
+#if defined(TARGET_WINDOWS)
+  if (CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_bAutoHDR &&
+      exitCode == EXITCODE_QUIT && CWIN32Util::GetWindowsHDRStatus() == 2)
+  {
+    CWIN32Util::ToggleWindowsHDR();
+    Sleep(1800);
+  }
+#endif
+
   Sleep(200);
 }
 

diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
@@ -363,6 +363,8 @@ void CAdvancedSettings::Initialize()
   m_bVirtualShares = true;
   m_bTry10bitOutput = false;
 
+  m_bAutoHDR = false;
+
   m_cpuTempCmd = "";
   m_gpuTempCmd = "";
 #if defined(TARGET_DARWIN)
@@ -895,6 +897,8 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
   XMLUtils::GetUInt(pRootElement, "packagefoldersize", m_addonPackageFolderSize);
   XMLUtils::GetBoolean(pRootElement, "try10bitoutput", m_bTry10bitOutput);
 
+  XMLUtils::GetBoolean(pRootElement, "autoHDR", m_bAutoHDR);
+
   // EPG
   pElement = pRootElement->FirstChildElement("epg");
   if (pElement)

diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
@@ -305,6 +305,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler
     bool m_bVirtualShares;
     bool m_bTry10bitOutput;
 
+    bool m_bAutoHDR;
+
     std::string m_cpuTempCmd;
     std::string m_gpuTempCmd;