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

Add variable support to timer condition

Browse Source
This commit is contained in:
WarmUpTill 2023-07-26 08:11:17 +02:00 committed by WarmUpTill
parent 9e1dfdc3f0
commit 70b705e0fd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/macro-core/macro-condition-timer.cpp
View File

@ -18,8 +18,10 @@ const static std::map<TimerType, std::string> timerTypes = {
bool MacroConditionTimer::CheckCondition()
{
if (_paused) {
SetVariableValue(std::to_string(_remaining));
return _remaining == 0.;
}
SetVariableValue(std::to_string(_duration.TimeRemaining()));
if (_duration.DurationReached()) {
if (!_oneshot) {
_duration.Reset();

2
src/macro-core/macro-condition-timer.hpp
View File

@ -19,7 +19,7 @@ enum class TimerType {
class MacroConditionTimer : public MacroCondition {
public:
MacroConditionTimer(Macro *m) : MacroCondition(m) {}
MacroConditionTimer(Macro *m) : MacroCondition(m, true) {}
bool CheckCondition();
bool Save(obs_data_t *obj) const;
bool Load(obs_data_t *obj);