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

Use proper c++ initializers

This commit is contained in:
Isaac Connor 2020-12-30 21:21:59 -05:00
parent 019f02e9de
commit 00aae0b68f
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/zm_event.cpp
View File

@ -55,8 +55,24 @@ Event::Event(
id(0), id(0),
monitor(p_monitor), monitor(p_monitor),
start_time(p_start_time), start_time(p_start_time),
end_time({0,0}),
cause(p_cause), cause(p_cause),
noteSetMap(p_noteSetMap) noteSetMap(p_noteSetMap),
frames(0),
alarm_frames(0),
alarm_frame_written(false),
tot_score(0),
max_score(0),
//path(""),
//snapshit_file(),
//alarm_file(""),
videoStore(nullptr),
//video_name(""),
//video_file(""),
last_db_frame(0),
have_video_keyframe(false),
//scheme
save_jpegs(0)
{ {
std::string notes; std::string notes;
@ -177,14 +193,6 @@ Event::Event(
if ( untimedEvent ) { if ( untimedEvent ) {
Warning("Event %" PRIu64 " has zero time, setting to current", id); Warning("Event %" PRIu64 " has zero time, setting to current", id);
} }
end_time.tv_sec = 0;
frames = 0;
alarm_frames = 0;
tot_score = 0;
max_score = 0;
have_video_keyframe = false;
alarm_frame_written = false;
last_db_frame = 0;
video_name = ""; video_name = "";
snapshot_file = path + "/snapshot.jpg"; snapshot_file = path + "/snapshot.jpg";
@ -226,7 +234,7 @@ Event::Event(
videoStore = nullptr; videoStore = nullptr;
save_jpegs |= 1; // Turn on jpeg storage save_jpegs |= 1; // Turn on jpeg storage
} }
} } // end if GetOptVideoWriter
} // Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string &p_cause, const StringSetMap &p_noteSetMap, bool p_videoEvent ) } // Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string &p_cause, const StringSetMap &p_noteSetMap, bool p_videoEvent )
Event::~Event() { Event::~Event() {