ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add logic to skip capturing if Capturing()==Ondemand

This commit is contained in:
Isaac Connor 2021-10-25 16:53:18 -04:00
parent cc51642eff
commit 3770306817
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/zmc.cpp
View File

@ -249,6 +249,11 @@ int main(int argc, char *argv[]) {
monitor->Id()); monitor->Id());
zmDbDo(sql); zmDbDo(sql);
while ((monitor->Capturing() == Monitor::CAPTURING_ONDEMAND) and !monitor->hasViewers()) {
Debug(1, "ONDEMAND and no Viewers. Sleeping");
sleep(1);
}
Seconds sleep_time = Seconds(0); Seconds sleep_time = Seconds(0);
while (monitor->PrimeCapture() <= 0) { while (monitor->PrimeCapture() <= 0) {
if (prime_capture_log_count % 60) { if (prime_capture_log_count % 60) {
@ -286,10 +291,14 @@ int main(int argc, char *argv[]) {
Microseconds sleep_time = Microseconds(0); Microseconds sleep_time = Microseconds(0);
while (!zm_terminate) { while (!zm_terminate) {
//sigprocmask(SIG_BLOCK, &block_set, 0);
for (size_t i = 0; i < monitors.size(); i++) { for (size_t i = 0; i < monitors.size(); i++) {
monitors[i]->CheckAction(); monitors[i]->CheckAction();
if (monitors[i]->Capturing() == Monitor::CAPTURING_ONDEMAND and !monitors[i]->hasViewers()) {
result = 0;
continue;
}
if (monitors[i]->PreCapture() < 0) { if (monitors[i]->PreCapture() < 0) {
Error("Failed to pre-capture monitor %d %s (%zu/%zu)", Error("Failed to pre-capture monitor %d %s (%zu/%zu)",
monitors[i]->Id(), monitors[i]->Name(), i + 1, monitors.size()); monitors[i]->Id(), monitors[i]->Name(), i + 1, monitors.size());