jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Simplify the OpenProjector logic

Browse Source
This commit is contained in:
Shaolin 2018-02-27 22:08:44 -03:00
parent dd5e3ef3fe
commit d13b4d35a0
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
UI/window-basic-main.cpp
View File

@ -5585,31 +5585,10 @@ void OBSBasic::OpenProjector(obs_source_t *source, int monitor, bool window,
if (monitor > 9 || monitor > QGuiApplication::screens().size() - 1)
return;
if (!window) {
delete projectors[monitor];
projectors[monitor].clear();
RemoveSavedProjectors(monitor);
}
OBSProjector *projector = new OBSProjector(nullptr, source, !!window);
const char *name = obs_source_get_name(source);
if (!window) {
if (type == ProjectorType::StudioProgram) {
studioProgramProjectorArray.at((size_t)monitor) = 1;
} else if (type == ProjectorType::Preview) {
previewProjectorArray.at((size_t)monitor) = 1;
} else if (type == ProjectorType::Multiview) {
multiviewProjectorArray.at((size_t)monitor) = 1;
} else {
projectorArray.at((size_t)monitor) = name;
}
}
if (!window) {
projector->Init(monitor, false, nullptr, type);
projectors[monitor] = projector;
} else {
if (window) {
projector->Init(monitor, true, title, type);
for (auto &projPtr : windowProjectors) {
@ -5621,6 +5600,23 @@ void OBSBasic::OpenProjector(obs_source_t *source, int monitor, bool window,
if (projector)
windowProjectors.push_back(projector);
} else {
delete projectors[monitor];
projectors[monitor].clear();
RemoveSavedProjectors(monitor);
if (type == ProjectorType::StudioProgram) {
studioProgramProjectorArray.at((size_t)monitor) = 1;
} else if (type == ProjectorType::Preview) {
previewProjectorArray.at((size_t)monitor) = 1;
} else if (type == ProjectorType::Multiview) {
multiviewProjectorArray.at((size_t)monitor) = 1;
} else {
projectorArray.at((size_t)monitor) = name;
}
projector->Init(monitor, false, nullptr, type);
projectors[monitor] = projector;
}
}