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

Fixed force/disable alarm buttons. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2232 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2007-11-04 17:36:30 +00:00
parent 69850ef6bc
commit fdbb18c3f8
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/zm_monitor.cpp
View File

@ -2753,6 +2753,8 @@ void MonitorStream::processCommand( const CmdMsg *msg )
int rate;
double delay;
int zoom;
bool enabled;
bool forced;
} status_data;
status_data.fps = monitor->GetFPS();
@ -2763,13 +2765,18 @@ void MonitorStream::processCommand( const CmdMsg *msg )
status_data.rate = replay_rate;
status_data.delay = TV_2_FLOAT( now ) - TV_2_FLOAT( last_frame_timestamp );
status_data.zoom = zoom;
Debug( 2, ( "L:%d, D:%d, P:%d, R:%d, d:%.3f, Z:%d",
//status_data.enabled = monitor->shared_data->active;
status_data.enabled = monitor->trigger_data->trigger_state!=Monitor::TRIGGER_OFF;
status_data.forced = monitor->trigger_data->trigger_state==Monitor::TRIGGER_ON;
Debug( 2, ( "L:%d, D:%d, P:%d, R:%d, d:%.3f, Z:%d, E:%d F:%d",
status_data.buffer_level,
status_data.delayed,
status_data.paused,
status_data.rate,
status_data.delay,
status_data.zoom
status_data.zoom,
status_data.enabled,
status_data.forced
));
DataMsg status_msg;