From 1206870ceffcefa243b0b28cc37a4758f17a5fbd Mon Sep 17 00:00:00 2001 From: derrod Date: Tue, 19 Dec 2023 02:56:46 +0100 Subject: [PATCH] UI: Remove FTL support --- UI/window-basic-auto-config-test.cpp | 3 --- UI/window-basic-main-outputs.cpp | 1 - UI/window-basic-main.cpp | 5 ++--- UI/window-basic-settings-stream.cpp | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/UI/window-basic-auto-config-test.cpp b/UI/window-basic-auto-config-test.cpp index 904875783..d93a6a113 100644 --- a/UI/window-basic-auto-config-test.cpp +++ b/UI/window-basic-auto-config-test.cpp @@ -228,9 +228,6 @@ void AutoConfigTestPage::TestBandwidthThread() wiz->serviceName == "Restream.io - RTMP") { string_depad_key(key); key += "?test=true"; - } else if (wiz->serviceName == "Restream.io - FTL") { - string_depad_key(key); - key += "?test"; } obs_data_set_string(service_settings, "service", diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp index 9e644e90a..eee1b352f 100644 --- a/UI/window-basic-main-outputs.cpp +++ b/UI/window-basic-main-outputs.cpp @@ -20,7 +20,6 @@ volatile bool recording_paused = false; volatile bool replaybuf_active = false; volatile bool virtualcam_active = false; -#define FTL_PROTOCOL "ftl" #define RTMP_PROTOCOL "rtmp" #define SRT_PROTOCOL "srt" #define RIST_PROTOCOL "rist" diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 20e2d01a7..3cbcd99af 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -1501,9 +1501,8 @@ bool OBSBasic::LoadService() if (!service) return false; - /* Enforce Opus on FTL if needed */ - if (strcmp(obs_service_get_protocol(service), "FTL") == 0 || - strcmp(obs_service_get_protocol(service), "WHIP") == 0) { + /* Enforce Opus on WHIP if needed */ + if (strcmp(obs_service_get_protocol(service), "WHIP") == 0) { const char *option = config_get_string( basicConfig, "SimpleOutput", "StreamAudioEncoder"); if (strcmp(option, "opus") != 0) diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp index 881e1d542..3aa7bb57b 100644 --- a/UI/window-basic-settings-stream.cpp +++ b/UI/window-basic-settings-stream.cpp @@ -746,9 +746,6 @@ QString OBSBasicSettings::FindProtocol() server.startsWith("rtmps://")) return QString("RTMPS"); - if (server.startsWith("ftl://")) - return QString("FTL"); - if (server.startsWith("srt://")) return QString("SRT");