diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp index dd705dd..daf03eb 100644 --- a/src/tabcontrollers/AudioTabController.cpp +++ b/src/tabcontrollers/AudioTabController.cpp @@ -21,7 +21,7 @@ void AudioTabController::initStage1() audioManager.reset( new AudioManagerDummy() ); #endif audioManager->init( this ); - m_k_audioSettingsUpdateCounter + m_audioSettingsUpdateCounter = utils::adjustUpdateRate( k_audioSettingsUpdateCounter ); initOverride(); m_playbackDevices = audioManager->getPlaybackDevices(); @@ -160,7 +160,7 @@ void AudioTabController::eventLoopTick() return; } - if ( settingsUpdateCounter >= m_k_audioSettingsUpdateCounter ) + if ( settingsUpdateCounter >= m_audioSettingsUpdateCounter ) { vr::EVRSettingsError vrSettingsError; char mirrorDeviceId[1024]; diff --git a/src/tabcontrollers/AudioTabController.h b/src/tabcontrollers/AudioTabController.h index 34eaa0d..a7ae106 100644 --- a/src/tabcontrollers/AudioTabController.h +++ b/src/tabcontrollers/AudioTabController.h @@ -75,7 +75,7 @@ private: bool m_isPlaybackOverride = false; bool m_isRecordingOverride = false; - unsigned int m_k_audioSettingsUpdateCounter = 90; + unsigned int m_audioSettingsUpdateCounter = 90; int m_defaultProfileIndex = -1; diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp index 98b202f..03f98cf 100644 --- a/src/tabcontrollers/ChaperoneTabController.cpp +++ b/src/tabcontrollers/ChaperoneTabController.cpp @@ -15,7 +15,7 @@ void ChaperoneTabController::initStage1() } reloadChaperoneProfiles(); - m_k_chaperoneSettingsUpdateCounter + m_chaperoneSettingsUpdateCounter = utils::adjustUpdateRate( k_chaperoneSettingsUpdateCounter ); eventLoopTick( nullptr ); } @@ -618,7 +618,7 @@ void ChaperoneTabController::eventLoopTick( } } - if ( settingsUpdateCounter >= m_k_chaperoneSettingsUpdateCounter ) + if ( settingsUpdateCounter >= m_chaperoneSettingsUpdateCounter ) { if ( parent->isDashboardVisible() ) { diff --git a/src/tabcontrollers/ChaperoneTabController.h b/src/tabcontrollers/ChaperoneTabController.h index 81c99db..ce5edd8 100644 --- a/src/tabcontrollers/ChaperoneTabController.h +++ b/src/tabcontrollers/ChaperoneTabController.h @@ -159,7 +159,7 @@ private: int m_updateTicksChaperoneReload = 0; - unsigned int m_k_chaperoneSettingsUpdateCounter = 101; + unsigned int m_chaperoneSettingsUpdateCounter = 101; vr::VRActionHandle_t m_rightActionHandle; vr::VRActionHandle_t m_leftActionHandle; diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp index 392cfa0..535a714 100644 --- a/src/tabcontrollers/MoveCenterTabController.cpp +++ b/src/tabcontrollers/MoveCenterTabController.cpp @@ -40,7 +40,7 @@ namespace advsettings void MoveCenterTabController::initStage1() { reloadOffsetProfiles(); - m_k_moveCenterSettingsUpdateCounter + m_moveCenterSettingsUpdateCounter = utils::adjustUpdateRate( k_moveCenterSettingsUpdateCounter ); m_lastDragUpdateTimePoint = std::chrono::steady_clock::now(); m_lastGravityUpdateTimePoint = std::chrono::steady_clock::now(); diff --git a/src/tabcontrollers/MoveCenterTabController.h b/src/tabcontrollers/MoveCenterTabController.h index 24f5f0a..e8478f8 100644 --- a/src/tabcontrollers/MoveCenterTabController.h +++ b/src/tabcontrollers/MoveCenterTabController.h @@ -168,7 +168,7 @@ private: unsigned m_dragComfortFrameSkipCounter = 0; unsigned m_turnComfortFrameSkipCounter = 0; - unsigned int m_k_moveCenterSettingsUpdateCounter = 83; + unsigned int m_moveCenterSettingsUpdateCounter = 83; double m_velocity[3] = { 0.0, 0.0, 0.0 }; std::chrono::steady_clock::time_point m_lastGravityUpdateTimePoint; diff --git a/src/tabcontrollers/SettingsTabController.cpp b/src/tabcontrollers/SettingsTabController.cpp index d85d0fb..beafc74 100644 --- a/src/tabcontrollers/SettingsTabController.cpp +++ b/src/tabcontrollers/SettingsTabController.cpp @@ -9,7 +9,7 @@ void SettingsTabController::initStage1() { m_autoStartEnabled = vr::VRApplications()->GetApplicationAutoLaunch( application_strings::applicationKey ); - m_k_settingsTabSettingsUpdateCounter + m_settingsTabSettingsUpdateCounter = utils::adjustUpdateRate( k_settingsTabSettingsUpdateCounter ); } @@ -20,7 +20,7 @@ void SettingsTabController::initStage2( OverlayController* var_parent ) void SettingsTabController::dashboardLoopTick() { - if ( settingsUpdateCounter >= m_k_settingsTabSettingsUpdateCounter ) + if ( settingsUpdateCounter >= m_settingsTabSettingsUpdateCounter ) { setAutoStartEnabled( vr::VRApplications()->GetApplicationAutoLaunch( application_strings::applicationKey ) ); diff --git a/src/tabcontrollers/SettingsTabController.h b/src/tabcontrollers/SettingsTabController.h index 8795616..b3d1cbc 100644 --- a/src/tabcontrollers/SettingsTabController.h +++ b/src/tabcontrollers/SettingsTabController.h @@ -24,7 +24,7 @@ private: bool m_autoStartEnabled = false; - unsigned int m_k_settingsTabSettingsUpdateCounter = 157; + unsigned int m_settingsTabSettingsUpdateCounter = 157; public: void initStage1(); diff --git a/src/tabcontrollers/SteamVRTabController.cpp b/src/tabcontrollers/SteamVRTabController.cpp index 9ff2e18..70b15e8 100644 --- a/src/tabcontrollers/SteamVRTabController.cpp +++ b/src/tabcontrollers/SteamVRTabController.cpp @@ -7,7 +7,7 @@ namespace advsettings { void SteamVRTabController::initStage1() { - m_k_steamVrSettingsUpdateCounter + m_steamVrSettingsUpdateCounter = utils::adjustUpdateRate( k_steamVrSettingsUpdateCounter ); dashboardLoopTick(); } @@ -19,7 +19,7 @@ void SteamVRTabController::initStage2( OverlayController* var_parent ) void SteamVRTabController::dashboardLoopTick() { - if ( settingsUpdateCounter >= m_k_steamVrSettingsUpdateCounter ) + if ( settingsUpdateCounter >= m_steamVrSettingsUpdateCounter ) { vr::EVRSettingsError vrSettingsError; diff --git a/src/tabcontrollers/SteamVRTabController.h b/src/tabcontrollers/SteamVRTabController.h index d9ee953..f47474b 100644 --- a/src/tabcontrollers/SteamVRTabController.h +++ b/src/tabcontrollers/SteamVRTabController.h @@ -51,7 +51,7 @@ private: unsigned settingsUpdateCounter = 0; - unsigned int m_k_steamVrSettingsUpdateCounter = 97; + unsigned int m_steamVrSettingsUpdateCounter = 97; public: void initStage1(); diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp index c3ad757..91fa32f 100644 --- a/src/tabcontrollers/UtilitiesTabController.cpp +++ b/src/tabcontrollers/UtilitiesTabController.cpp @@ -19,7 +19,7 @@ void UtilitiesTabController::initStage1() m_alarmTime = QTime( qAlarmHour, qAlarmMinute ); - m_k_utilitiesSettingsUpdateCounter + m_utilitiesSettingsUpdateCounter = utils::adjustUpdateRate( k_utilitiesSettingsUpdateCounter ); } @@ -429,7 +429,7 @@ vr::VROverlayHandle_t createBatteryOverlay( vr::TrackedDeviceIndex_t index ) void UtilitiesTabController::eventLoopTick() { - if ( settingsUpdateCounter >= m_k_utilitiesSettingsUpdateCounter ) + if ( settingsUpdateCounter >= m_utilitiesSettingsUpdateCounter ) { if ( alarmEnabled() && m_alarmTime.isValid() ) { diff --git a/src/tabcontrollers/UtilitiesTabController.h b/src/tabcontrollers/UtilitiesTabController.h index e2d92f9..5106173 100644 --- a/src/tabcontrollers/UtilitiesTabController.h +++ b/src/tabcontrollers/UtilitiesTabController.h @@ -43,7 +43,7 @@ private: int m_batteryState[vr::k_unMaxTrackedDeviceCount]; bool m_batteryVisible[vr::k_unMaxTrackedDeviceCount]; - unsigned int m_k_utilitiesSettingsUpdateCounter = 19; + unsigned int m_utilitiesSettingsUpdateCounter = 19; public: void initStage1();