Add m_micProximitySensorCanMute to new settings API

This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 2ab77e6584
commit 15d314024a
4 changed files with 21 additions and 3 deletions
+2
View File
@@ -29,6 +29,8 @@ enum class BoolSetting
APPLICATION_crashRecoveryDisabled, APPLICATION_crashRecoveryDisabled,
APPLICATION_enableDebug, APPLICATION_enableDebug,
AUDIO_micProximitySensorCanMute,
VIDEO_brightnessEnabled, VIDEO_brightnessEnabled,
VIDEO_isOverlayMethodActive, VIDEO_isOverlayMethodActive,
VIDEO_colorOverlayEnabled, VIDEO_colorOverlayEnabled,
+5
View File
@@ -240,6 +240,11 @@ private:
QtInfo{ "enableDebug" }, QtInfo{ "enableDebug" },
false }, false },
BoolSettingValue{ BoolSetting::AUDIO_micProximitySensorCanMute,
SettingCategory::Audio,
QtInfo{ "micProximitySensorCanMute" },
false },
BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled, BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled,
SettingCategory::Video, SettingCategory::Video,
QtInfo{ "brightnessEnabled" }, QtInfo{ "brightnessEnabled" },
+3
View File
@@ -8,6 +8,7 @@ namespace settings
{ {
enum class SettingCategory enum class SettingCategory
{ {
Audio,
Utility, Utility,
KeyboardShortcut, KeyboardShortcut,
Playspace, Playspace,
@@ -36,6 +37,8 @@ struct QtInfo
{ {
switch ( category ) switch ( category )
{ {
case SettingCategory::Audio:
return "audioSettings";
case SettingCategory::Utility: case SettingCategory::Utility:
return "utilitiesSettings"; return "utilitiesSettings";
case SettingCategory::KeyboardShortcut: case SettingCategory::KeyboardShortcut:
+11 -3
View File
@@ -2,6 +2,7 @@
#include <QQuickWindow> #include <QQuickWindow>
#include <QApplication> #include <QApplication>
#include "../overlaycontroller.h" #include "../overlaycontroller.h"
#include "../settings/settings.h"
#ifdef _WIN32 #ifdef _WIN32
# include "audiomanager/AudioManagerWindows.h" # include "audiomanager/AudioManagerWindows.h"
#else #else
@@ -108,8 +109,12 @@ void AudioTabController::reloadAudioSettings()
std::lock_guard<std::recursive_mutex> lock( eventLoopMutex ); std::lock_guard<std::recursive_mutex> lock( eventLoopMutex );
auto settings = OverlayController::appSettings(); auto settings = OverlayController::appSettings();
settings->beginGroup( getSettingsName() ); settings->beginGroup( getSettingsName() );
setMicProximitySensorCanMute( setMicProximitySensorCanMute(
settings->value( "micProximitySensorCanMute", false ).toBool(), false ); settings::getSetting(
settings::BoolSetting::AUDIO_micProximitySensorCanMute ),
false );
setMicReversePtt( settings->value( "micReversePtt", false ).toBool(), setMicReversePtt( settings->value( "micReversePtt", false ).toBool(),
false ); false );
settings->endGroup(); settings->endGroup();
@@ -119,8 +124,11 @@ void AudioTabController::saveAudioSettings()
{ {
auto settings = OverlayController::appSettings(); auto settings = OverlayController::appSettings();
settings->beginGroup( getSettingsName() ); settings->beginGroup( getSettingsName() );
settings->setValue( "micProximitySensorCanMute",
micProximitySensorCanMute() ); settings::setSetting(
settings::BoolSetting::AUDIO_micProximitySensorCanMute,
micProximitySensorCanMute() );
settings->setValue( "micReversePtt", micReversePtt() ); settings->setValue( "micReversePtt", micReversePtt() );
settings->endGroup(); settings->endGroup();
settings->sync(); settings->sync();