4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Move reconnect options to advanced settings

Browse source 
This is mostly just to remove the unnecessary clutter from the output
sections.  The reconnect settings are generally rarely modified by users
as it is.
This commit is contained in:
jp9000 2015-09-10 19:10:40 -07:00
commit a4f8d18948
5 changed files with 288 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

12
obs/window-basic-main-outputs.cpp
View file

@ -237,11 +237,11 @@ bool SimpleOutput::StartStreaming(obs_service_t *service)
obs_output_set_audio_encoder(streamOutput, aac, 0);
obs_output_set_service(streamOutput, service);
bool reconnect = config_get_bool(main->Config(), "SimpleOutput",
bool reconnect = config_get_bool(main->Config(), "Output",
"Reconnect");
int retryDelay = config_get_uint(main->Config(), "SimpleOutput",
int retryDelay = config_get_uint(main->Config(), "Output",
"RetryDelay");
int maxRetries = config_get_uint(main->Config(), "SimpleOutput",
int maxRetries = config_get_uint(main->Config(), "Output",
"MaxRetries");
bool useDelay = config_get_bool(main->Config(), "Output",
"DelayEnable");
@ -735,9 +735,9 @@ bool AdvancedOutput::StartStreaming(obs_service_t *service)
obs_output_set_service(streamOutput, service);
bool reconnect = config_get_bool(main->Config(), "AdvOut", "Reconnect");
int retryDelay = config_get_int(main->Config(), "AdvOut", "RetryDelay");
int maxRetries = config_get_int(main->Config(), "AdvOut", "MaxRetries");
bool reconnect = config_get_bool(main->Config(), "Output", "Reconnect");
int retryDelay = config_get_int(main->Config(), "Output", "RetryDelay");
int maxRetries = config_get_int(main->Config(), "Output", "MaxRetries");
bool useDelay = config_get_bool(main->Config(), "Output",
"DelayEnable");
int delaySec = config_get_int(main->Config(), "Output",