use HDR.h instead of HDRCmd executable

Odizinne · Nov 13, 2024 · 9ac236b · 9ac236b
1 parent f7707d1
commit 9ac236b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 37 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Dependencies/HDRtray"]
+	path = Dependencies/HDRtray
+	url = https://github.com/res2k/HDRTray.git
diff --git a/BigPictureTV.pro b/BigPictureTV.pro
@@ -5,17 +5,16 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 CONFIG += c++17 silent lrelease embed_translations
 
 QM_FILES_RESOURCE_PREFIX = /translations
-DEPS_DIR = $$PWD/Dependencies
-BUILD_DIR = $$OUT_PWD
 
 INCLUDEPATH +=                                              \
-    AudioManager                                            \
-    BigPictureTV                                            \
-    Configurator                                            \
-    NightLightSwitcher                                      \
-    ShortcutManager                                         \
-    SteamWindowManager                                      \
-    Utils                                                   \
+    AudioManager/                                           \
+    BigPictureTV/                                           \
+    Configurator/                                           \
+    NightLightSwitcher/                                     \
+    ShortcutManager/                                        \
+    SteamWindowManager/                                     \
+    Utils/                                                  \
+    Dependencies/HDRtray/common/                            \
 
 SOURCES +=                                                  \
     AudioManager/AudioManager.cpp                           \
@@ -26,6 +25,7 @@ SOURCES +=                                                  \
     SteamWindowManager/SteamwindowManager.cpp               \
     Utils/Utils.cpp                                         \
     main.cpp                                                \
+    Dependencies/HDRtray/common/hdr.cpp                     \
 
 HEADERS +=                                                  \
     AudioManager/AudioManager.h                             \
@@ -36,6 +36,7 @@ HEADERS +=                                                  \
     ShortcutManager/ShortcutManager.h                       \
     SteamWindowManager/SteamwindowManager.h                 \
     Utils/Utils.h                                           \
+    Dependencies/HDRtray/common/hdr.h                       \
 
 FORMS +=                                                    \
     Configurator/Configurator.ui                            \
@@ -50,5 +51,3 @@ RESOURCES +=                                                \
 RC_FILE = Resources/appicon.rc
 
 LIBS += -lole32 -luser32 -ladvapi32 -lshell32
-
-QMAKE_POST_LINK = powershell -Command "Copy-Item -Path '$$DEPS_DIR' -Recurse -Destination '$$BUILD_DIR/release'"
diff --git a/BigPictureTV/BigPictureTV.cpp b/BigPictureTV/BigPictureTV.cpp
@@ -126,9 +126,9 @@ void BigPictureTV::checkAndSetHDR(bool isDesktopMode)
         return;
     }
 
-    QString command = isDesktopMode ? "off" : "on";
+    bool enable = isDesktopMode ? false : true;
     if (Utils::getHDRStatus() != 2) {
-        Utils::setHDR(command);
+        Utils::setHDR(enable);
     }
 }
 

diff --git a/Dependencies/HDRCmd.exe b/Dependencies/HDRCmd.exe
diff --git a/Dependencies/HDRtray b/Dependencies/HDRtray
diff --git a/Utils/Utils.cpp b/Utils/Utils.cpp
@@ -1,4 +1,5 @@
 #include "Utils.h"
+#include "HDR.h"
 #include <QTranslator>
 #include <QApplication>
 #include <QScreen>
@@ -212,31 +213,19 @@ bool Utils::isWindows10()
 
 int Utils::getHDRStatus()
 {
-    QString program = QCoreApplication::applicationDirPath() + "/Dependencies/HDRCmd.exe";
-    QStringList arguments;
-    arguments << "status" << "-m" << "exitcode";
-    QProcess process;
-    process.start(program, arguments);
-
-    if (!process.waitForFinished()) {
-        qDebug() << "Process failed to finish";
-        return -1;
+    hdr::Status hdrStatus = hdr::GetWindowsHDRStatus();
+    if (hdrStatus == hdr::Status::On) {
+        return 0; // Enabled
+    } else if (hdrStatus == hdr::Status::Off) {
+        return 1; // Disabled
+    } else if (hdrStatus == hdr::Status::Unsupported) {
+        return 2; // Unsuported
+    } else {
+        return 2; // Error, so unsupported
     }
-
-    int exitCode = process.exitCode();
-    return exitCode;
 }
 
-void Utils::setHDR(QString mode)
+void Utils::setHDR(bool enable)
 {
-    QString program = QCoreApplication::applicationDirPath() + "/Dependencies/HDRCmd.exe";
-    QStringList arguments;
-    arguments << mode;
-    QProcess process;
-    process.start(program, arguments);
-
-    if (!process.waitForFinished()) {
-        qDebug() << "Process failed to finish";
-        return;
-    }
+    hdr::SetWindowsHDRStatus(enable);
 }
diff --git a/Utils/Utils.h b/Utils/Utils.h
@@ -19,7 +19,7 @@ namespace Utils {
     void skipBigPictureIntro();
     bool isWindows10();
     int getHDRStatus();
-    void setHDR(QString mode);
+    void setHDR(bool enable);
 }
 
 #endif // UTILS_H