From 7a17f47d8aa9c8bca1b5e2dd90a93992dfe7677f Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 3 Dec 2020 01:31:32 -0800 Subject: [PATCH] UI: Allow enabling vod track on custom via ini --- UI/window-basic-main-outputs.cpp | 9 +++++++-- UI/window-basic-settings-stream.cpp | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp index b1884c0b..69f247c1 100644 --- a/UI/window-basic-main-outputs.cpp +++ b/UI/window-basic-main-outputs.cpp @@ -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"); diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp index 133d9351..2189ed5a 100644 --- a/UI/window-basic-settings-stream.cpp +++ b/UI/window-basic-settings-stream.cpp @@ -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; -- GitLab