mirror of
https://github.com/WarmUpTill/SceneSwitcher.git
synced 2026-04-20 17:17:25 -05:00
Add const qualifier to various functions
This commit is contained in:
parent
a901f59f0f
commit
b5ec9e7586
|
|
@ -201,7 +201,7 @@ bool MacroActionAudio::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionAudio::LogAction()
|
||||
void MacroActionAudio::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -216,7 +216,7 @@ void MacroActionAudio::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionAudio::Save(obs_data_t *obj)
|
||||
bool MacroActionAudio::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_duration.Save(obj);
|
||||
|
|
@ -267,7 +267,7 @@ bool MacroActionAudio::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionAudio::GetShortDesc()
|
||||
std::string MacroActionAudio::GetShortDesc() const
|
||||
{
|
||||
if (_audioSource) {
|
||||
return GetWeakSourceName(_audioSource);
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ class MacroActionAudio : public MacroAction {
|
|||
public:
|
||||
MacroActionAudio(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionAudio>(m);
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ bool MacroActionFile::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionFile::LogAction()
|
||||
void MacroActionFile::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -52,7 +52,7 @@ void MacroActionFile::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionFile::Save(obs_data_t *obj)
|
||||
bool MacroActionFile::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "file", _file.c_str());
|
||||
|
|
@ -70,7 +70,7 @@ bool MacroActionFile::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionFile::GetShortDesc()
|
||||
std::string MacroActionFile::GetShortDesc() const
|
||||
{
|
||||
return _file;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ class MacroActionFile : public MacroAction {
|
|||
public:
|
||||
MacroActionFile(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionFile>(m);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ bool MacroActionFilter::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionFilter::LogAction()
|
||||
void MacroActionFilter::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -50,7 +50,7 @@ void MacroActionFilter::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionFilter::Save(obs_data_t *obj)
|
||||
bool MacroActionFilter::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "source", GetWeakSourceName(_source).c_str());
|
||||
|
|
@ -72,7 +72,7 @@ bool MacroActionFilter::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionFilter::GetShortDesc()
|
||||
std::string MacroActionFilter::GetShortDesc() const
|
||||
{
|
||||
if (_filter && _source) {
|
||||
return GetWeakSourceName(_source) + " - " +
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ class MacroActionFilter : public MacroAction {
|
|||
public:
|
||||
MacroActionFilter(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionFilter>(m);
|
||||
|
|
|
|||
|
|
@ -237,12 +237,12 @@ bool MacroActionHotkey::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionHotkey::LogAction()
|
||||
void MacroActionHotkey::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "sent hotkey");
|
||||
}
|
||||
|
||||
bool MacroActionHotkey::Save(obs_data_t *obj)
|
||||
bool MacroActionHotkey::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "key", static_cast<int>(_key));
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ class MacroActionHotkey : public MacroAction {
|
|||
public:
|
||||
MacroActionHotkey(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionHotkey>(m);
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ bool MacroActionHttp::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionHttp::LogAction()
|
||||
void MacroActionHttp::LogAction() const
|
||||
{
|
||||
auto it = methods.find(_method);
|
||||
if (it != methods.end()) {
|
||||
|
|
@ -77,7 +77,7 @@ void MacroActionHttp::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionHttp::Save(obs_data_t *obj)
|
||||
bool MacroActionHttp::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "url", _url.c_str());
|
||||
|
|
@ -97,7 +97,7 @@ bool MacroActionHttp::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionHttp::GetShortDesc()
|
||||
std::string MacroActionHttp::GetShortDesc() const
|
||||
{
|
||||
return _url;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ class MacroActionHttp : public MacroAction {
|
|||
public:
|
||||
MacroActionHttp(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionHttp>(m);
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ bool MacroActionMacro::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionMacro::LogAction()
|
||||
void MacroActionMacro::LogAction() const
|
||||
{
|
||||
if (!_macro.get()) {
|
||||
return;
|
||||
|
|
@ -77,7 +77,7 @@ void MacroActionMacro::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionMacro::Save(obs_data_t *obj)
|
||||
bool MacroActionMacro::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_macro.Save(obj);
|
||||
|
|
@ -94,7 +94,7 @@ bool MacroActionMacro::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionMacro::GetShortDesc()
|
||||
std::string MacroActionMacro::GetShortDesc() const
|
||||
{
|
||||
if (_macro.get()) {
|
||||
return _macro->Name();
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ class MacroActionMacro : public MacroRefAction {
|
|||
public:
|
||||
MacroActionMacro(Macro *m) : MacroAction(m), MacroRefAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionMacro>(m);
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ bool MacroActionMedia::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionMedia::LogAction()
|
||||
void MacroActionMedia::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -70,7 +70,7 @@ void MacroActionMedia::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionMedia::Save(obs_data_t *obj)
|
||||
bool MacroActionMedia::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "mediaSource",
|
||||
|
|
@ -90,7 +90,7 @@ bool MacroActionMedia::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionMedia::GetShortDesc()
|
||||
std::string MacroActionMedia::GetShortDesc() const
|
||||
{
|
||||
if (_mediaSource) {
|
||||
return GetWeakSourceName(_mediaSource);
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@ class MacroActionMedia : public MacroAction {
|
|||
public:
|
||||
MacroActionMedia(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionMedia>(m);
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ bool MacroActionPluginState::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionPluginState::LogAction()
|
||||
void MacroActionPluginState::LogAction() const
|
||||
{
|
||||
switch (_action) {
|
||||
case PluginStateAction::STOP:
|
||||
|
|
@ -96,7 +96,7 @@ void MacroActionPluginState::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionPluginState::Save(obs_data_t *obj)
|
||||
bool MacroActionPluginState::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "action", static_cast<int>(_action));
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ class MacroActionPluginState : public MacroAction {
|
|||
public:
|
||||
MacroActionPluginState(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionPluginState>(m);
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@ bool MacroActionProfile::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionProfile::LogAction()
|
||||
void MacroActionProfile::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "set profile type to \"%s\"", _profile.c_str());
|
||||
}
|
||||
|
||||
bool MacroActionProfile::Save(obs_data_t *obj)
|
||||
bool MacroActionProfile::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "profile", _profile.c_str());
|
||||
|
|
@ -34,7 +34,7 @@ bool MacroActionProfile::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionProfile::GetShortDesc()
|
||||
std::string MacroActionProfile::GetShortDesc() const
|
||||
{
|
||||
return _profile;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ class MacroActionProfile : public MacroAction {
|
|||
public:
|
||||
MacroActionProfile(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionProfile>(m);
|
||||
|
|
|
|||
|
|
@ -52,12 +52,12 @@ bool MacroActionRandom::PerformAction()
|
|||
return macros[idx]->PerformActions();
|
||||
}
|
||||
|
||||
void MacroActionRandom::LogAction()
|
||||
void MacroActionRandom::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "running random macro");
|
||||
}
|
||||
|
||||
bool MacroActionRandom::Save(obs_data_t *obj)
|
||||
bool MacroActionRandom::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
SaveMacroList(obj, _macros);
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@ class MacroActionRandom : public MultiMacroRefAction {
|
|||
public:
|
||||
MacroActionRandom(Macro *m) : MacroAction(m), MultiMacroRefAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionRandom>(m);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ bool MacroActionRecord::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionRecord::LogAction()
|
||||
void MacroActionRecord::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -65,7 +65,7 @@ void MacroActionRecord::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionRecord::Save(obs_data_t *obj)
|
||||
bool MacroActionRecord::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "action", static_cast<int>(_action));
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ class MacroActionRecord : public MacroAction {
|
|||
public:
|
||||
MacroActionRecord(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionRecord>(m);
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ bool MacroActionReplayBuffer::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionReplayBuffer::LogAction()
|
||||
void MacroActionReplayBuffer::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -51,7 +51,7 @@ void MacroActionReplayBuffer::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionReplayBuffer::Save(obs_data_t *obj)
|
||||
bool MacroActionReplayBuffer::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "action", static_cast<int>(_action));
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ class MacroActionReplayBuffer : public MacroAction {
|
|||
public:
|
||||
MacroActionReplayBuffer(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionReplayBuffer>(m);
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@ bool MacroActionRun::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionRun::LogAction()
|
||||
void MacroActionRun::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "run \"%s\"", _path.c_str());
|
||||
}
|
||||
|
||||
bool MacroActionRun::Save(obs_data_t *obj)
|
||||
bool MacroActionRun::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "path", _path.c_str());
|
||||
|
|
@ -67,7 +67,7 @@ bool MacroActionRun::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionRun::GetShortDesc()
|
||||
std::string MacroActionRun::GetShortDesc() const
|
||||
{
|
||||
return _path;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@ class MacroActionRun : public MacroAction {
|
|||
public:
|
||||
MacroActionRun(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionRun>(m);
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ bool MacroActionSceneCollection::PerformAction()
|
|||
return false;
|
||||
}
|
||||
|
||||
void MacroActionSceneCollection::LogAction()
|
||||
void MacroActionSceneCollection::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "set scene collection type to \"%s\"",
|
||||
_sceneCollection.c_str());
|
||||
}
|
||||
|
||||
bool MacroActionSceneCollection::Save(obs_data_t *obj)
|
||||
bool MacroActionSceneCollection::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "sceneCollection", _sceneCollection.c_str());
|
||||
|
|
@ -44,7 +44,7 @@ bool MacroActionSceneCollection::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionSceneCollection::GetShortDesc()
|
||||
std::string MacroActionSceneCollection::GetShortDesc() const
|
||||
{
|
||||
return _sceneCollection;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ class MacroActionSceneCollection : public MacroAction {
|
|||
public:
|
||||
MacroActionSceneCollection(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionSceneCollection>(m);
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ bool MacroActionSceneOrder::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionSceneOrder::LogAction()
|
||||
void MacroActionSceneOrder::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -110,7 +110,7 @@ void MacroActionSceneOrder::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionSceneOrder::Save(obs_data_t *obj)
|
||||
bool MacroActionSceneOrder::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -138,7 +138,7 @@ bool MacroActionSceneOrder::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionSceneOrder::GetShortDesc()
|
||||
std::string MacroActionSceneOrder::GetShortDesc() const
|
||||
{
|
||||
if (_source.ToString().empty()) {
|
||||
return "";
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@ class MacroActionSceneOrder : public MacroAction {
|
|||
public:
|
||||
MacroActionSceneOrder(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionSceneOrder>(m);
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ bool MacroActionSwitchScene::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionSwitchScene::LogAction()
|
||||
void MacroActionSwitchScene::LogAction() const
|
||||
{
|
||||
auto t = _scene.GetType();
|
||||
auto sceneName = GetWeakSourceName(_scene.GetScene(false));
|
||||
|
|
@ -140,7 +140,7 @@ void MacroActionSwitchScene::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionSwitchScene::Save(obs_data_t *obj)
|
||||
bool MacroActionSwitchScene::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -162,7 +162,7 @@ bool MacroActionSwitchScene::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionSwitchScene::GetShortDesc()
|
||||
std::string MacroActionSwitchScene::GetShortDesc() const
|
||||
{
|
||||
return _scene.ToString();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ class MacroActionSwitchScene : public MacroAction {
|
|||
public:
|
||||
MacroActionSwitchScene(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -24,14 +24,14 @@ bool MacroActionSceneTransform::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionSceneTransform::LogAction()
|
||||
void MacroActionSceneTransform::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO,
|
||||
"performed transform action for source \"%s\" on scene \"%s\"",
|
||||
_source.ToString().c_str(), _scene.ToString().c_str());
|
||||
}
|
||||
|
||||
bool MacroActionSceneTransform::Save(obs_data_t *obj)
|
||||
bool MacroActionSceneTransform::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -56,7 +56,7 @@ bool MacroActionSceneTransform::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionSceneTransform::GetShortDesc()
|
||||
std::string MacroActionSceneTransform::GetShortDesc() const
|
||||
{
|
||||
if (_source.ToString().empty()) {
|
||||
return "";
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ class MacroActionSceneTransform : public MacroAction {
|
|||
public:
|
||||
MacroActionSceneTransform(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionSceneTransform>(m);
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ bool MacroActionSceneVisibility::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionSceneVisibility::LogAction()
|
||||
void MacroActionSceneVisibility::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -113,7 +113,7 @@ void MacroActionSceneVisibility::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionSceneVisibility::Save(obs_data_t *obj)
|
||||
bool MacroActionSceneVisibility::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -148,7 +148,7 @@ bool MacroActionSceneVisibility::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionSceneVisibility::GetShortDesc()
|
||||
std::string MacroActionSceneVisibility::GetShortDesc() const
|
||||
{
|
||||
if (_sourceType == SceneItemSourceType::SOURCE &&
|
||||
!_source.ToString().empty()) {
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@ class MacroActionSceneVisibility : public MacroAction {
|
|||
public:
|
||||
MacroActionSceneVisibility(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionSceneVisibility>(m);
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ bool MacroActionScreenshot::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionScreenshot::LogAction()
|
||||
void MacroActionScreenshot::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "trigger screenshot for \"%s\"",
|
||||
_targetType == TargetType::SOURCE
|
||||
|
|
@ -67,7 +67,7 @@ void MacroActionScreenshot::LogAction()
|
|||
: _scene.ToString().c_str());
|
||||
}
|
||||
|
||||
bool MacroActionScreenshot::Save(obs_data_t *obj)
|
||||
bool MacroActionScreenshot::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -91,7 +91,7 @@ bool MacroActionScreenshot::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionScreenshot::GetShortDesc()
|
||||
std::string MacroActionScreenshot::GetShortDesc() const
|
||||
{
|
||||
if (_targetType == TargetType::SCENE) {
|
||||
return _scene.ToString();
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ class MacroActionScreenshot : public MacroAction {
|
|||
public:
|
||||
MacroActionScreenshot(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionScreenshot>(m);
|
||||
|
|
|
|||
|
|
@ -66,12 +66,12 @@ bool MacroActionSequence::PerformAction()
|
|||
return macro->PerformActions();
|
||||
}
|
||||
|
||||
void MacroActionSequence::LogAction()
|
||||
void MacroActionSequence::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "running macro sequence");
|
||||
}
|
||||
|
||||
bool MacroActionSequence::Save(obs_data_t *obj)
|
||||
bool MacroActionSequence::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
SaveMacroList(obj, _macros);
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ public:
|
|||
{
|
||||
}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
MacroRef GetNextMacro(bool advance = true);
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ bool MacroActionSource::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionSource::LogAction()
|
||||
void MacroActionSource::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -112,7 +112,7 @@ void MacroActionSource::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionSource::Save(obs_data_t *obj)
|
||||
bool MacroActionSource::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "source", GetWeakSourceName(_source).c_str());
|
||||
|
|
@ -133,7 +133,7 @@ bool MacroActionSource::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionSource::GetShortDesc()
|
||||
std::string MacroActionSource::GetShortDesc() const
|
||||
{
|
||||
if (_source) {
|
||||
return GetWeakSourceName(_source);
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@ class MacroActionSource : public MacroAction {
|
|||
public:
|
||||
MacroActionSource(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionSource>(m);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ bool MacroActionStream::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionStream::LogAction()
|
||||
void MacroActionStream::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -58,7 +58,7 @@ void MacroActionStream::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionStream::Save(obs_data_t *obj)
|
||||
bool MacroActionStream::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "action", static_cast<int>(_action));
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ class MacroActionStream : public MacroAction {
|
|||
public:
|
||||
MacroActionStream(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionStream>(m);
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ bool MacroActionSudioMode::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionSudioMode::LogAction()
|
||||
void MacroActionSudioMode::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -84,7 +84,7 @@ void MacroActionSudioMode::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionSudioMode::Save(obs_data_t *obj)
|
||||
bool MacroActionSudioMode::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "action", static_cast<int>(_action));
|
||||
|
|
@ -105,7 +105,7 @@ bool MacroActionSudioMode::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionSudioMode::GetShortDesc()
|
||||
std::string MacroActionSudioMode::GetShortDesc() const
|
||||
{
|
||||
if (_action == StudioModeAction::SET_SCENE) {
|
||||
return _scene.ToString();
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ class MacroActionSudioMode : public MacroAction {
|
|||
public:
|
||||
MacroActionSudioMode(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionSudioMode>(m);
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@ bool MacroActionSystray::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionSystray::LogAction()
|
||||
void MacroActionSystray::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "display systray message \"%s\"", _msg.c_str());
|
||||
}
|
||||
|
||||
bool MacroActionSystray::Save(obs_data_t *obj)
|
||||
bool MacroActionSystray::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "message", _msg.c_str());
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ class MacroActionSystray : public MacroAction {
|
|||
public:
|
||||
MacroActionSystray(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionSystray>(m);
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ bool MacroActionTimer::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionTimer::LogAction()
|
||||
void MacroActionTimer::LogAction() const
|
||||
{
|
||||
if (!_macro.get()) {
|
||||
return;
|
||||
|
|
@ -84,7 +84,7 @@ void MacroActionTimer::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionTimer::Save(obs_data_t *obj)
|
||||
bool MacroActionTimer::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_macro.Save(obj);
|
||||
|
|
@ -103,7 +103,7 @@ bool MacroActionTimer::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionTimer::GetShortDesc()
|
||||
std::string MacroActionTimer::GetShortDesc() const
|
||||
{
|
||||
if (_macro.get()) {
|
||||
return _macro->Name();
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@ class MacroActionTimer : public MacroRefAction {
|
|||
public:
|
||||
MacroActionTimer(Macro *m) : MacroAction(m), MacroRefAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionTimer>(m);
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ bool MacroActionTransition::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionTransition::LogAction()
|
||||
void MacroActionTransition::LogAction() const
|
||||
{
|
||||
std::string msgBegin;
|
||||
switch (_type) {
|
||||
|
|
@ -151,7 +151,7 @@ void MacroActionTransition::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionTransition::Save(obs_data_t *obj)
|
||||
bool MacroActionTransition::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "actionType", static_cast<int>(_type));
|
||||
|
|
@ -177,7 +177,7 @@ bool MacroActionTransition::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionTransition::GetShortDesc()
|
||||
std::string MacroActionTransition::GetShortDesc() const
|
||||
{
|
||||
std::string msgBegin;
|
||||
switch (_type) {
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ class MacroActionTransition : public MacroAction {
|
|||
public:
|
||||
MacroActionTransition(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionTransition>(m);
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ bool MacroActionVariable::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
bool MacroActionVariable::Save(obs_data_t *obj)
|
||||
bool MacroActionVariable::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_string(obj, "variableName", _variableName.c_str());
|
||||
|
|
@ -96,7 +96,7 @@ bool MacroActionVariable::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionVariable::GetShortDesc()
|
||||
std::string MacroActionVariable::GetShortDesc() const
|
||||
{
|
||||
return _variableName;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ class MacroActionVariable : public MacroAction {
|
|||
public:
|
||||
MacroActionVariable(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionVariable>(m);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ bool MacroActionVCam::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionVCam::LogAction()
|
||||
void MacroActionVCam::LogAction() const
|
||||
{
|
||||
auto it = actionTypes.find(_action);
|
||||
if (it != actionTypes.end()) {
|
||||
|
|
@ -46,7 +46,7 @@ void MacroActionVCam::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionVCam::Save(obs_data_t *obj)
|
||||
bool MacroActionVCam::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "action", static_cast<int>(_action));
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@ class MacroActionVCam : public MacroAction {
|
|||
public:
|
||||
MacroActionVCam(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionVCam>(m);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ bool MacroActionWait::PerformAction()
|
|||
return !switcher->abortMacroWait;
|
||||
}
|
||||
|
||||
bool MacroActionWait::Save(obs_data_t *obj)
|
||||
bool MacroActionWait::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
_duration.Save(obj);
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@ class MacroActionWait : public MacroAction {
|
|||
public:
|
||||
MacroActionWait(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionWait>(m);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ bool MacroActionWebsocket::PerformAction()
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroActionWebsocket::LogAction()
|
||||
void MacroActionWebsocket::LogAction() const
|
||||
{
|
||||
switch (_type) {
|
||||
case MacroActionWebsocket::Type::REQUEST:
|
||||
|
|
@ -57,7 +57,7 @@ void MacroActionWebsocket::LogAction()
|
|||
}
|
||||
}
|
||||
|
||||
bool MacroActionWebsocket::Save(obs_data_t *obj)
|
||||
bool MacroActionWebsocket::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroAction::Save(obj);
|
||||
obs_data_set_int(obj, "type", static_cast<int>(_type));
|
||||
|
|
@ -75,7 +75,7 @@ bool MacroActionWebsocket::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroActionWebsocket::GetShortDesc()
|
||||
std::string MacroActionWebsocket::GetShortDesc() const
|
||||
{
|
||||
if (_type == Type::REQUEST) {
|
||||
return _connection;
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ class MacroActionWebsocket : public MacroAction {
|
|||
public:
|
||||
MacroActionWebsocket(Macro *m) : MacroAction(m) {}
|
||||
bool PerformAction();
|
||||
void LogAction();
|
||||
bool Save(obs_data_t *obj);
|
||||
void LogAction() const;
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroAction> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroActionWebsocket>(m);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "macro-action.hpp"
|
||||
#include "advanced-scene-switcher.hpp"
|
||||
|
||||
bool MacroAction::Save(obs_data_t *obj)
|
||||
bool MacroAction::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroSegment::Save(obj);
|
||||
obs_data_set_string(obj, "id", GetId().c_str());
|
||||
|
|
@ -14,7 +14,7 @@ bool MacroAction::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
void MacroAction::LogAction()
|
||||
void MacroAction::LogAction() const
|
||||
{
|
||||
vblog(LOG_INFO, "performed action %s", GetId().c_str());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ public:
|
|||
MacroAction(Macro *m) : MacroSegment(m) {}
|
||||
virtual ~MacroAction() = default;
|
||||
virtual bool PerformAction() = 0;
|
||||
virtual bool Save(obs_data_t *obj) = 0;
|
||||
virtual bool Save(obs_data_t *obj) const = 0;
|
||||
virtual bool Load(obs_data_t *obj) = 0;
|
||||
virtual void LogAction();
|
||||
virtual void LogAction() const;
|
||||
};
|
||||
|
||||
class MacroRefAction : virtual public MacroAction {
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ bool MacroConditionAudio::CheckCondition()
|
|||
return false;
|
||||
}
|
||||
|
||||
bool MacroConditionAudio::Save(obs_data_t *obj)
|
||||
bool MacroConditionAudio::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_string(obj, "audioSource",
|
||||
|
|
@ -199,7 +199,7 @@ bool MacroConditionAudio::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionAudio::GetShortDesc()
|
||||
std::string MacroConditionAudio::GetShortDesc() const
|
||||
{
|
||||
if (_audioSource) {
|
||||
return GetWeakSourceName(_audioSource);
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ public:
|
|||
MacroConditionAudio(Macro *m) : MacroCondition(m) {}
|
||||
~MacroConditionAudio();
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionAudio>(m);
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ bool MacroConditionCursor::CheckCondition()
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool MacroConditionCursor::Save(obs_data_t *obj)
|
||||
bool MacroConditionCursor::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_int(obj, "condition", static_cast<int>(_condition));
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ class MacroConditionCursor : public MacroCondition {
|
|||
public:
|
||||
MacroConditionCursor(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionCursor>(m);
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@ bool MacroConditionDate::CheckCondition()
|
|||
return CheckRegularDate(msSinceLastCheck);
|
||||
}
|
||||
|
||||
bool MacroConditionDate::Save(obs_data_t *obj)
|
||||
bool MacroConditionDate::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_int(obj, "dayOfWeek", static_cast<int>(_dayOfWeek));
|
||||
|
|
@ -232,7 +232,7 @@ bool MacroConditionDate::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionDate::GetShortDesc()
|
||||
std::string MacroConditionDate::GetShortDesc() const
|
||||
{
|
||||
if (_dayOfWeekCheck) {
|
||||
auto it = dayOfWeekNames.find(_dayOfWeek);
|
||||
|
|
@ -285,17 +285,17 @@ void MacroConditionDate::SetTime2(const QTime &time)
|
|||
_origDateTime2.setTime(time);
|
||||
}
|
||||
|
||||
QDateTime MacroConditionDate::GetDateTime1()
|
||||
QDateTime MacroConditionDate::GetDateTime1() const
|
||||
{
|
||||
return _repeat && _updateOnRepeat ? _dateTime : _origDateTime;
|
||||
}
|
||||
|
||||
QDateTime MacroConditionDate::GetDateTime2()
|
||||
QDateTime MacroConditionDate::GetDateTime2() const
|
||||
{
|
||||
return _repeat && _updateOnRepeat ? _dateTime2 : _origDateTime2;
|
||||
}
|
||||
|
||||
QDateTime MacroConditionDate::GetNextMatchDateTime()
|
||||
QDateTime MacroConditionDate::GetNextMatchDateTime() const
|
||||
{
|
||||
return _dateTime;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ class MacroConditionDate : public MacroCondition {
|
|||
public:
|
||||
MacroConditionDate(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionDate>(m);
|
||||
|
|
@ -24,9 +24,9 @@ public:
|
|||
void SetDate2(const QDate &date);
|
||||
void SetTime1(const QTime &time);
|
||||
void SetTime2(const QTime &time);
|
||||
QDateTime GetDateTime1();
|
||||
QDateTime GetDateTime2();
|
||||
QDateTime GetNextMatchDateTime();
|
||||
QDateTime GetDateTime1() const;
|
||||
QDateTime GetDateTime2() const;
|
||||
QDateTime GetNextMatchDateTime() const;
|
||||
|
||||
enum class Day {
|
||||
ANY = 0,
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ bool MacroConditionFile::CheckCondition()
|
|||
return false;
|
||||
}
|
||||
|
||||
bool MacroConditionFile::Save(obs_data_t *obj)
|
||||
bool MacroConditionFile::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
_regex.Save(obj);
|
||||
|
|
@ -182,7 +182,7 @@ bool MacroConditionFile::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionFile::GetShortDesc()
|
||||
std::string MacroConditionFile::GetShortDesc() const
|
||||
{
|
||||
return _file;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ class MacroConditionFile : public MacroCondition {
|
|||
public:
|
||||
MacroConditionFile(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionFile>(m);
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ bool MacroConditionFilter::CheckCondition()
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool MacroConditionFilter::Save(obs_data_t *obj)
|
||||
bool MacroConditionFilter::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_string(obj, "source", GetWeakSourceName(_source).c_str());
|
||||
|
|
@ -79,7 +79,7 @@ bool MacroConditionFilter::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionFilter::GetShortDesc()
|
||||
std::string MacroConditionFilter::GetShortDesc() const
|
||||
{
|
||||
if (_filter && _source) {
|
||||
return GetWeakSourceName(_source) + " - " +
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ class MacroConditionFilter : public MacroCondition {
|
|||
public:
|
||||
MacroConditionFilter(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionFilter>(m);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ bool MacroConditionHotkey::CheckCondition()
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool MacroConditionHotkey::Save(obs_data_t *obj)
|
||||
bool MacroConditionHotkey::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
_hotkey->Save(obj);
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class MacroConditionHotkey : public MacroCondition {
|
|||
public:
|
||||
MacroConditionHotkey(Macro *m);
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionHotkey>(m);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ bool MacroConditionIdle::CheckCondition()
|
|||
return secondsSinceLastInput() >= _duration.seconds;
|
||||
}
|
||||
|
||||
bool MacroConditionIdle::Save(obs_data_t *obj)
|
||||
bool MacroConditionIdle::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
_duration.Save(obj);
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ class MacroConditionIdle : public MacroCondition {
|
|||
public:
|
||||
MacroConditionIdle(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionIdle>(m);
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ bool MacroConditionMacro::CheckCondition()
|
|||
return false;
|
||||
}
|
||||
|
||||
bool MacroConditionMacro::Save(obs_data_t *obj)
|
||||
bool MacroConditionMacro::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
SaveMacroList(obj, _macros);
|
||||
|
|
@ -150,7 +150,7 @@ bool MacroConditionMacro::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionMacro::GetShortDesc()
|
||||
std::string MacroConditionMacro::GetShortDesc() const
|
||||
{
|
||||
if (_macro.get()) {
|
||||
return _macro->Name();
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@ public:
|
|||
{
|
||||
}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionMacro>(m);
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ bool MacroConditionMedia::CheckCondition()
|
|||
return match;
|
||||
}
|
||||
|
||||
bool MacroConditionMedia::Save(obs_data_t *obj)
|
||||
bool MacroConditionMedia::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_string(obj, "source", GetWeakSourceName(_source).c_str());
|
||||
|
|
@ -289,7 +289,7 @@ bool MacroConditionMedia::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionMedia::GetShortDesc()
|
||||
std::string MacroConditionMedia::GetShortDesc() const
|
||||
{
|
||||
switch (_sourceType) {
|
||||
case Type::SOURCE:
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ public:
|
|||
MacroConditionMedia(Macro *m) : MacroCondition(m) {}
|
||||
~MacroConditionMedia();
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionMedia>(m);
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ bool MacroConditionStats::CheckCondition()
|
|||
return false;
|
||||
}
|
||||
|
||||
bool MacroConditionStats::Save(obs_data_t *obj)
|
||||
bool MacroConditionStats::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_double(obj, "value", _value);
|
||||
|
|
@ -397,7 +397,7 @@ bool MacroConditionStats::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionStats::GetShortDesc()
|
||||
std::string MacroConditionStats::GetShortDesc() const
|
||||
{
|
||||
auto it = statsTypes.find(_type);
|
||||
if (it != statsTypes.end()) {
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@ public:
|
|||
MacroConditionStats(Macro *m);
|
||||
~MacroConditionStats();
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionStats>(m);
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ bool MacroConditionPluginState::CheckCondition()
|
|||
return false;
|
||||
}
|
||||
|
||||
bool MacroConditionPluginState::Save(obs_data_t *obj)
|
||||
bool MacroConditionPluginState::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_int(obj, "condition", static_cast<int>(_condition));
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@ public:
|
|||
MacroConditionPluginState(Macro *m) : MacroCondition(m) {}
|
||||
~MacroConditionPluginState();
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionPluginState>(m);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ bool MacroConditionProcess::CheckCondition()
|
|||
return (equals || matches) && focus;
|
||||
}
|
||||
|
||||
bool MacroConditionProcess::Save(obs_data_t *obj)
|
||||
bool MacroConditionProcess::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_string(obj, "process", _process.c_str());
|
||||
|
|
@ -41,7 +41,7 @@ bool MacroConditionProcess::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionProcess::GetShortDesc()
|
||||
std::string MacroConditionProcess::GetShortDesc() const
|
||||
{
|
||||
return _process;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@ class MacroConditionProcess : public MacroCondition {
|
|||
public:
|
||||
MacroConditionProcess(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionProcess>(m);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ bool MacroConditionProfile::CheckCondition()
|
|||
return match;
|
||||
}
|
||||
|
||||
bool MacroConditionProfile::Save(obs_data_t *obj)
|
||||
bool MacroConditionProfile::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_string(obj, "profile", _profile.c_str());
|
||||
|
|
@ -32,7 +32,7 @@ bool MacroConditionProfile::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionProfile::GetShortDesc()
|
||||
std::string MacroConditionProfile::GetShortDesc() const
|
||||
{
|
||||
return _profile;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ class MacroConditionProfile : public MacroCondition {
|
|||
public:
|
||||
MacroConditionProfile(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionProfile>(m);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ bool MacroConditionRecord::CheckCondition()
|
|||
return stateMatch;
|
||||
}
|
||||
|
||||
bool MacroConditionRecord::Save(obs_data_t *obj)
|
||||
bool MacroConditionRecord::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_int(obj, "state", static_cast<int>(_recordState));
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ class MacroConditionRecord : public MacroCondition {
|
|||
public:
|
||||
MacroConditionRecord(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionRecord>(m);
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ bool MacroConditionReplayBuffer::CheckCondition()
|
|||
return stateMatch;
|
||||
}
|
||||
|
||||
bool MacroConditionReplayBuffer::Save(obs_data_t *obj)
|
||||
bool MacroConditionReplayBuffer::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
obs_data_set_int(obj, "state", static_cast<int>(_state));
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@ class MacroConditionReplayBuffer : public MacroCondition {
|
|||
public:
|
||||
MacroConditionReplayBuffer(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetId() { return id; };
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionReplayBuffer>(m);
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ bool MacroConditionSceneOrder::CheckCondition()
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool MacroConditionSceneOrder::Save(obs_data_t *obj)
|
||||
bool MacroConditionSceneOrder::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -174,7 +174,7 @@ bool MacroConditionSceneOrder::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionSceneOrder::GetShortDesc()
|
||||
std::string MacroConditionSceneOrder::GetShortDesc() const
|
||||
{
|
||||
if (_source.ToString().empty()) {
|
||||
return "";
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ class MacroConditionSceneOrder : public MacroCondition {
|
|||
public:
|
||||
MacroConditionSceneOrder(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionSceneOrder>(m);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ bool MacroConditionSceneTransform::CheckCondition()
|
|||
return ret;
|
||||
}
|
||||
|
||||
bool MacroConditionSceneTransform::Save(obs_data_t *obj)
|
||||
bool MacroConditionSceneTransform::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -59,7 +59,7 @@ bool MacroConditionSceneTransform::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionSceneTransform::GetShortDesc()
|
||||
std::string MacroConditionSceneTransform::GetShortDesc() const
|
||||
{
|
||||
if (_source.ToString().empty()) {
|
||||
return "";
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ class MacroConditionSceneTransform : public MacroCondition {
|
|||
public:
|
||||
MacroConditionSceneTransform(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionSceneTransform>(m);
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ bool MacroConditionSceneVisibility::CheckCondition()
|
|||
return false;
|
||||
}
|
||||
|
||||
bool MacroConditionSceneVisibility::Save(obs_data_t *obj)
|
||||
bool MacroConditionSceneVisibility::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -93,7 +93,7 @@ bool MacroConditionSceneVisibility::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionSceneVisibility::GetShortDesc()
|
||||
std::string MacroConditionSceneVisibility::GetShortDesc() const
|
||||
{
|
||||
if (_source.ToString().empty()) {
|
||||
return "";
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@ class MacroConditionSceneVisibility : public MacroCondition {
|
|||
public:
|
||||
MacroConditionSceneVisibility(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionSceneVisibility>(m);
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ bool MacroConditionScene::CheckCondition()
|
|||
return false;
|
||||
}
|
||||
|
||||
bool MacroConditionScene::Save(obs_data_t *obj)
|
||||
bool MacroConditionScene::Save(obs_data_t *obj) const
|
||||
{
|
||||
MacroCondition::Save(obj);
|
||||
_scene.Save(obj);
|
||||
|
|
@ -104,7 +104,7 @@ bool MacroConditionScene::Load(obs_data_t *obj)
|
|||
return true;
|
||||
}
|
||||
|
||||
std::string MacroConditionScene::GetShortDesc()
|
||||
std::string MacroConditionScene::GetShortDesc() const
|
||||
{
|
||||
if (_type == Type::CURRENT || _type == Type::PREVIOUS) {
|
||||
return _scene.ToString();
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ class MacroConditionScene : public MacroCondition {
|
|||
public:
|
||||
MacroConditionScene(Macro *m) : MacroCondition(m) {}
|
||||
bool CheckCondition();
|
||||
bool Save(obs_data_t *obj);
|
||||
bool Save(obs_data_t *obj) const;
|
||||
bool Load(obs_data_t *obj);
|
||||
std::string GetShortDesc();
|
||||
std::string GetId() { return id; };
|
||||
std::string GetShortDesc() const;
|
||||
std::string GetId() const { return id; };
|
||||
static std::shared_ptr<MacroCondition> Create(Macro *m)
|
||||
{
|
||||
return std::make_shared<MacroConditionScene>(m);
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user