From 15d314024a7552f3734d392ab1e7f9b84196de2e Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 17:25:08 +0100
Subject: [PATCH] Add m_micProximitySensorCanMute to new settings API

---
 src/settings/settings.h                   |  2 ++
 src/settings/settings_controller.h        |  5 +++++
 src/settings/settings_internal.h          |  3 +++
 src/tabcontrollers/AudioTabController.cpp | 14 +++++++++++---
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/settings/settings.h b/src/settings/settings.h
index cfa2107..3408d7a 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -29,6 +29,8 @@ enum class BoolSetting
     APPLICATION_crashRecoveryDisabled,
     APPLICATION_enableDebug,
 
+    AUDIO_micProximitySensorCanMute,
+
     VIDEO_brightnessEnabled,
     VIDEO_isOverlayMethodActive,
     VIDEO_colorOverlayEnabled,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index 8d32fb7..1dc0024 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -240,6 +240,11 @@ private:
                           QtInfo{ "enableDebug" },
                           false },
 
+        BoolSettingValue{ BoolSetting::AUDIO_micProximitySensorCanMute,
+                          SettingCategory::Audio,
+                          QtInfo{ "micProximitySensorCanMute" },
+                          false },
+
         BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled,
                           SettingCategory::Video,
                           QtInfo{ "brightnessEnabled" },
diff --git a/src/settings/settings_internal.h b/src/settings/settings_internal.h
index c8b3482..29e2952 100644
--- a/src/settings/settings_internal.h
+++ b/src/settings/settings_internal.h
@@ -8,6 +8,7 @@ namespace settings
 {
 enum class SettingCategory
 {
+    Audio,
     Utility,
     KeyboardShortcut,
     Playspace,
@@ -36,6 +37,8 @@ struct QtInfo
 {
     switch ( category )
     {
+    case SettingCategory::Audio:
+        return "audioSettings";
     case SettingCategory::Utility:
         return "utilitiesSettings";
     case SettingCategory::KeyboardShortcut:
diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp
index 0c59c74..0ff6fb0 100644
--- a/src/tabcontrollers/AudioTabController.cpp
+++ b/src/tabcontrollers/AudioTabController.cpp
@@ -2,6 +2,7 @@
 #include <QQuickWindow>
 #include <QApplication>
 #include "../overlaycontroller.h"
+#include "../settings/settings.h"
 #ifdef _WIN32
 #    include "audiomanager/AudioManagerWindows.h"
 #else
@@ -108,8 +109,12 @@ void AudioTabController::reloadAudioSettings()
     std::lock_guard<std::recursive_mutex> lock( eventLoopMutex );
     auto settings = OverlayController::appSettings();
     settings->beginGroup( getSettingsName() );
+
     setMicProximitySensorCanMute(
-        settings->value( "micProximitySensorCanMute", false ).toBool(), false );
+        settings::getSetting(
+            settings::BoolSetting::AUDIO_micProximitySensorCanMute ),
+        false );
+
     setMicReversePtt( settings->value( "micReversePtt", false ).toBool(),
                       false );
     settings->endGroup();
@@ -119,8 +124,11 @@ void AudioTabController::saveAudioSettings()
 {
     auto settings = OverlayController::appSettings();
     settings->beginGroup( getSettingsName() );
-    settings->setValue( "micProximitySensorCanMute",
-                        micProximitySensorCanMute() );
+
+    settings::setSetting(
+        settings::BoolSetting::AUDIO_micProximitySensorCanMute,
+        micProximitySensorCanMute() );
+
     settings->setValue( "micReversePtt", micReversePtt() );
     settings->endGroup();
     settings->sync();