diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php index cc99cacbc..d1212aec3 100644 --- a/web/skins/classic/includes/control_functions.php +++ b/web/skins/classic/includes/control_functions.php @@ -30,7 +30,7 @@ function getControlCommands( $monitor ) $cmds['PresetGoto'] = "presetGoto"; $cmds['PresetHome'] = "presetHome"; - if ( !empty($monitor->CanZoom) ) + if ( !empty($monitor->CanZoom()) ) { if ( $monitor->CanZoomCon() ) $cmds['ZoomRoot'] = "zoomCon"; @@ -45,7 +45,7 @@ function getControlCommands( $monitor ) $cmds['ZoomMan'] = "zoomMan"; } - if ( !empty($monitor->CanFocus) ) + if ( !empty($monitor->CanFocus()) ) { if ( $monitor->CanFocusCon() ) $cmds['FocusRoot'] = "focusCon"; @@ -60,7 +60,7 @@ function getControlCommands( $monitor ) $cmds['FocusMan'] = "focusMan"; } - if ( !empty($monitor->CanIris) ) + if ( !empty($monitor->CanIris()) ) { if ( $monitor->CanIrisCon() ) $cmds['IrisRoot'] = "irisCon"; @@ -75,7 +75,7 @@ function getControlCommands( $monitor ) $cmds['IrisMan'] = "irisMan"; } - if ( !empty($monitor->CanWhite) ) + if ( !empty($monitor->CanWhite()) ) { if ( $monitor->CanWhiteCon() ) $cmds['WhiteRoot'] = "whiteCon"; @@ -89,7 +89,7 @@ function getControlCommands( $monitor ) $cmds['WhiteMan'] = "whiteMan"; } - if ( !empty($monitor->CanGain) ) + if ( !empty($monitor->CanGain()) ) { if ( $monitor->CanGainCon() ) $cmds['GainRoot'] = "gainCon"; @@ -103,7 +103,7 @@ function getControlCommands( $monitor ) $cmds['GainMan'] = "gainMan"; } - if ( !empty($monitor->CanMove) ) + if ( !empty($monitor->CanMove()) ) { if ( $monitor->CanMoveCon() ) { @@ -246,9 +246,9 @@ function controlPanTilt( $monitor, $cmds )
CanPan; - $hasTilt = $monitor->CanTilt; - $hasDiag = $hasPan && $hasTilt && $monitor->CanMoveDiag; + $hasPan = $monitor->CanPan(); + $hasTilt = $monitor->CanTilt(); + $hasDiag = $hasPan && $hasTilt && $monitor->CanMoveDiag(); ?>
@@ -278,7 +278,7 @@ function controlPresets( $monitor, $cmds ) $labels[$row['Preset']] = $row['Label']; } - $presetBreak = (int)(($monitor->NumPresets+1)/((int)(($monitor->NumPresets-1)/MAX_PRESETS)+1)); + $presetBreak = (int)(($monitor->NumPresets()+1)/((int)(($monitor->NumPresets()-1)/MAX_PRESETS)+1)); ob_start(); ?> @@ -286,7 +286,7 @@ function controlPresets( $monitor, $cmds )
NumPresets; $i++ ) + for ( $i = 1; $i <= $monitor->NumPresets(); $i++ ) { ?>" value="" onclick="controlCmd('');"/>