jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Allow enabling vod track on custom via ini

Browse Source
This commit is contained in:
jp9000 2020-12-03 01:31:32 -08:00
parent eac66d773c
commit 7a17f47d8a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
UI/window-basic-main-outputs.cpp
View File

@ -869,13 +869,15 @@ void SimpleOutput::SetupVodTrack(obs_service_t *service)
config_get_bool(main->Config(), "SimpleOutput", "UseAdvanced");
bool enable = config_get_bool(main->Config(), "SimpleOutput",
"VodTrackEnabled");
bool enableForCustomServer = config_get_bool(
GetGlobalConfig(), "General", "EnableCustomServerVodTrack");
obs_data_t *settings = obs_service_get_settings(service);
const char *name = obs_data_get_string(settings, "service");
const char *id = obs_service_get_id(service);
if (strcmp(id, "rtmp_custom") == 0)
enable = false;
enable = enableForCustomServer ? enable : false;
else
enable = advanced && enable && ServiceSupportsVodTrack(name);
@ -1635,10 +1637,13 @@ inline void AdvancedOutput::SetupVodTrack(obs_service_t *service)
config_get_bool(main->Config(), "AdvOut", "VodTrackEnabled");
int vodTrackIndex =
config_get_int(main->Config(), "AdvOut", "VodTrackIndex");
bool enableForCustomServer = config_get_bool(
GetGlobalConfig(), "General", "EnableCustomServerVodTrack");
const char *id = obs_service_get_id(service);
if (strcmp(id, "rtmp_custom") == 0) {
vodTrackEnabled = false;
vodTrackEnabled = enableForCustomServer ? vodTrackEnabled
: false;
} else {
obs_data_t *settings = obs_service_get_settings(service);
const char *service = obs_data_get_string(settings, "service");

5
UI/window-basic-settings-stream.cpp
View File

@ -619,9 +619,14 @@ void OBSBasicSettings::on_useAuth_toggled()
void OBSBasicSettings::UpdateVodTrackSetting()
{
bool enableForCustomServer = config_get_bool(
GetGlobalConfig(), "General", "EnableCustomServerVodTrack");
bool enableVodTrack = ui->service->currentText() == "Twitch";
bool wasEnabled = !!vodTrackCheckbox;
if (enableForCustomServer && IsCustomService())
enableVodTrack = true;
if (enableVodTrack == wasEnabled)
return;