From cdced774e88d4049ac9f3f3810c4c10f6eff43ac Mon Sep 17 00:00:00 2001 From: Norihiro Kamae Date: Tue, 22 Aug 2023 00:47:45 +0900 Subject: [PATCH] Revert "UI: Support DnD overlay in linuxbrowser" This reverts commit aeed4a3aa1b81f154f10d047aad4974a7c293dd0. The source type `browser_source` is now available for all supported platforms so we don't need to fallback to `linuxbrowser-source`. --- UI/window-basic-main-dropfiles.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/UI/window-basic-main-dropfiles.cpp b/UI/window-basic-main-dropfiles.cpp index 20094cc2e..f8d119b33 100644 --- a/UI/window-basic-main-dropfiles.cpp +++ b/UI/window-basic-main-dropfiles.cpp @@ -122,7 +122,6 @@ void OBSBasic::AddDropSource(const char *data, DropType image) OBSBasic *main = reinterpret_cast(App()->GetMainWindow()); OBSDataAutoRelease settings = obs_data_create(); const char *type = nullptr; - std::vector types; QString name; obs_video_info ovi; @@ -165,21 +164,14 @@ void OBSBasic::AddDropSource(const char *data, DropType image) obs_data_set_int(settings, "width", ovi.base_width); obs_data_set_int(settings, "height", ovi.base_height); name = QUrl::fromLocalFile(QString(data)).fileName(); - types = {"browser_source", "linuxbrowser-source"}; + type = "browser_source"; break; case DropType_Url: AddDropURL(data, name, settings, ovi); - types = {"browser_source", "linuxbrowser-source"}; + type = "browser_source"; break; } - for (char const *t : types) { - if (obs_source_get_display_name(t)) { - type = t; - break; - } - } - type = obs_get_latest_input_type_id(type); if (type == nullptr || !obs_source_get_display_name(type)) {