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

whitespace, comments

This commit is contained in:
Isaac Connor 2017-04-05 16:10:21 -04:00
parent 2b9a0f96d3
commit 6a9819e16b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_monitor.cpp
View File

@ -1620,7 +1620,8 @@ bool Monitor::Analyse() {
} }
shared_data->state = state = IDLE; shared_data->state = state = IDLE;
last_section_mod = 0; last_section_mod = 0;
} } // end if ( trigger_data->trigger_state != TRIGGER_OFF )
if ( (!signal_change && signal) && (function == MODECT || function == MOCORD) ) { if ( (!signal_change && signal) && (function == MODECT || function == MOCORD) ) {
if ( state == ALARM ) { if ( state == ALARM ) {
ref_image.Blend( *snap_image, alarm_ref_blend_perc ); ref_image.Blend( *snap_image, alarm_ref_blend_perc );
@ -1629,9 +1630,9 @@ bool Monitor::Analyse() {
} }
} }
last_signal = signal; last_signal = signal;
} } // end if Enabled()
shared_data->last_read_index = index%image_buffer_count; shared_data->last_read_index = index % image_buffer_count;
//shared_data->last_read_time = image_buffer[index].timestamp->tv_sec; //shared_data->last_read_time = image_buffer[index].timestamp->tv_sec;
shared_data->last_read_time = now.tv_sec; shared_data->last_read_time = now.tv_sec;