From ff5c6fe7dd1ad6cdd7f585ab426975111718d22b Mon Sep 17 00:00:00 2001 From: lx-s Date: Tue, 23 Aug 2022 08:52:37 +0200 Subject: [PATCH] Log settings, when logging is enabled. --- WinMute/WMLog.cpp | 5 +++++ WinMute/WMLog.h | 1 + WinMute/WinMute.cpp | 19 ++++++++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/WinMute/WMLog.cpp b/WinMute/WMLog.cpp index 47a7b80..08b7b51 100644 --- a/WinMute/WMLog.cpp +++ b/WinMute/WMLog.cpp @@ -98,6 +98,11 @@ void WMLog::SetEnabled(bool enable) } } +bool WMLog::IsEnabled() const +{ + return enabled_; +} + void WMLog::WriteMessage(const wchar_t* msg) { struct tm tm = { 0 }; diff --git a/WinMute/WMLog.h b/WinMute/WMLog.h index afcdd98..73465aa 100644 --- a/WinMute/WMLog.h +++ b/WinMute/WMLog.h @@ -43,6 +43,7 @@ public: void WriteWindowsError(const wchar_t *functionName, DWORD errorCode = -1); void SetEnabled(bool enable); + bool IsEnabled() const; std::wstring GetLogFilePath(); private: diff --git a/WinMute/WinMute.cpp b/WinMute/WinMute.cpp index e6e4c30..816832d 100644 --- a/WinMute/WinMute.cpp +++ b/WinMute/WinMute.cpp @@ -290,7 +290,6 @@ bool WinMute::Init() } trayIcon_.Init(hWnd_, 0, hTrayIcon_, L"WinMute", true); - quietHours_.Init(hWnd_, settings_); log.Write(L"WinMute initialized"); @@ -308,6 +307,24 @@ bool WinMute::Init() bool WinMute::LoadSettings() { + WMLog& log = WMLog::GetInstance(); + + if (log.IsEnabled()) { + log.Write(L"Loading settings:"); + log.Write(L"\tRestore volume: %s", settings_.QueryValue(SettingsKey::RESTORE_AUDIO) ? L"Yes" : L"No"); + log.Write(L"\tMute on lock: %s", settings_.QueryValue(SettingsKey::MUTE_ON_LOCK) ? L"Yes" : L"No"); + log.Write(L"\tMute on screensaver: %s", settings_.QueryValue(SettingsKey::MUTE_ON_SCREENSAVER) ? L"Yes" : L"No"); + log.Write(L"\tMute on display standby: %s", settings_.QueryValue(SettingsKey::MUTE_ON_DISPLAYSTANDBY) ? L"Yes" : L"No"); + log.Write(L"\tMute on logout: %s", settings_.QueryValue(SettingsKey::MUTE_ON_LOGOUT) ? L"Yes" : L"No"); + log.Write(L"\tMute on suspend: %s", settings_.QueryValue(SettingsKey::MUTE_ON_SUSPEND) ? L"Yes" : L"No"); + log.Write(L"\tMute on shutdown: %s", settings_.QueryValue(SettingsKey::MUTE_ON_SHUTDOWN) ? L"Yes" : L"No"); + log.Write(L"\tShow notifications: %s", settings_.QueryValue(SettingsKey::NOTIFICATIONS_ENABLED) ? L"Yes" : L"No"); + log.Write(L"\tMute on bluetooth: %s", settings_.QueryValue(SettingsKey::MUTE_ON_BLUETOOTH) ? L"Yes" : L"No"); + log.Write(L"\t\tUse devicelist: %s", settings_.QueryValue(SettingsKey::MUTE_ON_BLUETOOTH_DEVICELIST) ? L"Yes" : L"No"); + log.Write(L"\tMute on WLAN: %s", settings_.QueryValue(SettingsKey::MUTE_ON_WLAN) ? L"Yes" : L"No"); + log.Write(L"\t\tUse allowlist: %s", settings_.QueryValue(SettingsKey::MUTE_ON_WLAN_ALLOWLIST) ? L"Yes" : L"No"); + } + muteCtrl_.SetRestoreVolume(settings_.QueryValue(SettingsKey::RESTORE_AUDIO)); muteCtrl_.SetMuteOnWorkstationLock(settings_.QueryValue(SettingsKey::MUTE_ON_LOCK)); muteCtrl_.SetMuteOnScreensaverActivation(settings_.QueryValue(SettingsKey::MUTE_ON_SCREENSAVER)); -- 2.43.0