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

Bug 397 - Fixed continuous alarm sound in MoCord mode. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2101 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2007-04-03 10:11:25 +00:00
parent 4ae71ad634
commit 2ea1dac7fd
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/zm_html_view_montagestatus.php
View File

@ -49,8 +49,12 @@ elseif ( $status == STATE_TAPE )
$status_string = $zmSlangRecord; $status_string = $zmSlangRecord;
} }
$fps_string = sprintf( "%.2f", $fps ); $fps_string = sprintf( "%.2f", $fps );
$new_alarm = ( $status > STATE_PREALARM && $last_status <= STATE_PREALARM );
$old_alarm = ( $status <= STATE_PREALARM && $last_status > STATE_PREALARM ); $is_alarmed = ( $status == STATE_ALARM || $status == STATE_ALERT );
$was_alarmed = ( $last_status == STATE_ALARM || $last_status == STATE_ALERT );
$new_alarm = ( $is_alarmed && !$was_alarmed );
$old_alarm = ( !$is_alarmed && $was_alarmed );
$refresh = (($status>=STATE_PREALARM)&&($status<=STATE_ALERT))?1:ZM_WEB_REFRESH_STATUS; $refresh = (($status>=STATE_PREALARM)&&($status<=STATE_ALERT))?1:ZM_WEB_REFRESH_STATUS;
$url = "$PHP_SELF?view=montagestatus&mid=$mid&last_status=$status"; $url = "$PHP_SELF?view=montagestatus&mid=$mid&last_status=$status";

9
web/zm_html_view_watchstatus.php
View File

@ -61,8 +61,13 @@ elseif ( $status == STATE_TAPE )
$status_string = $zmSlangRecord; $status_string = $zmSlangRecord;
} }
$fps_string = sprintf( "%.2f", $fps ); $fps_string = sprintf( "%.2f", $fps );
$new_alarm = ( $status > STATE_PREALARM && $last_status <= STATE_PREALARM );
$old_alarm = ( $status <= STATE_PREALARM && $last_status > STATE_PREALARM ); $is_alarmed = ( $status == STATE_ALARM || $status == STATE_ALERT );
$was_alarmed = ( $last_status == STATE_ALARM || $last_status == STATE_ALERT );
$new_alarm = ( $is_alarmed && !$was_alarmed );
$old_alarm = ( !$is_alarmed && $was_alarmed );
$refresh = (isset($force)||$forced||isset($disable)||$disabled||(($status>=STATE_PREALARM)&&($status<=STATE_ALERT)))?1:ZM_WEB_REFRESH_STATUS; $refresh = (isset($force)||$forced||isset($disable)||$disabled||(($status>=STATE_PREALARM)&&($status<=STATE_ALERT)))?1:ZM_WEB_REFRESH_STATUS;
$url = "$PHP_SELF?view=watchstatus&mid=$mid&last_status=$status".(($force||$forced)?"&forced=1":"").(($disable||$disabled)?"&disabled=1":""); $url = "$PHP_SELF?view=watchstatus&mid=$mid&last_status=$status".(($force||$forced)?"&forced=1":"").(($disable||$disabled)?"&disabled=1":"");

8
web/zm_xhtml_view_watch.php
View File

@ -54,8 +54,12 @@ elseif ( $status == STATE_TAPE )
$status_string = $zmSlangRecord; $status_string = $zmSlangRecord;
} }
$fps_string = sprintf( "%.2f", $fps ); $fps_string = sprintf( "%.2f", $fps );
$new_alarm = ( $status > STATE_PREALARM && $last_status <= STATE_PREALARM );
$old_alarm = ( $status <= STATE_PREALARM && $last_status > STATE_PREALARM ); $is_alarmed = ( $status == STATE_ALARM || $status == STATE_ALERT );
$was_alarmed = ( $last_status == STATE_ALARM || $last_status == STATE_ALERT );
$new_alarm = ( $is_alarmed && !$was_alarmed );
$old_alarm = ( !$is_alarmed && $was_alarmed );
$result = mysql_query( "select * from Monitors where Function != 'None' order by Sequence" ); $result = mysql_query( "select * from Monitors where Function != 'None' order by Sequence" );
$monitors = array(); $monitors = array();