Merge remote-tracking branch 'WarmUpTill/master'

src/headers/advanced-scene-switcher.hpp

@@ -42,6 +42,7 @@ public:
 	int executableFindByData(const QString &exe);
 	int IgnoreIdleWindowsFindByData(const QString &window);
 	int randomFindByData(const QString &scene);
+	int timeFindByData(const QString &timeStr);
 
 	void UpdateNonMatchingScene(const QString &name);
 	void UpdateAutoStopScene(const QString &name);
@@ -122,6 +123,10 @@ public slots:
 	void on_mediaAdd_clicked();
 	void on_mediaRemove_clicked();
 
+	void on_timeSwitches_currentRowChanged(int idx);
+	void on_timeAdd_clicked();
+	void on_timeRemove_clicked();
+
 	void on_priorityUp_clicked();
 	void on_priorityDown_clicked();
 

src/headers/switcher-data-structs.hpp

@@ -8,6 +8,7 @@
 #include <mutex>
 #include <fstream>
 #include <QDateTime>
+#include <QThread>
 #include "utility.hpp"
 
 #define DEFAULT_INTERVAL 300
@@ -23,6 +24,7 @@
 #define SCREEN_REGION_FUNC 4
 #define WINDOW_TITLE_FUNC 5
 #define MEDIA_FUNC 6
+#define TIME_FUNC 7
 
 #define DEFAULT_PRIORITY_0 READ_FILE_FUNC
 #define DEFAULT_PRIORITY_1 ROUND_TRIP_FUNC
@@ -31,6 +33,7 @@
 #define DEFAULT_PRIORITY_4 SCREEN_REGION_FUNC
 #define DEFAULT_PRIORITY_5 WINDOW_TITLE_FUNC
 #define DEFAULT_PRIORITY_6 MEDIA_FUNC
+#define DEFAULT_PRIORITY_7 TIME_FUNC
 
 using namespace std;
 
@@ -227,6 +230,26 @@ struct MediaSwitch {
 	}
 };
 
+struct TimeSwitch {
+	OBSWeakSource scene;
+	OBSWeakSource transition;
+	QTime time;
+	bool matched;
+	bool usePreviousScene;
+	string timeSwitchStr;
+
+	inline TimeSwitch(OBSWeakSource scene_, OBSWeakSource transition_,
+			  QTime time_, bool usePreviousScene_,
+			  string timeSwitchStr_)
+		: scene(scene_),
+		  transition(transition_),
+		  time(time_),
+		  usePreviousScene(usePreviousScene_),
+		  timeSwitchStr(timeSwitchStr_)
+	{
+	}
+};
+
 typedef enum { NO_SWITCH = 0, SWITCH = 1, RANDOM_SWITCH = 2 } NoMatch;
 
 /********************************************************************************
@@ -281,10 +304,24 @@ struct SwitcherData {
 
 	vector<MediaSwitch> mediaSwitches;
 
+	vector<TimeSwitch> timeSwitches;
+
 	vector<int> functionNamesByPriority = vector<int>{
 		DEFAULT_PRIORITY_0, DEFAULT_PRIORITY_1, DEFAULT_PRIORITY_2,
 		DEFAULT_PRIORITY_3, DEFAULT_PRIORITY_4, DEFAULT_PRIORITY_5,
-		DEFAULT_PRIORITY_6};
+		DEFAULT_PRIORITY_6, DEFAULT_PRIORITY_7};
+
+	std::vector<std::string> threadPrioritiesNamesOrderdByPrio{
+		"Lowest", "Low", "Normal", "High", "Highest", "Time critical",
+	};
+	std::map<std::string, int> threadPriorities = {
+		{"Lowest", QThread::LowestPriority},
+		{"Low", QThread::LowPriority},
+		{"Normal", QThread::NormalPriority},
+		{"High", QThread::HighPriority},
+		{"Highest", QThread::HighestPriority},
+		{"Time critical", QThread::TimeCriticalPriority},
+	};
 
 	void Thread();
 	void Start();
@@ -315,6 +352,8 @@ struct SwitcherData {
 			 OBSWeakSource &transition, int &delay);
 	void checkMediaSwitch(bool &match, OBSWeakSource &scene,
 			      OBSWeakSource &transition);
+	void checkTimeSwitch(bool &match, OBSWeakSource &scene,
+			     OBSWeakSource &transition);
 
 	void Prune()
 	{
@@ -401,6 +440,13 @@ struct SwitcherData {
 				fileSwitches.erase(fileSwitches.begin() + i--);
 		}
 
+		for (size_t i = 0; i < timeSwitches.size(); i++) {
+			TimeSwitch &s = timeSwitches[i];
+			if (!WeakSourceValid(s.scene) ||
+			    !WeakSourceValid(s.transition))
+				timeSwitches.erase(timeSwitches.begin() + i--);
+		}
+
 		if (!idleData.usePreviousScene &&
 			    !WeakSourceValid(idleData.scene) ||
 		    !WeakSourceValid(idleData.transition)) {

src/headers/utility.hpp

@@ -5,9 +5,9 @@
 #include "switcher-data-structs.hpp"
 using namespace std;
 
-static inline bool WeakSourceValid(obs_weak_source_t* ws)
+static inline bool WeakSourceValid(obs_weak_source_t *ws)
 {
-	obs_source_t* source = obs_weak_source_get_source(ws);
+	obs_source_t *source = obs_weak_source_get_source(ws);
 	if (source)
 		obs_source_release(source);
 	return !!source;
@@ -119,7 +119,7 @@ static inline QString MakeFileSwitchName(const QString &scene,
 	return switchName;
 }
 
-typedef enum  {
+typedef enum {
 	TIME_RESTRICTION_NONE,
 	TIME_RESTRICTION_SHORTER,
 	TIME_RESTRICTION_LONGER,
@@ -171,6 +171,15 @@ MakeMediaSwitchName(const QString &source, const QString &scene,
 	return switchName;
 }
 
+static inline QString MakeTimeSwitchName(const QString &scene,
+					 const QString &transition, QTime &time)
+{
+	QString switchName = QStringLiteral("At ") + time.toString() +
+			     QStringLiteral(" switch to ") + scene +
+			     QStringLiteral(" using ") + transition;
+	return switchName;
+}
+
 static inline string GetWeakSourceName(obs_weak_source_t *weak_source)
 {
 	string name;