From a014de836872a51b6998d5ec6ac4b9a63b455a82 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 17:44:06 +0100
Subject: [PATCH] Convert m_micReversePtt to new settings API

---
 src/tabcontrollers/AudioTabController.cpp | 33 +++++++++++------------
 src/tabcontrollers/AudioTabController.h   |  1 -
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp
index 10aa673..dd705dd 100644
--- a/src/tabcontrollers/AudioTabController.cpp
+++ b/src/tabcontrollers/AudioTabController.cpp
@@ -145,7 +145,7 @@ bool AudioTabController::micProximitySensorCanMute() const
 
 bool AudioTabController::micReversePtt() const
 {
-    return m_micReversePtt;
+    return settings::getSetting( settings::BoolSetting::AUDIO_micReversePtt );
 }
 
 bool AudioTabController::audioProfileDefault() const
@@ -211,7 +211,7 @@ bool AudioTabController::pttChangeValid()
 
 void AudioTabController::onPttStart()
 {
-    if ( m_micReversePtt )
+    if ( micReversePtt() )
     {
         setMicMuted( true );
     }
@@ -223,7 +223,7 @@ void AudioTabController::onPttStart()
 
 void AudioTabController::onPttEnabled()
 {
-    if ( m_micReversePtt )
+    if ( micReversePtt() )
     {
         setMicMuted( false );
     }
@@ -235,7 +235,7 @@ void AudioTabController::onPttEnabled()
 
 void AudioTabController::onPttStop()
 {
-    if ( m_micReversePtt )
+    if ( micReversePtt() )
     {
         setMicMuted( false );
     }
@@ -335,25 +335,24 @@ void AudioTabController::setMicProximitySensorCanMute( bool value, bool notify )
 void AudioTabController::setMicReversePtt( bool value, bool notify )
 {
     std::lock_guard<std::recursive_mutex> lock( eventLoopMutex );
-    if ( value != m_micReversePtt )
+
+    settings::setSetting( settings::BoolSetting::AUDIO_micReversePtt, value );
+
+    if ( m_pttEnabled )
     {
-        m_micReversePtt = value;
-        if ( m_pttEnabled )
+        if ( m_pttActive )
         {
-            if ( m_pttActive )
-            {
-                setMicMuted( value );
-            }
-            else
-            {
-                setMicMuted( !value );
-            }
+            setMicMuted( value );
         }
-        if ( notify )
+        else
         {
-            emit micReversePttChanged( value );
+            setMicMuted( !value );
         }
     }
+    if ( notify )
+    {
+        emit micReversePttChanged( value );
+    }
 }
 
 void AudioTabController::setAudioProfileDefault( bool value, bool notify )
diff --git a/src/tabcontrollers/AudioTabController.h b/src/tabcontrollers/AudioTabController.h
index dca9a8c..34eaa0d 100644
--- a/src/tabcontrollers/AudioTabController.h
+++ b/src/tabcontrollers/AudioTabController.h
@@ -71,7 +71,6 @@ private:
     int m_recordingDeviceIndex = -1;
     float m_micVolume = 1.0;
     bool m_micMuted = false;
-    bool m_micReversePtt = false;
     bool m_isDefaultAudioProfile = false;
     bool m_isPlaybackOverride = false;
     bool m_isRecordingOverride = false;