Move Duration and DurationSelection into separate files

CMakeLists.txt

@@ -256,6 +256,8 @@ target_sources(
           src/utils/connection-manager.hpp
           src/utils/curl-helper.cpp
           src/utils/curl-helper.hpp
+          src/utils/duration.cpp
+          src/utils/duration.hpp
           src/utils/duration-control.cpp
           src/utils/duration-control.hpp
           src/utils/export-symbol-helper.hpp

src/utils/duration-control.cpp

@@ -1,168 +1,12 @@
 #include "duration-control.hpp"
 #include "mouse-wheel-guard.hpp"
-#include "obs-module.h"
+#include "obs-module-helper.hpp"
 #include "utility.hpp"
 
-#include <sstream>
-#include <iomanip>
 #include <QHBoxLayout>
 
 namespace advss {
 
-Duration::Duration(double initialValueInSeconds) : _value(initialValueInSeconds)
-{
-}
-
-void Duration::Save(obs_data_t *obj, const char *name) const
-{
-	auto data = obs_data_create();
-	_value.Save(data, "value");
-	obs_data_set_int(data, "unit", static_cast<int>(_unit));
-	obs_data_set_int(data, "version", 1);
-	obs_data_set_obj(obj, name, data);
-	obs_data_release(data);
-}
-
-static int durationUnitToMultiplier(Duration::Unit u)
-{
-	switch (u) {
-	case Duration::Unit::SECONDS:
-		return 1;
-	case Duration::Unit::MINUTES:
-		return 60;
-	case Duration::Unit::HOURS:
-		return 3600;
-	default:
-		break;
-	}
-
-	return 0;
-}
-
-void Duration::Load(obs_data_t *obj, const char *name)
-{
-	auto data = obs_data_get_obj(obj, name);
-
-	// TODO: remove this fallback
-	if (!data || !obs_data_has_user_value(data, "version") ||
-	    obs_data_get_int(data, "version") != 1) {
-		bool usingDefaultArgs = strcmp("duration", name) == 0;
-		if (usingDefaultArgs) {
-			_value = obs_data_get_double(obj, "seconds");
-		}
-		if (_value.GetValue() == 0.0) {
-			_value = obs_data_get_double(obj, name);
-		}
-
-		if (usingDefaultArgs) {
-			_unit = static_cast<Duration::Unit>(
-				obs_data_get_int(obj, "displayUnit"));
-		} else if (_value.GetValue() >= 86400) {
-			_unit = (_value.GetValue() / 60 >= 86400)
-					? Duration::Unit::HOURS
-					: Duration::Unit::MINUTES;
-		} else {
-			_unit = Duration::Unit::SECONDS;
-		}
-
-		_value = _value / durationUnitToMultiplier(_unit);
-
-		obs_data_release(data);
-		return;
-	}
-
-	_value.Load(data, "value");
-	_unit = static_cast<Duration::Unit>(obs_data_get_int(data, "unit"));
-	obs_data_release(data);
-}
-
-bool Duration::DurationReached()
-{
-	if (IsReset()) {
-		_startTime = std::chrono::high_resolution_clock::now();
-	}
-
-	auto runTime = std::chrono::duration_cast<std::chrono::milliseconds>(
-		std::chrono::high_resolution_clock::now() - _startTime);
-	return runTime.count() >= Milliseconds();
-}
-
-bool Duration::IsReset() const
-{
-	return _startTime.time_since_epoch().count() == 0;
-}
-
-double Duration::Seconds() const
-{
-	return _value.GetValue() * durationUnitToMultiplier(_unit);
-}
-
-double Duration::Milliseconds() const
-{
-	return Seconds() * 1000.0;
-}
-
-double Duration::TimeRemaining() const
-{
-	if (IsReset()) {
-		return Seconds();
-	}
-	auto runTime = std::chrono::duration_cast<std::chrono::milliseconds>(
-		std::chrono::high_resolution_clock::now() - _startTime);
-
-	if (runTime.count() >= Milliseconds()) {
-		return 0;
-	}
-	return (Milliseconds() - runTime.count()) / 1000.0;
-}
-
-void Duration::SetTimeRemaining(double remaining)
-{
-	long long msPassed = (Seconds() - remaining) * 1000;
-	_startTime = std::chrono::high_resolution_clock::now() -
-		     std::chrono::milliseconds(msPassed);
-}
-
-void Duration::Reset()
-{
-	_startTime = {};
-}
-
-static std::string durationUnitToString(Duration::Unit u)
-{
-	switch (u) {
-	case Duration::Unit::SECONDS:
-		return obs_module_text("AdvSceneSwitcher.unit.secends");
-	case Duration::Unit::MINUTES:
-		return obs_module_text("AdvSceneSwitcher.unit.minutes");
-	case Duration::Unit::HOURS:
-		return obs_module_text("AdvSceneSwitcher.unit.hours");
-	default:
-		break;
-	}
-
-	return "";
-}
-
-std::string Duration::ToString() const
-{
-	std::ostringstream ss;
-	ss << std::fixed << std::setprecision(2) << _value.GetValue() << " "
-	   << durationUnitToString(_unit);
-	if (!_value.IsFixedType()) {
-		ss << " [" << GetWeakVariableName(_value.GetVariable()) << "]";
-	}
-	return ss.str();
-}
-
-void Duration::SetUnit(Unit u)
-{
-	double prevMultiplier = durationUnitToMultiplier(_unit);
-	double newMultiplier = durationUnitToMultiplier(u);
-	_unit = u;
-	_value = _value * (prevMultiplier / newMultiplier);
-}
-
 static void populateUnits(QComboBox *list)
 {
 	list->addItem(obs_module_text("AdvSceneSwitcher.unit.secends"));
@@ -214,6 +58,22 @@ void DurationSelection::_DurationChanged(const NumberVariable<double> &value)
 	emit DurationChanged(_current);
 }
 
+static int durationUnitToMultiplier(Duration::Unit u)
+{
+	switch (u) {
+	case Duration::Unit::SECONDS:
+		return 1;
+	case Duration::Unit::MINUTES:
+		return 60;
+	case Duration::Unit::HOURS:
+		return 3600;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
 void DurationSelection::_UnitChanged(int idx)
 {
 	Duration::Unit unit = static_cast<Duration::Unit>(idx);

src/utils/duration-control.hpp

@@ -1,48 +1,14 @@
 #pragma once
+#include "duration.hpp"
 #include "variable-spinbox.hpp"
-#include "obs-data.h"
 
 #include <QWidget>
 #include <QDoubleSpinBox>
 #include <QComboBox>
 #include <QPushButton>
-#include <chrono>
 
 namespace advss {
 
-class Duration {
-public:
-	Duration() = default;
-	Duration(double initialValueInSeconds);
-
-	void Save(obs_data_t *obj, const char *name = "duration") const;
-	void Load(obs_data_t *obj, const char *name = "duration");
-
-	bool DurationReached();
-	bool IsReset() const;
-	double Seconds() const;
-	double Milliseconds() const;
-	double TimeRemaining() const;
-	void SetTimeRemaining(double);
-	void Reset();
-	std::string ToString() const;
-
-	enum class Unit {
-		SECONDS,
-		MINUTES,
-		HOURS,
-	};
-	Unit GetUnit() const { return _unit; }
-	void SetUnit(Unit u);
-
-private:
-	NumberVariable<double> _value = 0.;
-	Unit _unit = Unit::SECONDS;
-	std::chrono::high_resolution_clock::time_point _startTime;
-
-	friend class DurationSelection;
-};
-
 class DurationSelection : public QWidget {
 	Q_OBJECT
 public:

src/utils/duration.cpp

@@ -0,0 +1,169 @@
+#include "duration.hpp"
+#include "obs-module-helper.hpp"
+#include "utility.hpp"
+
+#include <sstream>
+#include <iomanip>
+
+namespace advss {
+
+Duration::Duration(double initialValueInSeconds) : _value(initialValueInSeconds)
+{
+}
+
+void Duration::Save(obs_data_t *obj, const char *name) const
+{
+	auto data = obs_data_create();
+	_value.Save(data, "value");
+	obs_data_set_int(data, "unit", static_cast<int>(_unit));
+	obs_data_set_int(data, "version", 1);
+	obs_data_set_obj(obj, name, data);
+	obs_data_release(data);
+}
+
+static int durationUnitToMultiplier(Duration::Unit u);
+
+void Duration::Load(obs_data_t *obj, const char *name)
+{
+	auto data = obs_data_get_obj(obj, name);
+
+	// TODO: remove this fallback
+	if (!data || !obs_data_has_user_value(data, "version") ||
+	    obs_data_get_int(data, "version") != 1) {
+		bool usingDefaultArgs = strcmp("duration", name) == 0;
+		if (usingDefaultArgs) {
+			_value = obs_data_get_double(obj, "seconds");
+		}
+		if (_value.GetValue() == 0.0) {
+			_value = obs_data_get_double(obj, name);
+		}
+
+		if (usingDefaultArgs) {
+			_unit = static_cast<Duration::Unit>(
+				obs_data_get_int(obj, "displayUnit"));
+		} else if (_value.GetValue() >= 86400) {
+			_unit = (_value.GetValue() / 60 >= 86400)
+					? Duration::Unit::HOURS
+					: Duration::Unit::MINUTES;
+		} else {
+			_unit = Duration::Unit::SECONDS;
+		}
+
+		_value = _value / durationUnitToMultiplier(_unit);
+
+		obs_data_release(data);
+		return;
+	}
+
+	_value.Load(data, "value");
+	_unit = static_cast<Duration::Unit>(obs_data_get_int(data, "unit"));
+	obs_data_release(data);
+}
+
+bool Duration::DurationReached()
+{
+	if (IsReset()) {
+		_startTime = std::chrono::high_resolution_clock::now();
+	}
+
+	auto runTime = std::chrono::duration_cast<std::chrono::milliseconds>(
+		std::chrono::high_resolution_clock::now() - _startTime);
+	return runTime.count() >= Milliseconds();
+}
+
+bool Duration::IsReset() const
+{
+	return _startTime.time_since_epoch().count() == 0;
+}
+
+double Duration::Seconds() const
+{
+	return _value.GetValue() * durationUnitToMultiplier(_unit);
+}
+
+double Duration::Milliseconds() const
+{
+	return Seconds() * 1000.0;
+}
+
+double Duration::TimeRemaining() const
+{
+	if (IsReset()) {
+		return Seconds();
+	}
+	auto runTime = std::chrono::duration_cast<std::chrono::milliseconds>(
+		std::chrono::high_resolution_clock::now() - _startTime);
+
+	if (runTime.count() >= Milliseconds()) {
+		return 0;
+	}
+	return (Milliseconds() - runTime.count()) / 1000.0;
+}
+
+void Duration::SetTimeRemaining(double remaining)
+{
+	long long msPassed = (Seconds() - remaining) * 1000;
+	_startTime = std::chrono::high_resolution_clock::now() -
+		     std::chrono::milliseconds(msPassed);
+}
+
+void Duration::Reset()
+{
+	_startTime = {};
+}
+
+static std::string durationUnitToString(Duration::Unit u)
+{
+	switch (u) {
+	case Duration::Unit::SECONDS:
+		return obs_module_text("AdvSceneSwitcher.unit.secends");
+	case Duration::Unit::MINUTES:
+		return obs_module_text("AdvSceneSwitcher.unit.minutes");
+	case Duration::Unit::HOURS:
+		return obs_module_text("AdvSceneSwitcher.unit.hours");
+	default:
+		break;
+	}
+
+	return "";
+}
+
+std::string Duration::ToString() const
+{
+	std::ostringstream ss;
+	ss << std::fixed << std::setprecision(2) << _value.GetValue() << " "
+	   << durationUnitToString(_unit);
+	if (!_value.IsFixedType()) {
+		ss << " [" << GetWeakVariableName(_value.GetVariable()) << "]";
+	}
+	return ss.str();
+}
+
+// TODO: Remove the code below
+// Only used for backwards compatibility
+
+static int durationUnitToMultiplier(Duration::Unit u)
+{
+	switch (u) {
+	case Duration::Unit::SECONDS:
+		return 1;
+	case Duration::Unit::MINUTES:
+		return 60;
+	case Duration::Unit::HOURS:
+		return 3600;
+	default:
+		break;
+	}
+
+	return 0;
+}
+
+void Duration::SetUnit(Unit u)
+{
+	double prevMultiplier = durationUnitToMultiplier(_unit);
+	double newMultiplier = durationUnitToMultiplier(u);
+	_unit = u;
+	_value = _value * (prevMultiplier / newMultiplier);
+}
+
+} // namespace advss

src/utils/duration.hpp

@@ -0,0 +1,45 @@
+#pragma once
+#include "variable-number.hpp"
+#include "obs-data.h"
+
+#include <chrono>
+
+namespace advss {
+
+class Duration {
+public:
+	Duration() = default;
+	Duration(double initialValueInSeconds);
+
+	void Save(obs_data_t *obj, const char *name = "duration") const;
+	void Load(obs_data_t *obj, const char *name = "duration");
+
+	bool DurationReached();
+	bool IsReset() const;
+	double Seconds() const;
+	double Milliseconds() const;
+	double TimeRemaining() const;
+	void SetTimeRemaining(double);
+	void Reset();
+	std::string ToString() const;
+
+	enum class Unit {
+		SECONDS,
+		MINUTES,
+		HOURS,
+	};
+	Unit GetUnit() const { return _unit; }
+
+	// TODO: Remove
+	// Only use this function if you intend to convert old settings formats
+	void SetUnit(Unit u);
+
+private:
+	NumberVariable<double> _value = 0.;
+	Unit _unit = Unit::SECONDS;
+	std::chrono::high_resolution_clock::time_point _startTime;
+
+	friend class DurationSelection;
+};
+
+} // namespace advss