Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-12 20:28:11 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adjust scene transform action to support current scene

Browse Source
This commit is contained in:
WarmUpTill
2021-07-03 16:29:44 +02:00
committed by WarmUpTill
parent 0824abc4f5
commit 0b175a41d1
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/headers/macro-action-scene-transform.hpp
View File

@@ -2,6 +2,7 @@
#include <QSpinBox>
#include <QPlainTextEdit>
#include "macro-action-edit.hpp"
#include "scene-selection.hpp"
class MacroActionSceneTransform : public MacroAction {
public:
@@ -18,7 +19,7 @@ public:
std::string GetSettings();
void SetSettings(std::string &);
OBSWeakSource _scene;
SceneSelection _scene;
OBSWeakSource _source;
struct obs_transform_info _info;
struct obs_sceneitem_crop _crop;
@@ -46,7 +47,7 @@ public:
}
private slots:
void SceneChanged(const QString &text);
void SceneChanged(const SceneSelection &);
void SourceChanged(const QString &text);
void GetSettingsClicked();
void SettingsChanged();
@@ -54,7 +55,7 @@ signals:
void HeaderInfoChanged(const QString &);
protected:
QComboBox *_scenes;
SceneSelectionWidget *_scenes;
QComboBox *_sources;
QPushButton *_getSettings;
QPlainTextEdit *_settings;

35
src/macro-action-scene-transform.cpp
View File

@@ -57,7 +57,7 @@ bool save_transform_state(obs_data_t *obj, struct obs_transform_info &info,
bool MacroActionSceneTransform::PerformAction()
{
auto s = obs_weak_source_get_source(_scene);
auto s = obs_weak_source_get_source(_scene.GetScene(false));
auto scene = obs_scene_from_source(s);
auto name = GetWeakSourceName(_source);
auto items = getSceneItemsWithName(scene, name);
@@ -94,14 +94,13 @@ void MacroActionSceneTransform::LogAction()
{
vblog(LOG_INFO,
"performed transform action for source \"%s\" on scene \"%s\"",
GetWeakSourceName(_scene).c_str(),
GetWeakSourceName(_scene).c_str());
GetWeakSourceName(_source).c_str(), _scene.ToString().c_str());
}
bool MacroActionSceneTransform::Save(obs_data_t *obj)
{
MacroAction::Save(obj);
obs_data_set_string(obj, "scene", GetWeakSourceName(_scene).c_str());
_scene.Save(obj);
obs_data_set_string(obj, "source", GetWeakSourceName(_source).c_str());
save_transform_state(obj, _info, _crop);
return true;
@@ -110,8 +109,7 @@ bool MacroActionSceneTransform::Save(obs_data_t *obj)
bool MacroActionSceneTransform::Load(obs_data_t *obj)
{
MacroAction::Load(obj);
const char *sceneName = obs_data_get_string(obj, "scene");
_scene = GetWeakSourceByName(sceneName);
_scene.Load(obj);
const char *sourceName = obs_data_get_string(obj, "source");
_source = GetWeakSourceByName(sourceName);
load_transform_state(obj, _info, _crop);
@@ -120,9 +118,8 @@ bool MacroActionSceneTransform::Load(obs_data_t *obj)
std::string MacroActionSceneTransform::GetShortDesc()
{
if (_scene && _source) {
return GetWeakSourceName(_scene) + " - " +
GetWeakSourceName(_source);
if (_source) {
return _scene.ToString() + " - " + GetWeakSourceName(_source);
}
return "";
}
@@ -150,16 +147,14 @@ MacroActionSceneTransformEdit::MacroActionSceneTransformEdit(
QWidget *parent, std::shared_ptr<MacroActionSceneTransform> entryData)
: QWidget(parent)
{
_scenes = new QComboBox();
_scenes = new SceneSelectionWidget(window(), false, false, true);
_sources = new QComboBox();
_getSettings = new QPushButton(obs_module_text(
"AdvSceneSwitcher.action.sceneTransform.getTransform"));
_settings = new QPlainTextEdit();
populateSceneSelection(_scenes);
QWidget::connect(_scenes, SIGNAL(currentTextChanged(const QString &)),
this, SLOT(SceneChanged(const QString &)));
QWidget::connect(_scenes, SIGNAL(SceneChanged(const SceneSelection &)),
this, SLOT(SceneChanged(const SceneSelection &)));
QWidget::connect(_sources, SIGNAL(currentTextChanged(const QString &)),
this, SLOT(SourceChanged(const QString &)));
QWidget::connect(_getSettings, SIGNAL(clicked()), this,
@@ -200,24 +195,24 @@ void MacroActionSceneTransformEdit::UpdateEntryData()
return;
}
_scenes->setCurrentText(GetWeakSourceName(_entryData->_scene).c_str());
_scenes->SetScene(_entryData->_scene);
populateSceneItemSelection(_sources, _entryData->_scene);
_sources->setCurrentText(
GetWeakSourceName(_entryData->_source).c_str());
if (_entryData->_scene && _entryData->_source) {
if (_entryData->_source) {
_settings->setPlainText(
fromatJsonString(_entryData->GetSettings()));
}
}
void MacroActionSceneTransformEdit::SceneChanged(const QString &text)
void MacroActionSceneTransformEdit::SceneChanged(const SceneSelection &s)
{
if (_loading || !_entryData) {
return;
}
{
std::lock_guard<std::mutex> lock(switcher->m);
_entryData->_scene = GetWeakSourceByQString(text);
_entryData->_scene = s;
}
_sources->clear();
populateSceneItemSelection(_sources, _entryData->_scene);
@@ -237,12 +232,12 @@ void MacroActionSceneTransformEdit::SourceChanged(const QString &text)
void MacroActionSceneTransformEdit::GetSettingsClicked()
{
if (_loading || !_entryData || !_entryData->_scene ||
if (_loading || !_entryData || !_entryData->_scene.GetScene(false) ||
!_entryData->_source) {
return;
}
auto s = obs_weak_source_get_source(_entryData->_scene);
auto s = obs_weak_source_get_source(_entryData->_scene.GetScene(false));
auto scene = obs_scene_from_source(s);
auto name = GetWeakSourceName(_entryData->_source);
auto item = obs_scene_find_source_recursive(scene, name.c_str());