diff --git a/src/tabcontrollers/VideoTabController.cpp b/src/tabcontrollers/VideoTabController.cpp index 0c9a65e..aa4a501 100644 --- a/src/tabcontrollers/VideoTabController.cpp +++ b/src/tabcontrollers/VideoTabController.cpp @@ -224,8 +224,7 @@ void VideoTabController::reloadVideoConfig() settings->beginGroup( getSettingsName() ); setBrightnessEnabled( brightnessEnabled(), true ); setColorOverlayEnabled( colorOverlayEnabled(), true ); - setIsOverlayMethodActive( - settings->value( "isOverlayMethodActive", false ).toBool(), true ); + setIsOverlayMethodActive( isOverlayMethodActive(), true ); setColorRed( colorRed() ); setColorGreen( colorGreen() ); setColorBlue( colorBlue() ); @@ -236,16 +235,6 @@ void VideoTabController::reloadVideoConfig() settings->sync(); } -void VideoTabController::saveVideoConfig() -{ - auto settings = OverlayController::appSettings(); - settings->beginGroup( getSettingsName() ); - settings->setValue( "isOverlayMethodActive", isOverlayMethodActive() ); - - settings->endGroup(); - settings->sync(); -} - float VideoTabController::brightnessOpacityValue() const { return static_cast( settings::getSetting( @@ -328,8 +317,6 @@ void VideoTabController::setBrightnessValue( float percvalue, bool notify ) << vr::VROverlay()->GetOverlayErrorNameFromEnum( overlayError ); } - // only saves if opacity Value is valid. [1-0] - saveVideoConfig(); } else { @@ -398,7 +385,8 @@ float VideoTabController::colorBlue() const bool VideoTabController::isOverlayMethodActive() const { - return m_isOverlayMethodActive; + return settings::getSetting( + settings::BoolSetting::VIDEO_isOverlayMethodActive ); } // setters @@ -406,7 +394,9 @@ bool VideoTabController::isOverlayMethodActive() const void VideoTabController::setIsOverlayMethodActive( bool value, bool notify ) { resetGain(); - m_isOverlayMethodActive = value; + settings::setSetting( settings::BoolSetting::VIDEO_isOverlayMethodActive, + value ); + if ( value ) { setColorOverlayEnabled( colorOverlayEnabled(), true, false ); @@ -417,7 +407,6 @@ void VideoTabController::setIsOverlayMethodActive( bool value, bool notify ) } setColor( colorRed(), colorGreen(), colorBlue(), true, true ); - saveVideoConfig(); if ( notify ) { emit isOverlayMethodActiveChanged( value ); @@ -879,7 +868,7 @@ void VideoTabController::addVideoProfile( const QString name ) profile->brightnessToggle = brightnessEnabled(); profile->brightnessValue = brightnessValue(); profile->opacity = colorOverlayOpacity(); - profile->overlayMethodState = m_isOverlayMethodActive; + profile->overlayMethodState = isOverlayMethodActive(); saveVideoProfiles(); OverlayController::appSettings()->sync(); diff --git a/src/tabcontrollers/VideoTabController.h b/src/tabcontrollers/VideoTabController.h index 61397a4..6a4b53a 100644 --- a/src/tabcontrollers/VideoTabController.h +++ b/src/tabcontrollers/VideoTabController.h @@ -83,7 +83,6 @@ private: vr::VROverlayHandle_t m_colorOverlayHandle = vr::k_ulOverlayHandleInvalid; bool m_overlayInit = false; - bool m_isOverlayMethodActive = false; float m_superSampling = 1.0; bool m_allowSupersampleOverride = false; @@ -104,7 +103,6 @@ private: void loadColorOverlay(); void reloadVideoConfig(); - void saveVideoConfig(); void setBrightnessOpacityValue(); void initBrightnessOverlay();