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

Replace some function with recording == and analysis==

This commit is contained in:
Isaac Connor 2022-01-05 19:53:30 -05:00
parent 99900e8c1d
commit f7c90f5c41
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/zm_monitor.cpp
View File

@ -1780,7 +1780,7 @@ bool Monitor::Analyse() {
Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name.c_str(), analysis_image_count, event->Id()); Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name.c_str(), analysis_image_count, event->Id());
closeEvent(); closeEvent();
} }
} else if (function == MOCORD or function == RECORD) { } else if (recording == RECORDING_ALWAYS) {
if (!event) { if (!event) {
if (cause.length()) cause += ", "; if (cause.length()) cause += ", ";
cause += SIGNAL_CAUSE + std::string(": Reacquired"); cause += SIGNAL_CAUSE + std::string(": Reacquired");
@ -1847,7 +1847,7 @@ bool Monitor::Analyse() {
SystemTimePoint timestamp = snap->timestamp; SystemTimePoint timestamp = snap->timestamp;
if (Active() and (function == MODECT or function == MOCORD)) { if (Active() and (analysing == ANALYSING_ALWAYS)) {
Debug(3, "signal and active and modect"); Debug(3, "signal and active and modect");
Event::StringSet zoneSet; Event::StringSet zoneSet;
@ -1898,20 +1898,16 @@ bool Monitor::Analyse() {
score += last_motion_score; score += last_motion_score;
} else { } else {
Debug(1, "Not Active(%d) enabled %d active %d doing motion detection: %d", Debug(1, "Not Active(%d) enabled %d active %d doing motion detection: %d",
Active(), enabled, shared_data->active, Active(), enabled, shared_data->active, analysing);
(function == MODECT or function == MOCORD)
);
} // end if active and doing motion detection } // end if active and doing motion detection
if (function == RECORD or function == MOCORD) { if (capturing == CAPTURING_ALWAYS) {
// If doing record, check to see if we need to close the event or not. // If doing record, check to see if we need to close the event or not.
if (event) { if (event && (section_length > Seconds(min_section_length)) && (timestamp - event->StartTime() >= section_length)) {
Debug(2, "Have event %" PRIu64 " in record", event->Id()); if (
(function == MOCORD && event_close_mode != CLOSE_TIME)
if (section_length != Seconds(0) && (timestamp - event->StartTime() >= section_length) || (function == RECORD && event_close_mode == CLOSE_TIME)
&& ((function == MOCORD && event_close_mode != CLOSE_TIME) || std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()) % section_length == Seconds(0)) {
|| (function == RECORD && event_close_mode == CLOSE_TIME)
|| std::chrono::duration_cast<Seconds>(timestamp.time_since_epoch()) % section_length == Seconds(0))) {
Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 , Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 ,
name.c_str(), name.c_str(),
image_count, image_count,