Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-20 08:15:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "do not use QThread::create"

Browse Source 
This reverts commit 98c3131017.
This commit is contained in:
WarmUpTill
2020-06-06 18:51:26 +02:00
committed by Myned
parent 8fd263f44a
commit 4b86849356
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/advanced-scene-switcher.cpp
View File

@@ -1569,7 +1569,7 @@ void SwitcherData::Start()
{
if (!(th && th->isRunning())) {
stop = false;
switcher->th = new SwitcherThread();
switcher->th = QThread::create([]() { switcher->Thread(); });
switcher->th->start((QThread::Priority)switcher->threadPriority);
}
}
@@ -1582,8 +1582,6 @@ void SwitcherData::Stop()
transitionCv.notify_one();
cv.notify_one();
th->wait();
delete th;
th = nullptr;
}
}

12
src/headers/switcher-data-structs.hpp
View File

@@ -253,14 +253,11 @@ struct TimeSwitch {
typedef enum { NO_SWITCH = 0, SWITCH = 1, RANDOM_SWITCH = 2 } NoMatch;
class SwitcherThread;
/********************************************************************************
* SwitcherData
********************************************************************************/
struct SwitcherData {
SwitcherThread *th;
QThread* th = nullptr;
condition_variable cv;
mutex m;
bool transitionActive = false;
@@ -485,10 +482,3 @@ struct SwitcherData {
}
inline ~SwitcherData() { Stop(); }
};
extern SwitcherData *switcher;
class SwitcherThread : public QThread {
public:
explicit SwitcherThread(){};
void run() { switcher->Thread(); };
};