New upstream version 19.0.3+dfsg1

This commit is contained in:
Sebastian Ramacher 2017-06-29 21:01:10 +02:00
parent 3708b8e092
commit 1f1bbb3518
534 changed files with 13862 additions and 2459 deletions

View file

@ -62,29 +62,45 @@ void OBSBasic::AddDropSource(const char *data, DropType image)
obs_data_t *settings = obs_data_create();
obs_source_t *source = nullptr;
const char *type = nullptr;
QString name;
switch (image) {
case DropType_RawText:
obs_data_set_string(settings, "text", data);
#ifdef _WIN32
type = "text_gdiplus";
#else
type = "text_ft2_source";
#endif
break;
case DropType_Text:
#ifdef _WIN32
obs_data_set_bool(settings, "read_from_file", true);
obs_data_set_string(settings, "file", data);
name = QUrl::fromLocalFile(QString(data)).fileName();
type = "text_gdiplus";
#else
obs_data_set_bool(settings, "from_file", true);
obs_data_set_string(settings, "text_file", data);
type = "text_ft2_source";
#endif
break;
case DropType_Image:
obs_data_set_string(settings, "file", data);
name = QUrl::fromLocalFile(QString(data)).fileName();
type = "image_source";
break;
case DropType_Media:
obs_data_set_string(settings, "local_file", data);
name = QUrl::fromLocalFile(QString(data)).fileName();
type = "ffmpeg_source";
break;
}
const char *name = obs_source_get_display_name(type);
source = obs_source_create(type, GenerateSourceName(name).c_str(),
if (name.isEmpty())
name = obs_source_get_display_name(type);
source = obs_source_create(type,
GenerateSourceName(QT_TO_UTF8(name)).c_str(),
settings, nullptr);
if (source) {
OBSScene scene = main->GetCurrentScene();