From e151ce6f2a144a0c2d0ff226682970597b68c639 Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Tue, 8 Oct 2019 04:21:19 -0500 Subject: [PATCH] UI: Change advanced networking strings --- UI/data/locale/en-US.ini | 5 +++-- UI/window-basic-settings.cpp | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini index 634f533d0..dcdc28613 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini @@ -848,8 +848,9 @@ Basic.Settings.Advanced.StreamDelay.Preserve="Preserve cutoff point (increase de Basic.Settings.Advanced.StreamDelay.MemoryUsage="Estimated Memory Usage: %1 MB" Basic.Settings.Advanced.Network="Network" Basic.Settings.Advanced.Network.BindToIP="Bind to IP" -Basic.Settings.Advanced.Network.EnableNewSocketLoop="Enable new networking code" -Basic.Settings.Advanced.Network.EnableLowLatencyMode="Low latency mode" +Basic.Settings.Advanced.Network.EnableNewSocketLoop="Enable network optimizations" +Basic.Settings.Advanced.Network.EnableLowLatencyMode="Enable TCP pacing" +Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Attempts to make RTMP output friendlier to other latency sensitive applications on the network by regulating the rate of transmission.\nIt may increase the risk of dropped frames on unstable connections." Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="Hotkey Focus Behavior" Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Never disable hotkeys" Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Disable hotkeys when main window is in focus" diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 5dae7b6ba..08cf50671 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -2365,6 +2365,8 @@ void OBSBasicSettings::LoadAdvancedSettings() ui->enableNewSocketLoop->setChecked(enableNewSocketLoop); ui->enableLowLatencyMode->setChecked(enableLowLatencyMode); + ui->enableLowLatencyMode->setToolTip( + QTStr("Basic.Settings.Advanced.Network.TCPPacing.Tooltip")); bool browserHWAccel = config_get_bool(App()->GlobalConfig(), "General", "BrowserHWAccel");