version 3.21.0

add PISystemTime overload for thread/timer/io classes

libs/main/thread/pitimer.h

@@ -57,15 +57,15 @@ public:
 	bool stop();
 
 	typedef void (*TickFunc)(PITimer *);
-	TickFunc tfunc;
-	PITimer * parent;
+	TickFunc tfunc   = nullptr;
+	PITimer * parent = nullptr;
 
 protected:
 	virtual bool startTimer(double interval_ms) = 0;
 	virtual bool stopTimer()                    = 0;
 
-	double interval_, deferred_delay;
-	bool deferred_, deferred_mode; // mode: true - date, false - delay
+	double interval_ = 1000., deferred_delay = 0.;
+	bool deferred_ = false, deferred_mode = false; // mode: true - date, false - delay
 	std::atomic_bool running_;
 	PIDateTime deferred_datetime;
 };
@@ -131,6 +131,7 @@ public:
 	double interval() const;
 
 	EVENT_HANDLER1(void, setInterval, double, ms);
+	void setInterval(PISystemTime interval) { setInterval(interval.toMilliseconds()); }
 
 	//! \~english Returns if timer is started
 	//! \~russian Возвращает работает ли таймер
@@ -143,6 +144,7 @@ public:
 	EVENT_HANDLER0(bool, start);
 	EVENT_HANDLER1(bool, start, double, interval_ms_d);
 	bool start(int interval_ms_i);
+	bool start(PISystemTime interval) { return start(interval.toMilliseconds()); }
 	EVENT_HANDLER0(bool, restart);
 
 
@@ -212,19 +214,11 @@ public:
 
 	//! \~english Add frequency delimiter "delim" with optional delimiter slot "slot"
 	//! \~russian Добавляет делитель частоты "delim" с необязательным методом "slot"
-	void addDelimiter(int delim, std::function<void(void *)> slot) {
-		delims << Delimiter([slot](void * d, int) { slot(d); }, delim);
-	}
+	void addDelimiter(int delim, std::function<void(void *)> slot);
 
 	//! \~english Remove all frequency delimiters "delim"
 	//! \~russian Удаляет все делители частоты "delim"
-	void removeDelimiter(int delim) {
-		for (int i = 0; i < delims.size_s(); ++i)
-			if (delims[i].delim == delim) {
-				delims.remove(i);
-				i--;
-			}
-	}
+	void removeDelimiter(int delim);
 
 	EVENT_HANDLER0(void, clearDelimiters) { delims.clear(); }
 
@@ -301,11 +295,10 @@ protected:
 		Delimiter(TimerEvent slot_ = 0, int delim_ = 1) {
 			slot  = slot_;
 			delim = delim_;
-			tick  = 0;
 		}
 		TimerEvent slot;
-		int delim;
-		int tick;
+		int delim = 0;
+		int tick  = 0;
 	};
 
 	void initFirst();
@@ -318,14 +311,14 @@ protected:
 	//! Timer execution function, similar to "slot" or event \a timeout(). By default does nothing
 	virtual void tick(void * data_, int delimiter) {}
 
-	void * data_t;
+	void * data_t = nullptr;
 	std::atomic_bool lockRun, callEvents;
 	PIMutex mutex_;
-	TimerEvent ret_func;
-	TimerImplementation imp_mode;
+	TimerEvent ret_func          = nullptr;
+	TimerImplementation imp_mode = Thread;
 	PIVector<Delimiter> delims;
 
-	mutable _PITimerBase * imp;
+	mutable _PITimerBase * imp = nullptr;
 };