Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-09-01 14:15:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust to SceneItemSelection and SceneItemSelectionWidget

Browse Source
This commit is contained in:
WarmUpTill
2021-12-31 02:03:05 +01:00
committed by WarmUpTill
parent 3af5897427
commit 2649efe8b3
13 changed files with 492 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/macro-condition-scene-transform.cpp
View File

@@ -15,10 +15,7 @@ bool MacroConditionSceneTransform::_registered =
bool MacroConditionSceneTransform::CheckCondition()
{
bool ret = false;
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);
auto items = _source.GetSceneItems(_scene);
for (auto &item : items) {
auto json = getSceneItemTransform(item);
@@ -27,8 +24,6 @@ bool MacroConditionSceneTransform::CheckCondition()
}
obs_sceneitem_release(item);
}
obs_source_release(s);
return ret;
}
@@ -36,7 +31,7 @@ bool MacroConditionSceneTransform::Save(obs_data_t *obj)
{
MacroCondition::Save(obj);
_scene.Save(obj);
obs_data_set_string(obj, "source", GetWeakSourceName(_source).c_str());
_source.Save(obj);
obs_data_set_string(obj, "settings", _settings.c_str());
obs_data_set_bool(obj, "regex", _regex);
return true;
@@ -44,10 +39,16 @@ bool MacroConditionSceneTransform::Save(obs_data_t *obj)
bool MacroConditionSceneTransform::Load(obs_data_t *obj)
{
// Convert old data format
// TODO: Remove in future version
if (obs_data_has_user_value(obj, "source")) {
auto sourceName = obs_data_get_string(obj, "source");
obs_data_set_string(obj, "sceneItem", sourceName);
}
MacroCondition::Load(obj);
_scene.Load(obj);
const char *sourceName = obs_data_get_string(obj, "source");
_source = GetWeakSourceByName(sourceName);
_source.Load(obj);
_settings = obs_data_get_string(obj, "settings");
_regex = obs_data_get_bool(obj, "regex");
return true;
@@ -55,10 +56,11 @@ bool MacroConditionSceneTransform::Load(obs_data_t *obj)
std::string MacroConditionSceneTransform::GetShortDesc()
{
if (_source) {
return _scene.ToString() + " - " + GetWeakSourceName(_source);
if (_source.ToString().empty()) {
return "";
}
return "";
return _scene.ToString() + " - " + _source.ToString();
}
MacroConditionSceneTransformEdit::MacroConditionSceneTransformEdit(
@@ -67,7 +69,8 @@ MacroConditionSceneTransformEdit::MacroConditionSceneTransformEdit(
: QWidget(parent)
{
_scenes = new SceneSelectionWidget(window(), false, false, true);
_sources = new QComboBox();
_sources = new SceneItemSelectionWidget(
parent, true, SceneItemSelectionWidget::AllSelectionType::ANY);
_getSettings = new QPushButton(obs_module_text(
"AdvSceneSwitcher.condition.sceneTransform.getTransform"));
_settings = new QPlainTextEdit();
@@ -76,8 +79,11 @@ MacroConditionSceneTransformEdit::MacroConditionSceneTransformEdit(
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(_scenes, SIGNAL(SceneChanged(const SceneSelection &)),
_sources, SLOT(SceneChanged(const SceneSelection &)));
QWidget::connect(_sources,
SIGNAL(SceneItemChanged(const SceneItemSelection &)),
this, SLOT(SourceChanged(const SceneItemSelection &)));
QWidget::connect(_getSettings, SIGNAL(clicked()), this,
SLOT(GetSettingsClicked()));
QWidget::connect(_settings, SIGNAL(textChanged()), this,
@@ -125,14 +131,9 @@ void MacroConditionSceneTransformEdit::UpdateEntryData()
}
_scenes->SetScene(_entryData->_scene);
populateSceneItemSelection(_sources, _entryData->_scene);
_sources->setCurrentText(
GetWeakSourceName(_entryData->_source).c_str());
_sources->SetSceneItem(_entryData->_source);
_regex->setChecked(_entryData->_regex);
if (_entryData->_source) {
_settings->setPlainText(
QString::fromStdString(_entryData->_settings));
}
_settings->setPlainText(QString::fromStdString(_entryData->_settings));
}
void MacroConditionSceneTransformEdit::SceneChanged(const SceneSelection &s)
@@ -140,48 +141,45 @@ void MacroConditionSceneTransformEdit::SceneChanged(const SceneSelection &s)
if (_loading || !_entryData) {
return;
}
{
std::lock_guard<std::mutex> lock(switcher->m);
_entryData->_scene = s;
}
_sources->clear();
populateSceneItemSelection(_sources, _entryData->_scene);
std::lock_guard<std::mutex> lock(switcher->m);
_entryData->_scene = s;
}
void MacroConditionSceneTransformEdit::SourceChanged(const QString &text)
void MacroConditionSceneTransformEdit::SourceChanged(
const SceneItemSelection &item)
{
if (_loading || !_entryData) {
return;
}
std::lock_guard<std::mutex> lock(switcher->m);
_entryData->_source = GetWeakSourceByQString(text);
_entryData->_source = item;
emit HeaderInfoChanged(
QString::fromStdString(_entryData->GetShortDesc()));
}
void MacroConditionSceneTransformEdit::GetSettingsClicked()
{
if (_loading || !_entryData || !_entryData->_scene.GetScene(false) ||
!_entryData->_source) {
if (_loading || !_entryData || !_entryData->_scene.GetScene(false)) {
return;
}
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());
obs_source_release(s);
if (!item) {
auto items = _entryData->_source.GetSceneItems(_entryData->_scene);
if (items.empty()) {
return;
}
QString json = formatJsonString(getSceneItemTransform(item));
auto settings = formatJsonString(getSceneItemTransform(items[0]));
if (_entryData->_regex) {
json = escapeForRegex(json);
settings = escapeForRegex(settings);
}
_settings->setPlainText(settings);
for (auto item : items) {
obs_sceneitem_release(item);
}
_settings->setPlainText(json);
}
void MacroConditionSceneTransformEdit::SettingsChanged()