diff --git a/web/zm_config.php.z b/web/zm_config.php.z index 6f3b4c9a4..4a0ee5470 100644 --- a/web/zm_config.php.z +++ b/web/zm_config.php.z @@ -149,7 +149,7 @@ $jws = array( 'image' => array( 'w'=>48, 'h'=>80 ), 'frames' => array( 'w'=>500, 'h'=>300 ), 'stats' => array( 'w'=>600, 'h'=>200 ), - 'options' => array( 'w'=>760, 'h'=>440 ), + 'options' => array( 'w'=>760, 'h'=>480 ), 'optionhelp' => array( 'w'=>320, 'h'=>240 ), 'restarting' => array( 'w'=>250, 'h'=>150 ), 'user' => array( 'w'=>230, 'h'=>340 ), diff --git a/web/zm_html_view_event.php b/web/zm_html_view_event.php index 1cb8432b9..248ef8433 100644 --- a/web/zm_html_view_event.php +++ b/web/zm_html_view_event.php @@ -76,9 +76,9 @@ while ( $row = mysql_fetch_assoc( $result ) ) } if ( !isset( $rate ) ) - $rate = RATE_SCALE; + $rate = ZM_WEB_DEFAULT_RATE; if ( !isset( $scale ) ) - $scale = SCALE_SCALE; + $scale = ZM_WEB_DEFAULT_SCALE; $frames_per_page = EVENT_FRAMES_PER_LINE * EVENT_FRAME_LINES; diff --git a/web/zm_html_view_watchfeed.php b/web/zm_html_view_watchfeed.php index d85fecff7..fd8b25018 100644 --- a/web/zm_html_view_watchfeed.php +++ b/web/zm_html_view_watchfeed.php @@ -33,7 +33,7 @@ if ( empty($mode) ) } if ( !isset( $scale ) ) - $scale = SCALE_SCALE; + $scale = ZM_WEB_DEFAULT_SCALE; $result = mysql_query( "select * from Monitors where Id = '$mid'" ); if ( !$result ) diff --git a/zmconfig.pl.in b/zmconfig.pl.in index 14d7ab912..a8c301022 100755 --- a/zmconfig.pl.in +++ b/zmconfig.pl.in @@ -469,6 +469,22 @@ my @options = type => $types{boolean}, category => 'web', }, + { + name => "ZM_WEB_DEFAULT_SCALE", + default => "100", + description => "What the default scaling factor applied to 'live' or 'event' views is (%).", + help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.", + type => $types{integer}, + category => 'web', + }, + { + name => "ZM_WEB_DEFAULT_RATE", + default => "100", + description => "What the default replay rate factor applied to 'event' views is (%).", + help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.", + type => $types{integer}, + category => 'web', + }, { name => "ZM_WEB_POPUP_ON_ALARM", default => "yes",