diff --git a/frontend/utility/AdvancedOutput.cpp b/frontend/utility/AdvancedOutput.cpp index 8013fec69..2a2451bb7 100644 --- a/frontend/utility/AdvancedOutput.cpp +++ b/frontend/utility/AdvancedOutput.cpp @@ -689,7 +689,7 @@ bool AdvancedOutput::StartStreaming(obs_service_t *service) bool enableDynBitrate = config_get_bool(main->Config(), "Output", "DynamicBitrate"); if (multitrackVideo && multitrackVideoActive && - !multitrackVideo->HandleIncompatibleSettings(main, main->Config(), service, useDelay, enableNewSocketLoop, + !multitrackVideo->HandleIncompatibleSettings(main, main->Config(), service, enableNewSocketLoop, enableDynBitrate)) { multitrackVideoActive = false; return false; diff --git a/frontend/utility/MultitrackVideoOutput.cpp b/frontend/utility/MultitrackVideoOutput.cpp index 5d8f6bbac..cface4162 100644 --- a/frontend/utility/MultitrackVideoOutput.cpp +++ b/frontend/utility/MultitrackVideoOutput.cpp @@ -545,8 +545,7 @@ void MultitrackVideoOutput::StopStreaming() } bool MultitrackVideoOutput::HandleIncompatibleSettings(QWidget *parent, config_t *config, obs_service_t *service, - bool &useDelay, bool &enableNewSocketLoop, - bool &enableDynBitrate) + bool &enableNewSocketLoop, bool &enableDynBitrate) { QString incompatible_settings; QString where_to_disable; @@ -571,7 +570,6 @@ bool MultitrackVideoOutput::HandleIncompatibleSettings(QWidget *parent, config_t num += 1; }; - check_setting(useDelay, "Basic.Settings.Advanced.StreamDelay", "Basic.Settings.Advanced.StreamDelay"); #ifdef _WIN32 check_setting(enableNewSocketLoop, "Basic.Settings.Advanced.Network.EnableNewSocketLoop", "Basic.Settings.Advanced.Network"); @@ -611,12 +609,10 @@ bool MultitrackVideoOutput::HandleIncompatibleSettings(QWidget *parent, config_t incompatible_settings_list.toUtf8().constData(), action); if (mb.clickedButton() == this_stream || mb.clickedButton() == all_streams) { - useDelay = false; enableNewSocketLoop = false; enableDynBitrate = false; if (mb.clickedButton() == all_streams) { - config_set_bool(config, "Output", "DelayEnable", false); #ifdef _WIN32 config_set_bool(config, "Output", "NewSocketLoopEnable", false); #endif diff --git a/frontend/utility/MultitrackVideoOutput.hpp b/frontend/utility/MultitrackVideoOutput.hpp index 60f98356c..971a13c65 100644 --- a/frontend/utility/MultitrackVideoOutput.hpp +++ b/frontend/utility/MultitrackVideoOutput.hpp @@ -31,7 +31,7 @@ public: signal_handler_t *StreamingSignalHandler(); void StartedStreaming(); void StopStreaming(); - bool HandleIncompatibleSettings(QWidget *parent, config_t *config, obs_service_t *service, bool &useDelay, + bool HandleIncompatibleSettings(QWidget *parent, config_t *config, obs_service_t *service, bool &enableNewSocketLoop, bool &enableDynBitrate); OBSOutputAutoRelease StreamingOutput() diff --git a/frontend/utility/SimpleOutput.cpp b/frontend/utility/SimpleOutput.cpp index 082e8f71d..b6605c83c 100644 --- a/frontend/utility/SimpleOutput.cpp +++ b/frontend/utility/SimpleOutput.cpp @@ -680,7 +680,7 @@ bool SimpleOutput::StartStreaming(obs_service_t *service) bool enableDynBitrate = config_get_bool(main->Config(), "Output", "DynamicBitrate"); if (multitrackVideo && multitrackVideoActive && - !multitrackVideo->HandleIncompatibleSettings(main, main->Config(), service, useDelay, enableNewSocketLoop, + !multitrackVideo->HandleIncompatibleSettings(main, main->Config(), service, enableNewSocketLoop, enableDynBitrate)) { multitrackVideoActive = false; return false;