Convert m_micProximitySensorCanMute to new settings API

The `saveAudioSettings()` function lead to an infinite loop of
saving.
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent fd43c66878
commit c96b531ee1
2 changed files with 8 additions and 20 deletions
+8 -18
View File
@@ -117,15 +117,6 @@ void AudioTabController::reloadAudioSettings()
settings::getSetting( settings::BoolSetting::AUDIO_micReversePtt ) ); settings::getSetting( settings::BoolSetting::AUDIO_micReversePtt ) );
} }
void AudioTabController::saveAudioSettings()
{
settings::setSetting(
settings::BoolSetting::AUDIO_micProximitySensorCanMute,
micProximitySensorCanMute() );
settings::setSetting( settings::BoolSetting::AUDIO_micReversePtt,
micReversePtt() );
}
float AudioTabController::mirrorVolume() const float AudioTabController::mirrorVolume() const
{ {
return m_mirrorVolume; return m_mirrorVolume;
@@ -148,7 +139,8 @@ bool AudioTabController::micMuted() const
bool AudioTabController::micProximitySensorCanMute() const bool AudioTabController::micProximitySensorCanMute() const
{ {
return m_micProximitySensorCanMute; return settings::getSetting(
settings::BoolSetting::AUDIO_micProximitySensorCanMute );
} }
bool AudioTabController::micReversePtt() const bool AudioTabController::micReversePtt() const
@@ -330,14 +322,13 @@ void AudioTabController::setMicMuted( bool value, bool notify )
void AudioTabController::setMicProximitySensorCanMute( bool value, bool notify ) void AudioTabController::setMicProximitySensorCanMute( bool value, bool notify )
{ {
std::lock_guard<std::recursive_mutex> lock( eventLoopMutex ); std::lock_guard<std::recursive_mutex> lock( eventLoopMutex );
if ( value != m_micProximitySensorCanMute )
settings::setSetting(
settings::BoolSetting::AUDIO_micProximitySensorCanMute, value );
if ( notify )
{ {
m_micProximitySensorCanMute = value; emit micProximitySensorCanMuteChanged( value );
saveAudioSettings();
if ( notify )
{
emit micProximitySensorCanMuteChanged( value );
}
} }
} }
@@ -347,7 +338,6 @@ void AudioTabController::setMicReversePtt( bool value, bool notify )
if ( value != m_micReversePtt ) if ( value != m_micReversePtt )
{ {
m_micReversePtt = value; m_micReversePtt = value;
saveAudioSettings();
if ( m_pttEnabled ) if ( m_pttEnabled )
{ {
if ( m_pttActive ) if ( m_pttActive )
-2
View File
@@ -71,7 +71,6 @@ private:
int m_recordingDeviceIndex = -1; int m_recordingDeviceIndex = -1;
float m_micVolume = 1.0; float m_micVolume = 1.0;
bool m_micMuted = false; bool m_micMuted = false;
bool m_micProximitySensorCanMute = false;
bool m_micReversePtt = false; bool m_micReversePtt = false;
bool m_isDefaultAudioProfile = false; bool m_isDefaultAudioProfile = false;
bool m_isPlaybackOverride = false; bool m_isPlaybackOverride = false;
@@ -129,7 +128,6 @@ public:
void initStage2(); void initStage2();
void reloadAudioSettings(); void reloadAudioSettings();
void saveAudioSettings();
void eventLoopTick(); void eventLoopTick();