mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-07-21 04:35:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Clean up OBSProjector creation

Browse Source
This commit is contained in:
Shaolin
2018-02-28 23:34:11 -03:00
parent 372640ff35
commit 8b6641d1a8
4 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5448,19 +5448,17 @@ void OBSBasic::NudgeDown() {Nudge(1, MoveDir::Down);}
void OBSBasic::NudgeLeft() {Nudge(1, MoveDir::Left);}
void OBSBasic::NudgeRight() {Nudge(1, MoveDir::Right);}
void OBSBasic::OpenProjector(obs_source_t *source, int monitor, QString title,
ProjectorType type)
OBSProjector *OBSBasic::OpenProjector(obs_source_t *source, int monitor,
QString title, ProjectorType type)
{
/* seriously? 10 monitors? */
if (monitor > 9 || monitor > QGuiApplication::screens().size() - 1)
return;
return nullptr;
OBSProjector *projector = new OBSProjector(nullptr, source,
title != nullptr);
if (title != nullptr) {
projector->Init(monitor, true, title, type);
OBSProjector *projector = new OBSProjector(nullptr, source, monitor,
title, type);
if (monitor < 0) {
for (auto &projPtr : windowProjectors) {
if (!projPtr) {
projPtr = projector;
@@ -5474,9 +5472,11 @@ void OBSBasic::OpenProjector(obs_source_t *source, int monitor, QString title,
delete projectors[monitor];
projectors[monitor].clear();
projector->Init(monitor, false, nullptr, type);
projectors[monitor] = projector;
}
projector->Init();
return projector;
}
void OBSBasic::OpenStudioProgramProjector()
@@ -5498,7 +5498,8 @@ void OBSBasic::OpenSourceProjector()
if (!item)
return;
OpenProjector(obs_sceneitem_get_source(item), monitor, nullptr);
OpenProjector(obs_sceneitem_get_source(item), monitor, nullptr,
ProjectorType::Source);
}
void OBSBasic::OpenMultiviewProjector()
@@ -5520,47 +5521,46 @@ void OBSBasic::OpenSceneProjector()
void OBSBasic::OpenStudioProgramWindow()
{
int monitor = sender()->property("monitor").toInt();
QString title = QTStr("StudioProgramWindow");
OpenProjector(nullptr, monitor, title, ProjectorType::StudioProgram);
OpenProjector(nullptr, -1, QTStr("StudioProgramWindow"),
ProjectorType::StudioProgram);
}
void OBSBasic::OpenPreviewWindow()
{
int monitor = sender()->property("monitor").toInt();
QString title = QTStr("PreviewWindow");
OpenProjector(nullptr, monitor, title, ProjectorType::Preview);
OpenProjector(nullptr, -1, QTStr("PreviewWindow"),
ProjectorType::Preview);
}
void OBSBasic::OpenSourceWindow()
{
int monitor = sender()->property("monitor").toInt();
OBSSceneItem item = GetCurrentSceneItem();
if (!item)
return;
OBSSource source = obs_sceneitem_get_source(item);
QString title = QString::fromUtf8(obs_source_get_name(source));
OpenProjector(obs_sceneitem_get_source(item), monitor, title);
OpenProjector(obs_sceneitem_get_source(item), -1, title,
ProjectorType::Source);
}
void OBSBasic::OpenMultiviewWindow()
{
int monitor = sender()->property("monitor").toInt();
QString title = QTStr("MultiviewWindowed");
OpenProjector(nullptr, monitor, title, ProjectorType::Multiview);
OpenProjector(nullptr, -1, QTStr("MultiviewWindowed"),
ProjectorType::Multiview);
}
void OBSBasic::OpenSceneWindow()
{
int monitor = sender()->property("monitor").toInt();
OBSScene scene = GetCurrentScene();
if (!scene)
return;
OBSSource source = obs_scene_get_source(scene);
QString title = QString::fromUtf8(obs_source_get_name(source));
OpenProjector(obs_scene_get_source(scene), monitor, title);
OpenProjector(obs_scene_get_source(scene), -1, title,
ProjectorType::Scene);
}
void OBSBasic::OpenSavedProjectors()