ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AutoStopTimeOut is part of Monitor, not Control

pull/2736/head
Isaac Connor 2019-10-18 14:19:25 -04:00
parent 98d0c4b104
commit 1a417952c3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/includes/control_functions.php
View File

@ -31,7 +31,7 @@ function buildControlCommand($monitor) {
}
case 'Con' :
{
if ( $control->AutoStopTimeout() ) {
if ( $monitor->AutoStopTimeout() ) {
$slowSpeed = intval(round($control->MinFocusSpeed()+(($control->MaxFocusSpeed()-$control->MinFocusSpeed())*$slow)));
if ( $speed < $slowSpeed ) {
$ctrlCommand .= ' --autostop';
@ -55,7 +55,7 @@ function buildControlCommand($monitor) {
$ctrlCommand .= ' --step='.$step;
break;
case 'Con' :
if ( $control->AutoStopTimeout() ) {
if ( $monitor->AutoStopTimeout() ) {
$slowSpeed = intval(round($control->MinZoomSpeed()+(($control->MaxZoomSpeed()-$control->MinZoomSpeed())*$slow)));
if ( $speed < $slowSpeed ) {
$ctrlCommand .= ' --autostop';
@ -207,7 +207,7 @@ function buildControlCommand($monitor) {
}
break;
case 'Con' :
if ( $control->AutoStopTimeout() ) {
if ( $monitor->AutoStopTimeout() ) {
$slowPanSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$slow)));
$slowTiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$slow)));
if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) ) {
@ -441,7 +441,7 @@ function buildControlCommand($monitor) {
if ( preg_match( '/^(Up|Down)/', $dirn ) ) {
$ctrlCommand .= ' --tiltspeed='.$tiltSpeed;
}
if ( $control->AutoStopTimeout() ) {
if ( $monitor->AutoStopTimeout() ) {
$slowPanSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$slow)));
$slowTiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$slow)));
if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) ) {
@ -482,7 +482,7 @@ function buildControlCommand($monitor) {
$ctrlCommand .= ' --step='.$step;
break;
case 'Con' :
if ( $control->AutoStopTimeout() ) {
if ( $monitor->AutoStopTimeout() ) {
$slowSpeed = intval(round($control->MinFocusSpeed()+(($control->MaxFocusSpeed()-$control->MinFocusSpeed())*$slow)));
if ( $speed < $slowSpeed ) {
$ctrlCommand .= ' --autostop';
@ -511,7 +511,7 @@ function buildControlCommand($monitor) {
$ctrlCommand .= ' --step='.$step;
break;
case 'Con' :
if ( $control->AutoStopTimeout() ) {
if ( $monitor->AutoStopTimeout() ) {
$slowSpeed = intval(round($control->MinZoomSpeed()+(($control->MaxZoomSpeed()-$control->MinZoomSpeed())*$slow)));
if ( $speed < $slowSpeed ) {
$ctrlCommand .= ' --autostop';
@ -695,7 +695,7 @@ function buildControlCommand($monitor) {
}
break;
case 'Con' :
if ( $control->AutoStopTimeout() ) {
if ( $monitor->AutoStopTimeout() ) {
$slowPanSpeed = intval(round($control->MinPanSpeed()+(($control->MaxPanSpeed()-$control->MinPanSpeed())*$slow)));
$slowTiltSpeed = intval(round($control->MinTiltSpeed()+(($control->MaxTiltSpeed()-$control->MinTiltSpeed())*$slow)));
if ( (!isset($panSpeed) || ($panSpeed < $slowPanSpeed)) && (!isset($tiltSpeed) || ($tiltSpeed < $slowTiltSpeed)) ) {