starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-25 17:02:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2317 from kkartaltepe/fallback-sources-dnd

Browse Source 
UI: Support URL/web DnD in linuxbrowser
This commit is contained in:
Jim
2020-01-15 15:55:14 -08:00
committed by GitHub
parent 14f73c92ed aeed4a3aa1
commit 36d3a1e3c4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main-dropfiles.cpp
+10 -3
View File
@@ -91,6 +91,7 @@ void OBSBasic::AddDropSource(const char *data, DropType image)
obs_data_t *settings = obs_data_create();
obs_source_t *source = nullptr;
const char *type = nullptr;
std::vector<const char *> types;
QString name;
obs_video_info ovi;
@@ -133,15 +134,21 @@ 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();
type = "browser_source";
types = {"browser_source", "linuxbrowser-source"};
break;
case DropType_Url:
AddDropURL(data, name, settings, ovi);
type = "browser_source";
types = {"browser_source", "linuxbrowser-source"};
break;
}
if (!obs_source_get_display_name(type)) {
for (char const *t : types) {
if (obs_source_get_display_name(t)) {
type = t;
break;
}
}
if (type == nullptr || !obs_source_get_display_name(type)) {
obs_data_release(settings);
return;
}