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

Resolve post merge build issues with braces

This commit is contained in:
SteveGilvarry 2014-12-02 22:36:32 +11:00
parent add8f76553
commit 33ff712f2c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/zm_event.cpp
View File

@ -607,7 +607,7 @@ void Event::AddFramesInternal( int n_frames, int start_frame, Image **images, st
static char event_file[PATH_MAX]; static char event_file[PATH_MAX];
snprintf( event_file, sizeof(event_file), capture_file_format, path, frames ); snprintf( event_file, sizeof(event_file), capture_file_format, path, frames );
/* FIXME Comeback and fix either videoEvent or videowriter not both */ /* FIXME Comeback and fix either videoEvent or videowriter not both */
if(videoEvent){ if(videoEvent){
//If this is the first frame, we should add a thumbnail to the event directory //If this is the first frame, we should add a thumbnail to the event directory
if(frames == 10){ if(frames == 10){
char snapshot_file[PATH_MAX]; char snapshot_file[PATH_MAX];
@ -615,11 +615,11 @@ void Event::AddFramesInternal( int n_frames, int start_frame, Image **images, st
WriteFrameImage( images[i], *(timestamps[i]), snapshot_file ); WriteFrameImage( images[i], *(timestamps[i]), snapshot_file );
} }
}else{ }else{
Debug( 1, "Writing pre-capture frame %d", frames ); Debug( 1, "Writing pre-capture frame %d", frames );
if ( monitor->GetOptSaveJPEGs() & 1) { if ( monitor->GetOptSaveJPEGs() & 1) {
WriteFrameImage( images[i], *(timestamps[i]), event_file ); WriteFrameImage( images[i], *(timestamps[i]), event_file );
}
} }
if ( videowriter != NULL ) { if ( videowriter != NULL ) {
WriteFrameVideo( images[i], *(timestamps[i]), videowriter ); WriteFrameVideo( images[i], *(timestamps[i]), videowriter );
} }
@ -673,10 +673,10 @@ void Event::AddFrame( Image *image, struct timeval timestamp, int score, Image *
}else{ }else{
Debug( 1, "Writing capture frame %d", frames ); Debug( 1, "Writing capture frame %d", frames );
if( monitor->GetOptSaveJPEGs() & 1) { if( monitor->GetOptSaveJPEGs() & 1) {
WriteFrameImage( image, timestamp, event_file ); WriteFrameImage( image, timestamp, event_file );
}
} }
if ( videowriter != NULL ) { if ( videowriter != NULL ) {
WriteFrameVideo( image, timestamp, videowriter ); WriteFrameVideo( image, timestamp, videowriter );
} }