From c9c28989124b837b26582afa416f598e626d07f8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 5 Feb 2024 16:11:22 -0500 Subject: [PATCH] Fix some spacing --- src/zm_monitor.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index b1c82ceca..9533d15d0 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -2316,7 +2316,7 @@ bool Monitor::Analyse() { static_cast(std::chrono::duration_cast(snap->timestamp.time_since_epoch()).count()), static_cast(std::chrono::duration_cast(event->StartTime().time_since_epoch()).count()), static_cast(std::chrono::duration_cast(snap->timestamp - event->StartTime()).count()), - static_cast(Seconds(section_length).count())); + static_cast(Seconds(section_length).count())); closeEvent(); } } else { @@ -2339,17 +2339,19 @@ bool Monitor::Analyse() { if (state == IDLE) { if ((shared_data->recording == RECORDING_ALWAYS) and (event->Duration() >= section_length)) { //std::chrono::duration_cast(snap->timestamp.time_since_epoch()) % section_length == Seconds(0)) { - Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 , - name.c_str(), - snap->image_index, - event->Id(), - static_cast(std::chrono::duration_cast(snap->timestamp.time_since_epoch()).count()), - static_cast(std::chrono::duration_cast(event->StartTime().time_since_epoch()).count()), - static_cast(std::chrono::duration_cast(snap->timestamp - event->StartTime()).count()), - static_cast(Seconds(section_length).count())); - closeEvent(); - } else if ((shared_data->recording == RECORDING_ONMOTION) and - (analysis_image_count - last_alarm_count > post_event_count)) { + Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %" PRIi64 , + name.c_str(), + snap->image_index, + event->Id(), + static_cast(std::chrono::duration_cast(snap->timestamp.time_since_epoch()).count()), + static_cast(std::chrono::duration_cast(event->StartTime().time_since_epoch()).count()), + static_cast(std::chrono::duration_cast(snap->timestamp - event->StartTime()).count()), + static_cast(Seconds(section_length).count())); + closeEvent(); + } else if ( + (shared_data->recording == RECORDING_ONMOTION) and + (analysis_image_count - last_alarm_count > post_event_count) + ) { Info("%s: %03d - Closing event %" PRIu64 ", alarm end", name.c_str(), analysis_image_count, event->Id()); closeEvent(); }