SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert m_chaperoneAlarmSoundLooping to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 54022e0438
commit 3632fc03d5
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/ChaperoneTabController.cpp
+14 -18
View File
@@ -16,8 +16,6 @@ void ChaperoneTabController::initStage1()
.toFloat();
m_chaperoneHapticFeedbackDistance
= settings->value( "chaperoneHapticFeedbackDistance", 0.5f ).toFloat();
m_chaperoneAlarmSoundLooping
= settings->value( "chaperoneAlarmSoundLooping", true ).toBool();
m_chaperoneAlarmSoundAdjustVolume
= settings->value( "chaperoneAlarmSoundAdjustVolume", false ).toBool();
m_chaperoneAlarmSoundDistance
@@ -500,10 +498,10 @@ void ChaperoneTabController::handleChaperoneWarnings( float distance )
{
if ( !m_chaperoneAlarmSoundActive )
{
parent->playAlarm01Sound( m_chaperoneAlarmSoundLooping );
parent->playAlarm01Sound( isChaperoneAlarmSoundLooping() );
m_chaperoneAlarmSoundActive = true;
}
if ( m_chaperoneAlarmSoundLooping
if ( isChaperoneAlarmSoundLooping()
&& m_chaperoneAlarmSoundAdjustVolume )
{
float vol = 1.1f - distance / activationDistance;
@@ -867,7 +865,8 @@ bool ChaperoneTabController::isChaperoneAlarmSoundEnabled() const
bool ChaperoneTabController::isChaperoneAlarmSoundLooping() const
{
return m_chaperoneAlarmSoundLooping;
return settings::getSetting(
settings::BoolSetting::CHAPERONE_chaperoneAlarmSoundLooping );
}
bool ChaperoneTabController::isChaperoneAlarmSoundAdjustVolume() const
@@ -1055,30 +1054,27 @@ void ChaperoneTabController::setChaperoneAlarmSoundEnabled( bool value,
void ChaperoneTabController::setChaperoneAlarmSoundLooping( bool value,
bool notify )
{
if ( m_chaperoneAlarmSoundLooping != value )
if ( isChaperoneAlarmSoundLooping() != value )
{
m_chaperoneAlarmSoundLooping = value;
if ( isChaperoneAlarmSoundEnabled() && m_chaperoneAlarmSoundActive )
{
if ( m_chaperoneAlarmSoundLooping )
if ( isChaperoneAlarmSoundLooping() )
{
parent->playAlarm01Sound( m_chaperoneAlarmSoundLooping );
parent->playAlarm01Sound( isChaperoneAlarmSoundLooping() );
}
else
{
parent->cancelAlarm01Sound();
}
}
auto settings = OverlayController::appSettings();
settings->beginGroup( "chaperoneSettings" );
settings->setValue( "chaperoneAlarmSoundLooping",
m_chaperoneAlarmSoundLooping );
settings->endGroup();
settings->sync();
settings::setSetting(
settings::BoolSetting::CHAPERONE_chaperoneAlarmSoundLooping,
value );
if ( notify )
{
emit chaperoneAlarmSoundLoopingChanged(
m_chaperoneAlarmSoundLooping );
emit chaperoneAlarmSoundLoopingChanged( value );
}
}
}
@@ -1370,7 +1366,7 @@ void ChaperoneTabController::addChaperoneProfile(
profile->chaperoneHapticFeedbackDistance
= m_chaperoneHapticFeedbackDistance;
profile->enableChaperoneAlarmSound = isChaperoneAlarmSoundEnabled();
profile->chaperoneAlarmSoundLooping = m_chaperoneAlarmSoundLooping;
profile->chaperoneAlarmSoundLooping = isChaperoneAlarmSoundLooping();
profile->chaperoneAlarmSoundAdjustVolume
= m_chaperoneAlarmSoundAdjustVolume;
profile->chaperoneAlarmSoundDistance = m_chaperoneAlarmSoundDistance;
src/tabcontrollers/ChaperoneTabController.h
-1
View File
@@ -145,7 +145,6 @@ private:
bool m_chaperoneHapticFeedbackActive = false;
std::thread m_chaperoneHapticFeedbackThread;
bool m_chaperoneAlarmSoundLooping = true;
bool m_chaperoneAlarmSoundAdjustVolume = false;
float m_chaperoneAlarmSoundDistance = 0.5f;
bool m_chaperoneAlarmSoundActive = false;