VC: wrap module settings into a Settings struct

This commit is contained in:
yuyoyuppe
2020-09-01 19:10:15 +03:00
parent e41c1a4b21
commit d762db4a10
2 changed files with 67 additions and 75 deletions

View File

@@ -53,17 +53,21 @@ private:
std::optional<SerializedSharedMemory> _imageOverlayChannel;
std::optional<SerializedSharedMemory> _settingsUpdateChannel;
static Toolbar toolbar;
struct Settings
{
Toolbar toolbar;
static CVolumeNotification* volumeNotification;
CVolumeNotification* volumeNotification = nullptr;
static PowerToysSettings::HotkeyObject cameraAndMicrophoneMuteHotkey;
static PowerToysSettings::HotkeyObject microphoneMuteHotkey;
static PowerToysSettings::HotkeyObject cameraMuteHotkey;
PowerToysSettings::HotkeyObject cameraAndMicrophoneMuteHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, false, 78);
PowerToysSettings::HotkeyObject microphoneMuteHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, true, 65);
PowerToysSettings::HotkeyObject cameraMuteHotkey = PowerToysSettings::HotkeyObject::from_settings(true, false, false, true, 79);
static std::wstring toolbarPositionString;
static std::wstring toolbarMonitorString;
std::wstring toolbarPositionString;
std::wstring toolbarMonitorString;
static std::wstring selectedCamera;
static std::wstring imageOverlayPath;
std::wstring selectedCamera;
std::wstring imageOverlayPath;
};
static Settings settings;
};