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

Removed duplicate code and brackets

This commit is contained in:
SteveGilvarry 2014-10-12 22:12:54 +11:00
parent 4245928b35
commit 7f530bcc2a
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/zm_monitor.cpp
View File

@ -1611,23 +1611,19 @@ bool Monitor::Analyse()
else if ( state == TAPE ) else if ( state == TAPE )
{ {
//Video Storage: activate only for supported cameras. Event::AddFrame knows whether or not we are recording video and saves frames accordingly //Video Storage: activate only for supported cameras. Event::AddFrame knows whether or not we are recording video and saves frames accordingly
if(config.use_mkv_storage && camera->SupportsNativeVideo()){ if(config.use_mkv_storage && camera->SupportsNativeVideo())
{
video_store_data->recording = true; video_store_data->recording = true;
} }
if ( !(image_count%(frame_skip+1)) ) if ( !(image_count%(frame_skip+1)) )
{
if ( config.bulk_frame_interval > 1 )
{ {
if ( config.bulk_frame_interval > 1 ) event->AddFrame( snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1) );
{
event->AddFrame( snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1) );
}
else
{
event->AddFrame( snap_image, *timestamp );
}
} }
else else
{ {
event->AddFrame( snap_image, *timestamp ); event->AddFrame( snap_image, *timestamp );
} }
} }
} }