Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simple typo and consistency fixes. #3835

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Simple typo and consistency fixes. #3835

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e6efde
Simple typo and consistency fixes.
BHMSD-bdailey Feb 21, 2024
ec24235
Merge branch 'ZoneMinder:master' into master
BHMSD-bdailey Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/zm_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2302,9 +2302,9 @@ bool Monitor::Analyse() {
static_cast<int64>(Seconds(section_length).count()));
}

Debug(1, "CLOSE_MOD %d", event_close_mode);
Debug(1, "CLOSE_MODE %d", event_close_mode);
if (event_close_mode == CLOSE_ALARM) {
Debug(1, "CLOSE_MOD Alarm");
Debug(1, "CLOSE_MODE Alarm");
if (state == ALARM) {
// If we should end the previous continuous event and start a new non-continuous event
if (event->AlarmFrames() < alarm_frame_count) {
Expand Down Expand Up @@ -2335,7 +2335,7 @@ bool Monitor::Analyse() {
State_Strings[state].c_str(), event->AlarmFrames(), alarm_frame_count);
}
} else if (event_close_mode == CLOSE_TIME) {
Debug(1, "CLOSE_MOD Timem");
Debug(1, "CLOSE_MODE Time");
if (std::chrono::duration_cast<Seconds>(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(),
Expand All @@ -2348,7 +2348,7 @@ bool Monitor::Analyse() {
closeEvent();
}
} else if (event_close_mode == CLOSE_IDLE) {
Debug(1, "CLOSE_MOD IDLE");
Debug(1, "CLOSE_MODE Idle");
if (state == IDLE || state == TAPE) {
if ((shared_data->recording == RECORDING_ALWAYS) and (event->Duration() >= section_length)) {
//std::chrono::duration_cast<Seconds>(snap->timestamp.time_since_epoch()) % section_length == Seconds(0)) {
Expand All @@ -2370,7 +2370,7 @@ bool Monitor::Analyse() {
}
} // end if IDLE
} else {
Warning("UNKNOWN CLOSE_MOD");
Warning("CLOSE_MODE Unknown");
} // end if event_close_mode
} // end if event and event->Duration > min_section_length

Expand Down
Loading