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

Add support to resolve variables on action queue add

Browse Source
This commit is contained in:
WarmUpTill
2024-03-01 23:42:12 +01:00
committed by WarmUpTill
parent f8dadd38b4
commit 03e71e9183
82 changed files with 835 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/base/macro-action-plugin-state.cpp
View File

@@ -212,10 +212,25 @@ bool MacroActionPluginState::Load(obs_data_t *obj)
return true;
}
std::shared_ptr<MacroAction> MacroActionPluginState::Create(Macro *m)
{
return std::make_shared<MacroActionPluginState>(m);
}
std::shared_ptr<MacroAction> MacroActionPluginState::Copy() const
{
return std::make_shared<MacroActionPluginState>(*this);
}
void MacroActionPluginState::ResolveVariablesToFixedValues()
{
_settingsPath = std::string(_settingsPath);
}
static inline void populateActionSelection(QComboBox *list)
{
for (auto entry : actionTypes) {
list->addItem(obs_module_text(entry.second.c_str()));
for (const auto &[_, name] : actionTypes) {
list->addItem(obs_module_text(name.c_str()));
}
}
@@ -223,8 +238,8 @@ static inline void populateValueSelection(QComboBox *list,
PluginStateAction action)
{
if (action == PluginStateAction::NO_MATCH_BEHAVIOUR) {
for (auto entry : noMatchValues) {
list->addItem(obs_module_text(entry.second.c_str()));
for (const auto &[_, name] : noMatchValues) {
list->addItem(obs_module_text(name.c_str()));
}
}
}