Skip to content

Commit eec55e6

Browse files
committed
ui: Remember on-screen joystick setting
Saves and restore the state of the on-screen joystick in the config file Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
1 parent 6d42a90 commit eec55e6

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/ptz-controls.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ void PTZControls::SaveConfig()
506506
obs_data_set_bool(savedata, "live_moves_disabled", liveMovesDisabled());
507507
obs_data_set_bool(savedata, "autoselect_enabled", autoselectEnabled());
508508
obs_data_set_bool(savedata, "speed_ramp_enabled", speedRampEnabled());
509+
obs_data_set_bool(savedata, "onscreen_joystick_enabled", ui->pantiltStack->currentIndex() != 0);
509510
obs_data_set_bool(savedata, "joystick_enable", m_joystick_enable);
510511
obs_data_set_int(savedata, "joystick_id", m_joystick_id);
511512
obs_data_set_double(savedata, "joystick_speed", m_joystick_speed);
@@ -576,6 +577,7 @@ void PTZControls::LoadConfig()
576577
obs_data_set_default_bool(loaddata, "live_moves_disabled", true);
577578
obs_data_set_default_bool(loaddata, "autoselect_enabled", true);
578579
obs_data_set_default_bool(loaddata, "speed_ramp_enabled", true);
580+
obs_data_set_default_bool(loaddata, "onscreen_joystick_enabled", false);
579581
obs_data_set_default_bool(loaddata, "joystick_enable", false);
580582
obs_data_set_default_int(loaddata, "joystick_id", -1);
581583
obs_data_set_default_double(loaddata, "joystick_speed", 1.0);
@@ -584,6 +586,7 @@ void PTZControls::LoadConfig()
584586
live_moves_disabled = obs_data_get_bool(loaddata, "live_moves_disabled");
585587
autoselect_enabled = obs_data_get_bool(loaddata, "autoselect_enabled");
586588
speed_ramp_enabled = obs_data_get_bool(loaddata, "speed_ramp_enabled");
589+
ui->pantiltStack->setCurrentIndex(obs_data_get_bool(loaddata, "onscreen_joystick_enabled") ? 1 : 0);
587590
m_joystick_enable = obs_data_get_bool(loaddata, "joystick_enable");
588591
m_joystick_id = (int)obs_data_get_int(loaddata, "joystick_id");
589592
m_joystick_speed = obs_data_get_double(loaddata, "joystick_speed");

0 commit comments

Comments
 (0)