SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

PITimer remove wait in stop, waitForFinish

Browse Source
This commit is contained in:
Бычков Андрей
2022-11-10 15:26:19 +03:00
parent 3d7e845213
commit d46f1a137a
3 changed files with 22 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/main/thread/pitimer.h
View File

@@ -53,7 +53,7 @@ public:
void startDeferred(PIDateTime start_datetime) {startDeferred(interval_, start_datetime);}
void startDeferred(double interval_ms, PIDateTime start_datetime);
bool stop(bool wait);
bool stop();
typedef void(*TickFunc)(PITimer*);
TickFunc tfunc;
@@ -62,7 +62,7 @@ public:
protected:
virtual bool startTimer(double interval_ms) = 0;
virtual bool stopTimer(bool wait) = 0;
virtual bool stopTimer() = 0;
double interval_, deferred_delay;
bool deferred_, deferred_mode; // mode: true - date, false - delay
@@ -161,14 +161,7 @@ public:
void startDeferred(double interval_ms, PIDateTime start_datetime);
EVENT_HANDLER0(bool, stop);
EVENT_HANDLER1(bool, stop, bool, wait);
bool waitForFinish() {return waitForFinish(-1);}
bool waitForFinish(int timeout_msecs);
//! \~english Stop timer and wait for finish.
//! \~russian Останавливает таймер и ожидает завершения.
void stopAndWait(int timeout_ms = -1);
//! \~english Set custom data
//! \~russian Установить данные, передаваемые в метод таймера
void setData(void * data_) {data_t = data_;}