Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-07 01:35:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add preview scene support

Browse Source
This commit is contained in:
WarmUpTill 2022-09-28 14:06:24 +02:00 committed by WarmUpTill
parent 5f8641b18a
commit cdefbf383c
2 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/utils/scene-selection.cpp
View File

@ -73,6 +73,8 @@ void SceneSelection::Load(obs_data_t *obj, const char *name,
break;
case Type::CURRENT:
break;
case Type::PREVIEW:
break;
case Type::VARIABLE:
_variable = GetWeakVariableByName(targetName);
break;
@ -99,6 +101,13 @@ OBSWeakSource SceneSelection::GetScene(bool advance) const
return switcher->previousScene;
case Type::CURRENT:
return switcher->currentScene;
case Type::PREVIEW: {
auto s = obs_frontend_get_current_preview_scene();
auto scene = obs_source_get_weak_source(s);
obs_weak_source_release(scene);
obs_source_release(s);
return scene;
}
case Type::VARIABLE: {
auto var = _variable.lock();
if (!var) {
@ -126,6 +135,8 @@ std::string SceneSelection::ToString() const
return obs_module_text("AdvSceneSwitcher.selectPreviousScene");
case Type::CURRENT:
return obs_module_text("AdvSceneSwitcher.selectCurrentScene");
case Type::PREVIEW:
return obs_module_text("AdvSceneSwitcher.selectPreviewScene");
case Type::VARIABLE: {
auto var = _variable.lock();
if (!var) {
@ -145,13 +156,16 @@ SceneSelection SceneSelectionWidget::CurrentSelection()
const int idx = currentIndex();
const auto name = currentText();
if (idx < _orderEndIdx) {
if (idx < _placeholderEndIdx) {
if (IsCurrentSceneSelected(name)) {
s._type = SceneSelection::Type::CURRENT;
}
if (IsPreviousSceneSelected(name)) {
s._type = SceneSelection::Type::PREVIOUS;
}
if (IsPreviewSceneSelected(name)) {
s._type = SceneSelection::Type::PREVIEW;
}
} else if (idx < _variablesEndIdx) {
s._type = SceneSelection::Type::VARIABLE;
s._variable = GetWeakVariableByQString(name);
@ -165,7 +179,7 @@ SceneSelection SceneSelectionWidget::CurrentSelection()
return s;
}
static QStringList getOrderList(bool current, bool previous)
static QStringList getOrderList(bool current, bool previous, bool preview)
{
QStringList list;
if (current) {
@ -174,6 +188,9 @@ static QStringList getOrderList(bool current, bool previous)
if (previous) {
list << obs_module_text("AdvSceneSwitcher.selectPreviousScene");
}
if (preview) {
list << obs_module_text("AdvSceneSwitcher.selectPreviewScene");
}
return list;
}
@ -216,10 +233,11 @@ void SceneSelectionWidget::PopulateSelection()
insertSeparator(count());
if (_current || _previous) {
const QStringList order = getOrderList(_current, _previous);
const QStringList order =
getOrderList(_current, _previous, _preview);
addSelectionGroup(this, order);
}
_orderEndIdx = count();
_placeholderEndIdx = count();
if (_variables) {
const QStringList variables = GetVariablesNameList();
@ -244,10 +262,11 @@ void SceneSelectionWidget::PopulateSelection()
SceneSelectionWidget::SceneSelectionWidget(QWidget *parent, bool variables,
bool sceneGroups, bool previous,
bool current)
bool current, bool preview)
: QComboBox(parent),
_current(current),
_previous(previous),
_preview(preview),
_variables(variables),
_sceneGroups(sceneGroups)
{
@ -302,34 +321,45 @@ void SceneSelectionWidget::SetScene(const SceneSelection &s)
break;
}
case SceneSelection::Type::PREVIOUS: {
if (_orderEndIdx == -1) {
if (_placeholderEndIdx == -1) {
idx = 0;
break;
}
idx = findIdxInRagne(
this, _selectIdx, _orderEndIdx,
this, _selectIdx, _placeholderEndIdx,
obs_module_text(
"AdvSceneSwitcher.selectPreviousScene"));
break;
}
case SceneSelection::Type::CURRENT: {
if (_orderEndIdx == -1) {
if (_placeholderEndIdx == -1) {
idx = 0;
break;
}
idx = findIdxInRagne(
this, _selectIdx, _orderEndIdx,
this, _selectIdx, _placeholderEndIdx,
obs_module_text("AdvSceneSwitcher.selectCurrentScene"));
break;
}
case SceneSelection::Type::PREVIEW: {
if (_placeholderEndIdx == -1) {
idx = 0;
break;
}
idx = findIdxInRagne(
this, _selectIdx, _placeholderEndIdx,
obs_module_text("AdvSceneSwitcher.selectPreviewScene"));
break;
}
case SceneSelection::Type::VARIABLE: {
if (_variablesEndIdx == -1) {
idx = 0;
break;
}
idx = findIdxInRagne(this, _orderEndIdx, _variablesEndIdx,
idx = findIdxInRagne(this, _placeholderEndIdx, _variablesEndIdx,
s.ToString());
break;
default:
@ -353,6 +383,12 @@ bool SceneSelectionWidget::IsPreviousSceneSelected(const QString &name)
"AdvSceneSwitcher.selectPreviousScene")));
}
bool SceneSelectionWidget::IsPreviewSceneSelected(const QString &name)
{
return name == QString::fromStdString((obs_module_text(
"AdvSceneSwitcher.selectPreviewScene")));
}
void SceneSelectionWidget::SelectionChanged(const QString &)
{
_currentSelection = CurrentSelection();

9
src/utils/scene-selection.hpp
View File

@ -16,6 +16,7 @@ public:
GROUP,
PREVIOUS,
CURRENT,
PREVIEW,
VARIABLE,
};
@ -37,7 +38,7 @@ class SceneSelectionWidget : public QComboBox {
public:
SceneSelectionWidget(QWidget *parent, bool variables = false,
bool sceneGroups = false, bool previous = false,
bool current = false);
bool current = false, bool preview = false);
void SetScene(const SceneSelection &);
signals:
void SceneChanged(const SceneSelection &);
@ -54,10 +55,12 @@ private:
void PopulateSelection();
bool IsCurrentSceneSelected(const QString &name);
bool IsPreviousSceneSelected(const QString &name);
bool IsPreviewSceneSelected(const QString &name);
bool NameUsed(const QString &name);
bool _current;
bool _previous;
bool _preview;
bool _variables;
bool _sceneGroups;
@ -65,12 +68,12 @@ private:
// Order of entries
// 1. "select entry" entry
// 2. Current / previous scene
// 2. Current / previous / preview scene
// 3. Variables
// 4. Scene groups
// 5. Regular scenes
const int _selectIdx = 0;
int _orderEndIdx = -1;
int _placeholderEndIdx = -1;
int _variablesEndIdx = -1;
int _groupsEndIdx = -1;
int _scenesEndIdx = -1;