OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Add ability to drop html files

Browse source 
(Edit by Jim: Added a check to make sure that the browser source exists
due to the fact that it's technically optional)

Closes jp9000/obs-studio#905
This commit is contained in:
mntone 2017-05-05 16:32:51 +09:00 committed by jp9000
parent 41c2f5e13b
commit d70c97db3a
2 changed files with 34 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
UI/window-basic-main-dropfiles.cpp
View file

@ -19,6 +19,10 @@ static const char *imageExtensions[] = {
"bmp", "tga", "png", "jpg", "jpeg", "gif", nullptr
};
static const char *htmlExtensions[] = {
"htm", "html", nullptr
};
static const char *mediaExtensions[] = {
"3ga", "669", "a52", "aac", "ac3", "adt", "adts", "aif", "aifc",
"aiff", "amb", "amr", "aob", "ape", "au", "awb", "caf", "dts",
@ -95,8 +99,17 @@ void OBSBasic::AddDropSource(const char *data, DropType image)
name = QUrl::fromLocalFile(QString(data)).fileName();
type = "ffmpeg_source";
break;
case DropType_Html:
obs_data_set_bool(settings, "is_local_file", true);
obs_data_set_string(settings, "local_file", data);
name = QUrl::fromLocalFile(QString(data)).fileName();
type = "browser_source";
break;
}
if (!obs_source_get_display_name(type))
return;
if (name.isEmpty())
name = obs_source_get_display_name(type);
source = obs_source_create(type,
@ -147,46 +160,27 @@ void OBSBasic::dropEvent(QDropEvent *event)
const char **cmp;
cmp = textExtensions;
while (*cmp) {
if (strcmp(*cmp, suffix) == 0) {
AddDropSource(QT_TO_UTF8(file),
DropType_Text);
found = true;
break;
}
#define CHECK_SUFFIX(extensions, type) \
cmp = extensions; \
while (*cmp) { \
if (strcmp(*cmp, suffix) == 0) { \
AddDropSource(QT_TO_UTF8(file), type); \
found = true; \
break; \
} \
\
cmp++; \
} \
\
if (found) \
continue;
cmp++;
}
CHECK_SUFFIX(textExtensions, DropType_Text);
CHECK_SUFFIX(htmlExtensions, DropType_Html);
CHECK_SUFFIX(imageExtensions, DropType_Image);
CHECK_SUFFIX(mediaExtensions, DropType_Media);
if (found)
continue;
cmp = imageExtensions;
while (*cmp) {
if (strcmp(*cmp, suffix) == 0) {
AddDropSource(QT_TO_UTF8(file),
DropType_Image);
found = true;
break;
}
cmp++;
}
if (found)
continue;
cmp = mediaExtensions;
while (*cmp) {
if (strcmp(*cmp, suffix) == 0) {
AddDropSource(QT_TO_UTF8(file),
DropType_Media);
break;
}
cmp++;
}
#undef CHECK_SUFFIX
}
} else if (mimeData->hasText()) {
AddDropSource(QT_TO_UTF8(mimeData->text()), DropType_RawText);

3
UI/window-basic-main.hpp
View file

@ -102,7 +102,8 @@ class OBSBasic : public OBSMainWindow {
DropType_RawText,
DropType_Text,
DropType_Image,
DropType_Media
DropType_Media,
DropType_Html
};
private: