Restructure files

- Move condition and action related parts into separate files
 - Move duration constraint to macro condition
 - Move duration constraint widget to macro condition edit
 - Adjust includes

src/headers/duration-control.hpp

@@ -57,57 +57,3 @@ private:
 
 	double _unitMultiplier;
 };
-
-enum class DurationCondition {
-	NONE,
-	MORE,
-	EQUAL,
-	LESS,
-};
-
-class DurationConstraint {
-public:
-	void Save(obs_data_t *obj, const char *condName = "time_constraint",
-		  const char *secondsName = "seconds",
-		  const char *unitName = "displayUnit");
-	void Load(obs_data_t *obj, const char *condName = "time_constraint",
-		  const char *secondsName = "seconds",
-		  const char *unitName = "displayUnit");
-	void SetCondition(DurationCondition cond) { _type = cond; }
-	void SetDuration(const Duration &dur) { _dur = dur; }
-	void SetValue(double value) { _dur.seconds = value; }
-	void SetUnit(DurationUnit u) { _dur.displayUnit = u; }
-	DurationCondition GetCondition() { return _type; }
-	Duration GetDuration() { return _dur; }
-	bool DurationReached();
-	void Reset();
-
-private:
-	DurationCondition _type = DurationCondition::NONE;
-	Duration _dur;
-	bool _timeReached = false;
-};
-
-class DurationConstraintEdit : public QWidget {
-	Q_OBJECT
-public:
-	DurationConstraintEdit(QWidget *parent = nullptr);
-	void SetValue(DurationConstraint &value);
-	void SetUnit(DurationUnit u);
-	void SetDuration(const Duration &d);
-
-private slots:
-	void _ConditionChanged(int value);
-	void ToggleClicked();
-signals:
-	void DurationChanged(double value);
-	void UnitChanged(DurationUnit u);
-	void ConditionChanged(DurationCondition value);
-
-private:
-	void Collapse(bool collapse);
-
-	DurationSelection *_duration;
-	QComboBox *_condition;
-	QPushButton *_toggle;
-};

src/headers/macro-action-edit.hpp

@@ -1,5 +1,8 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-action.hpp"
+
+#include <QComboBox>
+#include <memory>
 
 struct MacroActionInfo {
 	using TCreateMethod = std::shared_ptr<MacroAction> (*)(Macro *m);

src/headers/macro-action-filter.hpp

@@ -2,7 +2,9 @@
 #include "macro-action-edit.hpp"
 #include "resizing-text-edit.hpp"
 
+#include <QComboBox>
 #include <QSpinBox>
+#include <QPushButton>
 
 enum class FilterAction {
 	ENABLE,

src/headers/macro-action-hotkey.hpp

@@ -2,6 +2,7 @@
 #include "macro-action-edit.hpp"
 #include "hotkey.hpp"
 
+#include <QComboBox>
 #include <QCheckBox>
 #include <QSpinBox>
 #include <QHBoxLayout>

src/headers/macro-action-profile.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include "macro-action-edit.hpp"
 
+#include <QComboBox>
+
 class MacroActionProfile : public MacroAction {
 public:
 	MacroActionProfile(Macro *m) : MacroAction(m) {}

src/headers/macro-action-scene-collection.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include "macro-action-edit.hpp"
 
+#include <QComboBox>
+
 class MacroActionSceneCollection : public MacroAction {
 public:
 	MacroActionSceneCollection(Macro *m) : MacroAction(m) {}

src/headers/macro-action-screenshot.hpp

@@ -1,6 +1,8 @@
 #pragma once
 #include "macro-action-edit.hpp"
 
+#include <QComboBox>
+
 class MacroActionScreenshot : public MacroAction {
 public:
 	MacroActionScreenshot(Macro *m) : MacroAction(m) {}

src/headers/macro-action-source.hpp

@@ -5,6 +5,7 @@
 #include <QSpinBox>
 #include <QLabel>
 #include <QPushButton>
+#include <QComboBox>
 
 enum class SourceAction {
 	ENABLE,

src/headers/macro-action.hpp

@@ -0,0 +1,26 @@
+#pragma once
+#include "macro-segment.hpp"
+#include "macro-ref.hpp"
+
+class MacroAction : public MacroSegment {
+public:
+	MacroAction(Macro *m) : MacroSegment(m) {}
+	virtual bool PerformAction() = 0;
+	virtual bool Save(obs_data_t *obj) = 0;
+	virtual bool Load(obs_data_t *obj) = 0;
+	virtual void LogAction();
+};
+
+class MacroRefAction : public MacroAction {
+public:
+	MacroRefAction(Macro *m) : MacroAction(m) {}
+	void ResolveMacroRef();
+	MacroRef _macro;
+};
+
+class MultiMacroRefAction : public MacroAction {
+public:
+	MultiMacroRefAction(Macro *m) : MacroAction(m) {}
+	void ResolveMacroRef();
+	std::vector<MacroRef> _macros;
+};

src/headers/macro-condition-edit.hpp

@@ -1,5 +1,7 @@
 #pragma once
-#include "macro.hpp"
+#include "macro-condition.hpp"
+
+#include <memory>
 
 struct MacroConditionInfo {
 	using TCreateMethod = std::shared_ptr<MacroCondition> (*)(Macro *m);
@@ -28,6 +30,30 @@ private:
 	static std::map<std::string, MacroConditionInfo> _methods;
 };
 
+class DurationConstraintEdit : public QWidget {
+	Q_OBJECT
+public:
+	DurationConstraintEdit(QWidget *parent = nullptr);
+	void SetValue(DurationConstraint &value);
+	void SetUnit(DurationUnit u);
+	void SetDuration(const Duration &d);
+
+private slots:
+	void _ConditionChanged(int value);
+	void ToggleClicked();
+signals:
+	void DurationChanged(double value);
+	void UnitChanged(DurationUnit u);
+	void ConditionChanged(DurationCondition value);
+
+private:
+	void Collapse(bool collapse);
+
+	DurationSelection *_duration;
+	QComboBox *_condition;
+	QPushButton *_toggle;
+};
+
 class MacroConditionEdit : public MacroSegmentEdit {
 	Q_OBJECT
 

src/headers/macro-condition.hpp

@@ -0,0 +1,88 @@
+#pragma once
+#include "macro-segment.hpp"
+#include "macro-ref.hpp"
+#include "duration-control.hpp"
+
+constexpr auto logic_root_offset = 100;
+
+enum class LogicType {
+	ROOT_NONE = 0,
+	ROOT_NOT,
+	ROOT_LAST,
+	// leave some space for potential expansion
+	NONE = 100,
+	AND,
+	OR,
+	AND_NOT,
+	OR_NOT,
+	LAST,
+};
+
+static inline bool isRootLogicType(LogicType l)
+{
+	return static_cast<int>(l) < logic_root_offset;
+}
+
+struct LogicTypeInfo {
+	std::string _name;
+};
+
+enum class DurationCondition {
+	NONE,
+	MORE,
+	EQUAL,
+	LESS,
+};
+
+class DurationConstraint {
+public:
+	void Save(obs_data_t *obj, const char *condName = "time_constraint",
+		  const char *secondsName = "seconds",
+		  const char *unitName = "displayUnit");
+	void Load(obs_data_t *obj, const char *condName = "time_constraint",
+		  const char *secondsName = "seconds",
+		  const char *unitName = "displayUnit");
+	void SetCondition(DurationCondition cond) { _type = cond; }
+	void SetDuration(const Duration &dur) { _dur = dur; }
+	void SetValue(double value) { _dur.seconds = value; }
+	void SetUnit(DurationUnit u) { _dur.displayUnit = u; }
+	DurationCondition GetCondition() { return _type; }
+	Duration GetDuration() { return _dur; }
+	bool DurationReached();
+	void Reset();
+
+private:
+	DurationCondition _type = DurationCondition::NONE;
+	Duration _dur;
+	bool _timeReached = false;
+};
+
+class MacroCondition : public MacroSegment {
+public:
+	MacroCondition(Macro *m) : MacroSegment(m) {}
+	virtual bool CheckCondition() = 0;
+	virtual bool Save(obs_data_t *obj) = 0;
+	virtual bool Load(obs_data_t *obj) = 0;
+	LogicType GetLogicType() { return _logic; }
+	void SetLogicType(LogicType logic) { _logic = logic; }
+	static const std::map<LogicType, LogicTypeInfo> logicTypes;
+
+	bool DurationReached() { return _duration.DurationReached(); }
+	void ResetDuration() { _duration.Reset(); }
+	DurationConstraint GetDurationConstraint() { return _duration; }
+	void SetDurationConstraint(const DurationConstraint &dur);
+	void SetDurationCondition(DurationCondition cond);
+	void SetDurationUnit(DurationUnit u);
+	void SetDuration(double seconds);
+
+private:
+	LogicType _logic = LogicType::ROOT_NONE;
+	DurationConstraint _duration;
+};
+
+class MacroRefCondition : public MacroCondition {
+public:
+	MacroRefCondition(Macro *m) : MacroCondition(m) {}
+	void ResolveMacroRef();
+	MacroRef _macro;
+};

src/headers/macro-ref.hpp

@@ -0,0 +1,23 @@
+#pragma once
+#include <string>
+#include <QString>
+#include <obs-module.h>
+
+class Macro;
+
+class MacroRef {
+public:
+	MacroRef(){};
+	MacroRef(std::string name);
+	void UpdateRef();
+	void UpdateRef(std::string name);
+	void UpdateRef(QString name);
+	void Save(obs_data_t *obj);
+	void Load(obs_data_t *obj);
+	Macro *get();
+	Macro *operator->();
+
+private:
+	std::string _name = "";
+	Macro *_ref = nullptr;
+};

src/headers/macro.hpp

@@ -1,6 +1,7 @@
 #pragma once
-#include "macro-segment.hpp"
-#include "duration-control.hpp"
+#include "macro-action.hpp"
+#include "macro-condition.hpp"
+#include "macro-ref.hpp"
 
 #include <QString>
 #include <string>
@@ -13,62 +14,6 @@
 
 constexpr auto macro_func = 10;
 
-constexpr auto logic_root_offset = 100;
-
-enum class LogicType {
-	ROOT_NONE = 0,
-	ROOT_NOT,
-	ROOT_LAST,
-	// leave some space for potential expansion
-	NONE = 100,
-	AND,
-	OR,
-	AND_NOT,
-	OR_NOT,
-	LAST,
-};
-
-static inline bool isRootLogicType(LogicType l)
-{
-	return static_cast<int>(l) < logic_root_offset;
-}
-
-struct LogicTypeInfo {
-	std::string _name;
-};
-
-class MacroCondition : public MacroSegment {
-public:
-	MacroCondition(Macro *m) : MacroSegment(m) {}
-	virtual bool CheckCondition() = 0;
-	virtual bool Save(obs_data_t *obj) = 0;
-	virtual bool Load(obs_data_t *obj) = 0;
-	LogicType GetLogicType() { return _logic; }
-	void SetLogicType(LogicType logic) { _logic = logic; }
-	static const std::map<LogicType, LogicTypeInfo> logicTypes;
-
-	bool DurationReached() { return _duration.DurationReached(); }
-	void ResetDuration() { _duration.Reset(); }
-	DurationConstraint GetDurationConstraint() { return _duration; }
-	void SetDurationConstraint(const DurationConstraint &dur);
-	void SetDurationCondition(DurationCondition cond);
-	void SetDurationUnit(DurationUnit u);
-	void SetDuration(double seconds);
-
-private:
-	LogicType _logic = LogicType::ROOT_NONE;
-	DurationConstraint _duration;
-};
-
-class MacroAction : public MacroSegment {
-public:
-	MacroAction(Macro *m) : MacroSegment(m) {}
-	virtual bool PerformAction() = 0;
-	virtual bool Save(obs_data_t *obj) = 0;
-	virtual bool Load(obs_data_t *obj) = 0;
-	virtual void LogAction();
-};
-
 class Macro {
 public:
 	Macro(const std::string &name = "");
@@ -155,41 +100,3 @@ private:
 
 Macro *GetMacroByName(const char *name);
 Macro *GetMacroByQString(const QString &name);
-
-class MacroRef {
-public:
-	MacroRef(){};
-	MacroRef(std::string name);
-	void UpdateRef();
-	void UpdateRef(std::string name);
-	void UpdateRef(QString name);
-	void Save(obs_data_t *obj);
-	void Load(obs_data_t *obj);
-	Macro *get();
-	Macro *operator->();
-
-private:
-	std::string _name = "";
-	Macro *_ref = nullptr;
-};
-
-class MacroRefCondition : public MacroCondition {
-public:
-	MacroRefCondition(Macro *m) : MacroCondition(m) {}
-	void ResolveMacroRef();
-	MacroRef _macro;
-};
-
-class MacroRefAction : public MacroAction {
-public:
-	MacroRefAction(Macro *m) : MacroAction(m) {}
-	void ResolveMacroRef();
-	MacroRef _macro;
-};
-
-class MultiMacroRefAction : public MacroAction {
-public:
-	MultiMacroRefAction(Macro *m) : MacroAction(m) {}
-	void ResolveMacroRef();
-	std::vector<MacroRef> _macros;
-};