From a13b901b8842a6dd3e4f7fc4c9f731eec6afb05b Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Mon, 2 Dec 2019 15:25:09 +0100
Subject: [PATCH] Convert m_brightnessValue to new settings API

---
 src/tabcontrollers/VideoTabController.cpp | 13 +++++++------
 src/tabcontrollers/VideoTabController.h   |  1 -
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/tabcontrollers/VideoTabController.cpp b/src/tabcontrollers/VideoTabController.cpp
index 94fab59..8b8b823 100644
--- a/src/tabcontrollers/VideoTabController.cpp
+++ b/src/tabcontrollers/VideoTabController.cpp
@@ -224,7 +224,6 @@ void VideoTabController::reloadVideoConfig()
     settings->beginGroup( getSettingsName() );
     setBrightnessEnabled(
         settings->value( "brightnessEnabled", false ).toBool(), true );
-    m_brightnessValue = settings->value( "brightnessValue", 1.0f ).toFloat();
     setColorOverlayEnabled(
         settings->value( "colorOverlayEnabled", false ).toBool(), true );
     setColorOverlayOpacity(
@@ -246,7 +245,6 @@ void VideoTabController::saveVideoConfig()
     auto settings = OverlayController::appSettings();
     settings->beginGroup( getSettingsName() );
     settings->setValue( "brightnessEnabled", brightnessEnabled() );
-    settings->setValue( "brightnessValue", brightnessValue() );
     settings->setValue( "colorOverlayEnabled", colorOverlayEnabled() );
     settings->setValue( "colorOverlayOpacity", colorOverlayOpacity() );
     settings->setValue( "colorRedNew", colorRed() );
@@ -266,7 +264,8 @@ float VideoTabController::brightnessOpacityValue() const
 
 float VideoTabController::brightnessValue() const
 {
-    return m_brightnessValue;
+    return static_cast<float>( settings::getSetting(
+        settings::DoubleSetting::VIDEO_brightnessValue ) );
 }
 
 bool VideoTabController::brightnessEnabled() const
@@ -319,7 +318,9 @@ void VideoTabController::setBrightnessValue( float percvalue, bool notify )
     if ( fabs( static_cast<double>( realvalue - brightnessOpacityValue() ) )
          > .005 )
     {
-        m_brightnessValue = percvalue;
+        settings::setSetting( settings::DoubleSetting::VIDEO_brightnessValue,
+                              static_cast<double>( percvalue ) );
+
         if ( realvalue <= 1.0f && realvalue >= 0.0f )
         {
             settings::setSetting(
@@ -361,7 +362,7 @@ void VideoTabController::setBrightnessOpacityValue()
                      << vr::VROverlay()->GetOverlayErrorNameFromEnum(
                             overlayError );
     }
-    emit brightnessValueChanged( m_brightnessValue );
+    emit brightnessValueChanged( brightnessValue() );
 }
 
 /*
@@ -874,7 +875,7 @@ void VideoTabController::addVideoProfile( const QString name )
     profile->colorGreen = m_colorGreen;
     profile->colorBlue = m_colorBlue;
     profile->brightnessToggle = m_brightnessEnabled;
-    profile->brightnessValue = m_brightnessValue;
+    profile->brightnessValue = brightnessValue();
     profile->opacity = m_colorOverlayOpacity;
     profile->overlayMethodState = m_isOverlayMethodActive;
 
diff --git a/src/tabcontrollers/VideoTabController.h b/src/tabcontrollers/VideoTabController.h
index 86724a2..aa488a0 100644
--- a/src/tabcontrollers/VideoTabController.h
+++ b/src/tabcontrollers/VideoTabController.h
@@ -82,7 +82,6 @@ private:
 
     vr::VROverlayHandle_t m_colorOverlayHandle = vr::k_ulOverlayHandleInvalid;
 
-    float m_brightnessValue = 1.0f;
     bool m_brightnessEnabled = false;
 
     float m_colorRed = 0.0f;