Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix imported variables / actions not being added to respective tabs

Browse Source
This commit is contained in:
WarmUpTill 2024-05-27 21:39:06 +02:00 committed by WarmUpTill
parent 032f5e2fe9
commit b3bde6c59f
5 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/queue/action-queue.cpp
View File

@ -1,6 +1,7 @@
#include "action-queue.hpp"
#include "obs-module-helper.hpp"
#include "plugin-state-helpers.hpp"
#include "ui-helpers.hpp"
namespace advss {
@ -379,11 +380,24 @@ static bool queueWithNameExists(const std::string &name)
return !GetWeakActionQueueByName(name).expired();
}
static void signalImportedQueues(void *varsPtr)
{
auto queues = std::unique_ptr<std::vector<std::shared_ptr<Item>>>(
static_cast<std::vector<std::shared_ptr<Item>> *>(varsPtr));
for (const auto &queue : *queues) {
ActionQueueSignalManager::Instance()->Add(
QString::fromStdString(queue->Name()));
}
}
void ImportQueues(obs_data_t *data)
{
OBSDataArrayAutoRelease array =
obs_data_get_array(data, "actionQueues");
size_t count = obs_data_array_count(array);
auto importedQueues = new std::vector<std::shared_ptr<Item>>;
for (size_t i = 0; i < count; i++) {
OBSDataAutoRelease arrayElement = obs_data_array_item(array, i);
auto queue = ActionQueue::Create();
@ -392,7 +406,10 @@ void ImportQueues(obs_data_t *data)
continue;
}
queues.emplace_back(queue);
importedQueues->emplace_back(queue);
}
QeueUITask(signalImportedQueues, importedQueues);
}
std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name)

5
lib/utils/ui-helpers.cpp
View File

@ -166,4 +166,9 @@ std::string GetThemeTypeName()
#endif
}
void QeueUITask(void (*task)(void *param), void *param)
{
obs_queue_task(OBS_TASK_UI, task, param, false);
}
} // namespace advss

2
lib/utils/ui-helpers.hpp
View File

@ -29,4 +29,6 @@ EXPORT void DisplayTrayMessage(const QString &title, const QString &msg,
EXPORT std::string GetThemeTypeName();
void QeueUITask(void (*task)(void *param), void *param);
} // namespace advss

16
lib/variables/variable.cpp
View File

@ -1,6 +1,7 @@
#include "variable.hpp"
#include "math-helpers.hpp"
#include "obs-module-helper.hpp"
#include "ui-helpers.hpp"
#include "utility.hpp"
#include <QGridLayout>
@ -375,11 +376,23 @@ void LoadVariables(obs_data_t *obj)
obs_data_array_release(variablesArray);
}
static void signalImportedVariables(void *varsPtr)
{
auto vars = std::unique_ptr<std::vector<std::shared_ptr<Item>>>(
static_cast<std::vector<std::shared_ptr<Item>> *>(varsPtr));
for (const auto &var : *vars) {
VariableSignalManager::Instance()->Add(
QString::fromStdString(var->Name()));
}
}
void ImportVariables(obs_data_t *data)
{
obs_data_array_t *array = obs_data_get_array(data, "variables");
size_t count = obs_data_array_count(array);
auto importedVars = new std::vector<std::shared_ptr<Item>>;
for (size_t i = 0; i < count; i++) {
obs_data_t *arrayElement = obs_data_array_item(array, i);
auto var = Variable::Create();
@ -391,9 +404,12 @@ void ImportVariables(obs_data_t *data)
}
GetVariables().emplace_back(var);
importedVars->emplace_back(var);
}
obs_data_array_release(array);
QeueUITask(signalImportedVariables, importedVars);
}
std::chrono::high_resolution_clock::time_point GetLastVariableChangeTime()

2
tests/mocks/ui-helpers.cpp
View File

@ -33,4 +33,6 @@ std::string GetThemeTypeName()
return "Dark";
}
void QeueUITask(void (*task)(void *param), void *) {}
} // namespace advss