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

Revamped options slightly. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1815 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2006-01-14 22:48:32 +00:00
parent a9c1066913
commit 9fcf0a31cb
7 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/zm_funcs.php
View File

@ -1015,8 +1015,8 @@ function parseSort( $save_to_session=false, $term_sep='&' )
if ( !isset($sort_field) ) if ( !isset($sort_field) )
{ {
$sort_field = ZM_EVENT_SORT_FIELD; $sort_field = ZM_WEB_EVENT_SORT_FIELD;
$sort_asc = (ZM_EVENT_SORT_ORDER == "asc"); $sort_asc = (ZM_WEB_EVENT_SORT_ORDER == "asc");
} }
switch( $sort_field ) switch( $sort_field )
{ {

8
web/zm_html_view_event.php
View File

@ -373,10 +373,10 @@ if ( $mode == "stream" )
?> ?>
<tr><td align="center" valign="middle"> <tr><td align="center" valign="middle">
<?php <?php
if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_REPLAY_FORMAT ) if ( ZM_STREAM_METHOD == 'mpeg' && ZM_MPEG_REPLAY_FORMAT )
{ {
$stream_src = getStreamSrc( array( "mode=mpeg", "event=".$eid, "frame=".(!empty($fid)?$fid:1), "scale=".$scale, "rate=".$rate, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_REPLAY_FORMAT ) ); $stream_src = getStreamSrc( array( "mode=mpeg", "event=".$eid, "frame=".(!empty($fid)?$fid:1), "scale=".$scale, "rate=".$rate, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_REPLAY_FORMAT ) );
outputVideoStream( $stream_src, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), $event['Name'], ZM_VIDEO_REPLAY_FORMAT ); outputVideoStream( $stream_src, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), $event['Name'], ZM_MPEG_REPLAY_FORMAT );
} }
else else
{ {
@ -550,7 +550,7 @@ var timeout_id = window.setTimeout( "window.location.replace( '<?= $PHP_SELF ?>?
$start_section = 0; $start_section = 0;
if ( !empty($fid) ) if ( !empty($fid) )
{ {
$start_section = (int)floor(($fid * $panel_sections)/($event['Frames']+1)); $start_section = (int)floor((($fid-1) * $panel_sections)/($event['Frames']+1));
} }
if ( ZM_WEB_SHOW_PROGRESS ) if ( ZM_WEB_SHOW_PROGRESS )
{ {

4
web/zm_html_view_filter.php
View File

@ -138,8 +138,8 @@ $sort_dirns = array(
); );
if ( !$sort_field ) if ( !$sort_field )
{ {
$sort_field = ZM_EVENT_SORT_FIELD; $sort_field = ZM_WEB_EVENT_SORT_FIELD;
$sort_asc = (ZM_EVENT_SORT_ORDER == "asc"); $sort_asc = (ZM_WEB_EVENT_SORT_ORDER == "asc");
} }
?> ?>

6
web/zm_html_view_montagefeed.php
View File

@ -106,10 +106,10 @@ window.setTimeout( "window.location.reload(true)", <?= ZM_WEB_REFRESH_IMAGE*1000
<?php <?php
if ( $mode == "stream" ) if ( $mode == "stream" )
{ {
if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_LIVE_FORMAT ) if ( ZM_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
{ {
$stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_LIVE_FORMAT ) ); $stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_VIDEO_LIVE_FORMAT ); outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_MPEG_LIVE_FORMAT );
} }
else else
{ {

6
web/zm_html_view_options.php
View File

@ -28,13 +28,13 @@ $tabs = array();
$tabs['system'] = $zmSlangSystem; $tabs['system'] = $zmSlangSystem;
$tabs['config'] = $zmSlangConfig; $tabs['config'] = $zmSlangConfig;
$tabs['paths'] = $zmSlangPaths; $tabs['paths'] = $zmSlangPaths;
$tabs['network'] = $zmSlangNetwork;
$tabs['web'] = $zmSlangWeb; $tabs['web'] = $zmSlangWeb;
$tabs['video'] = $zmSlangVideo; $tabs['tools'] = $zmSlangTools;
$tabs['debug'] = $zmSlangDebug;
$tabs['network'] = $zmSlangNetwork;
$tabs['mail'] = $zmSlangEmail; $tabs['mail'] = $zmSlangEmail;
$tabs['ftp'] = $zmSlangFTP; $tabs['ftp'] = $zmSlangFTP;
$tabs['x10'] = $zmSlangX10; $tabs['x10'] = $zmSlangX10;
$tabs['tools'] = $zmSlangTools;
$tabs['highband'] = $zmSlangHighBW; $tabs['highband'] = $zmSlangHighBW;
$tabs['medband'] = $zmSlangMediumBW; $tabs['medband'] = $zmSlangMediumBW;
$tabs['lowband'] = $zmSlangLowBW; $tabs['lowband'] = $zmSlangLowBW;

6
web/zm_html_view_watchfeed.php
View File

@ -96,10 +96,10 @@ window.setTimeout( "window.location.reload(true)", <?= ZM_WEB_REFRESH_IMAGE*1000
<?php <?php
if ( $mode == "stream" ) if ( $mode == "stream" )
{ {
if ( ZM_VIDEO_STREAM_METHOD == 'mpeg' && ZM_VIDEO_LIVE_FORMAT ) if ( ZM_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
{ {
$stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$mid, "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_VIDEO_LIVE_FORMAT ) ); $stream_src = getStreamSrc( array( "mode=mpeg", "monitor=".$mid, "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_VIDEO_LIVE_FORMAT ); outputVideoStream( $stream_src, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'], ZM_MPEG_LIVE_FORMAT );
} }
else else
{ {

1
web/zm_lang_en_gb.php
View File

@ -207,6 +207,7 @@ $zmSlangControlType = 'Control Type';
$zmSlangCycle = 'Cycle'; $zmSlangCycle = 'Cycle';
$zmSlangCycleWatch = 'Cycle Watch'; $zmSlangCycleWatch = 'Cycle Watch';
$zmSlangDay = 'Day'; $zmSlangDay = 'Day';
$zmSlangDebug = 'Debug';
$zmSlangDefaultRate = 'Default Rate'; $zmSlangDefaultRate = 'Default Rate';
$zmSlangDefaultScale = 'Default Scale'; $zmSlangDefaultScale = 'Default Scale';
$zmSlangDeleteAndNext = 'Delete &amp; Next'; $zmSlangDeleteAndNext = 'Delete &amp; Next';