v3.5.t3
-recording loop detected in "starving" state now triggers and auto restart of the recording loop. -preparing to release to main.
This commit is contained in:
parent
daad0dffa2
commit
7046dd1162
|
@ -103,6 +103,8 @@ int Camera::start(const QString &conf)
|
||||||
connect(thr2, &QThread::finished, this, &Camera::objMinusOne);
|
connect(thr2, &QThread::finished, this, &Camera::objMinusOne);
|
||||||
connect(thr3, &QThread::finished, this, &Camera::objMinusOne);
|
connect(thr3, &QThread::finished, this, &Camera::objMinusOne);
|
||||||
|
|
||||||
|
connect(detLoop, &DetectLoop::starving, recLoop, &RecordLoop::restart);
|
||||||
|
|
||||||
thr1->start();
|
thr1->start();
|
||||||
thr2->start();
|
thr2->start();
|
||||||
thr3->start();
|
thr3->start();
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
#define APP_VERSION "3.5.t2"
|
#define APP_VERSION "3.5.t3"
|
||||||
#define APP_NAME "JustMotion"
|
#define APP_NAME "JustMotion"
|
||||||
#define APP_TARGET "jmotion"
|
#define APP_TARGET "jmotion"
|
||||||
#define DATETIME_FMT "yyyyMMddhhmmss"
|
#define DATETIME_FMT "yyyyMMddhhmmss"
|
||||||
|
|
|
@ -163,6 +163,8 @@ QString DetectLoop::statusLine()
|
||||||
{
|
{
|
||||||
if (eTimer.elapsed() >= 5000)
|
if (eTimer.elapsed() >= 5000)
|
||||||
{
|
{
|
||||||
|
emit starving();
|
||||||
|
|
||||||
return "STARVED";
|
return "STARVED";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -48,6 +48,10 @@ public:
|
||||||
|
|
||||||
void exec();
|
void exec();
|
||||||
QString statusLine();
|
QString statusLine();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
|
||||||
|
void starving();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // DETECT_LOOP_H
|
#endif // DETECT_LOOP_H
|
||||||
|
|
|
@ -23,7 +23,6 @@ private slots:
|
||||||
|
|
||||||
void init();
|
void init();
|
||||||
void resetTime();
|
void resetTime();
|
||||||
void restart();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -32,6 +31,10 @@ private:
|
||||||
|
|
||||||
QString camCmdFromConf();
|
QString camCmdFromConf();
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
|
||||||
|
void restart();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit RecordLoop(shared_t *shared, QThread *thr, QObject *parent = nullptr);
|
explicit RecordLoop(shared_t *shared, QThread *thr, QObject *parent = nullptr);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user