From fd43c6687814cc2300579157fc8bc7585cf4768d Mon Sep 17 00:00:00 2001 From: Vasily Date: Sun, 1 Dec 2019 17:28:47 +0100 Subject: [PATCH] Add micReversePtt to new settings API --- src/settings/settings.h | 1 + src/settings/settings_controller.h | 4 ++++ src/tabcontrollers/AudioTabController.cpp | 16 ++++------------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/settings/settings.h b/src/settings/settings.h index 3408d7a..bd12c9d 100644 --- a/src/settings/settings.h +++ b/src/settings/settings.h @@ -30,6 +30,7 @@ enum class BoolSetting APPLICATION_enableDebug, AUDIO_micProximitySensorCanMute, + AUDIO_micReversePtt, VIDEO_brightnessEnabled, VIDEO_isOverlayMethodActive, diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h index 1dc0024..4bf2c49 100644 --- a/src/settings/settings_controller.h +++ b/src/settings/settings_controller.h @@ -244,6 +244,10 @@ private: SettingCategory::Audio, QtInfo{ "micProximitySensorCanMute" }, false }, + BoolSettingValue{ BoolSetting::AUDIO_micReversePtt, + SettingCategory::Audio, + QtInfo{ "micReversePtt" }, + false }, BoolSettingValue{ BoolSetting::VIDEO_brightnessEnabled, SettingCategory::Video, diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp index 0ff6fb0..c052868 100644 --- a/src/tabcontrollers/AudioTabController.cpp +++ b/src/tabcontrollers/AudioTabController.cpp @@ -107,31 +107,23 @@ void AudioTabController::initStage2() void AudioTabController::reloadAudioSettings() { std::lock_guard lock( eventLoopMutex ); - auto settings = OverlayController::appSettings(); - settings->beginGroup( getSettingsName() ); setMicProximitySensorCanMute( settings::getSetting( settings::BoolSetting::AUDIO_micProximitySensorCanMute ), false ); - setMicReversePtt( settings->value( "micReversePtt", false ).toBool(), - false ); - settings->endGroup(); + setMicReversePtt( + settings::getSetting( settings::BoolSetting::AUDIO_micReversePtt ) ); } void AudioTabController::saveAudioSettings() { - auto settings = OverlayController::appSettings(); - settings->beginGroup( getSettingsName() ); - settings::setSetting( settings::BoolSetting::AUDIO_micProximitySensorCanMute, micProximitySensorCanMute() ); - - settings->setValue( "micReversePtt", micReversePtt() ); - settings->endGroup(); - settings->sync(); + settings::setSetting( settings::BoolSetting::AUDIO_micReversePtt, + micReversePtt() ); } float AudioTabController::mirrorVolume() const