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

Added streaming scales. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@659 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2003-10-19 09:47:52 +00:00
parent 451f89ac73
commit cf89453949
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/zm_html_view_event.php
View File

@ -94,13 +94,12 @@ Learn Pref:&nbsp;<select name="learn_state" class="form" onChange="learn_form.su
</form></td>
<?php } ?>
<td colspan="3" align="right" class="text">
<form name="rate_form" method="get" action="<?= $PHP_SELF ?>">
<form name="view_form" method="get" action="<?= $PHP_SELF ?>">
<input type="hidden" name="view" value="<?= $view ?>">
<input type="hidden" name="action" value="rename">
<input type="hidden" name="mid" value="<?= $mid ?>">
<input type="hidden" name="eid" value="<?= $eid ?>">
Rate: <?php buildSelect( "rate", $rates, "document.rate_form.submit();" ); ?>&nbsp;&nbsp;
Scale: <?php buildSelect( "scale", $scales, "document.rate_form.submit();" ); ?>
Rate: <?php buildSelect( "rate", $rates, "document.view_form.submit();" ); ?>&nbsp;&nbsp;
Scale: <?php buildSelect( "scale", $scales, "document.view_form.submit();" ); ?>
</form>
</td>
</tr>
@ -133,13 +132,13 @@ Scale: <?php buildSelect( "scale", $scales, "document.rate_form.submit();" ); ?>
if ( isNetscape() )
{
?>
<tr><td colspan="6" align="center" valign="middle"><img src="<?= $stream_src ?>" border="0" width="<?= ($scale>=1)?($event[Width]*$scale):($event[Width]/abs($scale)) ?>" height="<?= ($scale>=1)?($event[Height]*$scale):($event[Height]/abs($scale)) ?>"></td></tr>
<tr><td colspan="6" align="center" valign="middle"><img src="<?= $stream_src ?>" border="0" width="<?= reScale( $event[Width], $scale ) ?>" height="<?= reScale( $event[Height], $scale ) ?>"></td></tr>
<?php
}
else
{
?>
<tr><td colspan="6" align="center" valign="middle"><applet code="com.charliemouse.cambozola.Viewer" archive="<?= ZM_PATH_CAMBOZOLA ?>" align="middle" width="<?= ($scale>=1)?($event[Width]*$scale):($event[Width]/abs($scale)) ?>" height="<?= ($scale>=1)?($event[Height]*$scale):($event[Height]/abs($scale)) ?>"><param name="url" value="<?= $stream_src ?>"></applet></td></tr>
<tr><td colspan="6" align="center" valign="middle"><applet code="com.charliemouse.cambozola.Viewer" archive="<?= ZM_PATH_CAMBOZOLA ?>" align="middle" width="<?= reScale( $event[Width], $scale ) ?>" height="<?= reScale( $event[Height], $scale ) ?>"><param name="url" value="<?= $stream_src ?>"></applet></td></tr>
<?php
}
}

35
web/zm_html_view_watchfeed.php
View File

@ -31,6 +31,9 @@
header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache"); // HTTP/1.0
if ( !isset( $scale ) )
$scale = 1;
?>
<html>
<head>
@ -59,41 +62,51 @@ window.setTimeout( "window.location.reload(true)", <?= REFRESH_IMAGE*1000 ?> );
<table width="96%" align="center" border="0" cellspacing="0" cellpadding="4">
<tr>
<td width="25%" align="left" class="text"><b><?= $monitor[Name] ?></b></td>
<?php if ( canView( 'Monitors' ) && $monitor[Type] == "Local" ) { ?>
<td width="25%" align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=settings&mid=<?= $monitor[Id] ?>', 'zmSettings<?= $monitor[Name] ?>', <?= $jws['settings']['w'] ?>, <?= $jws['settings']['h'] ?> );">Settings</a></td>
<?php if ( $mode == "stream" ) { ?>
<td align="center" valign="middle" class="text">
<form name="view_form" method="get" action="<?= $PHP_SELF ?>">
<input type="hidden" name="view" value="<?= $view ?>">
<input type="hidden" name="mid" value="<?= $mid ?>">
Scale: <?php buildSelect( "scale", $scales, "document.view_form.submit();" ); ?>
</td>
<?php } else { ?>
<td width="25%" align="center" class="text">&nbsp;</td>
<td align="center" class="text">&nbsp;</td>
<?php } ?>
<?php if ( canView( 'Monitors' ) && $monitor[Type] == "Local" ) { ?>
<td align="center" class="text"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=settings&mid=<?= $monitor[Id] ?>', 'zmSettings<?= $monitor[Name] ?>', <?= $jws['settings']['w'] ?>, <?= $jws['settings']['h'] ?> );">Settings</a></td>
<?php } else { ?>
<td align="center" class="text">&nbsp;</td>
<?php } ?>
<?php if ( $mode == "stream" ) { ?>
<td width="25%" align="center" class="text"><a href="<?= $PHP_SELF ?>?view=watchfeed&mode=still&mid=<?= $mid ?>">Stills</a></td>
<td align="center" class="text"><a href="<?= $PHP_SELF ?>?view=watchfeed&mode=still&mid=<?= $mid ?>">Stills</a></td>
<?php } elseif ( canStream() ) { ?>
<td width="25%" align="center" class="text"><a href="<?= $PHP_SELF ?>?view=watchfeed&mode=stream&mid=<?= $mid ?>">Stream</a></td>
<td align="center" class="text"><a href="<?= $PHP_SELF ?>?view=watchfeed&mode=stream&mid=<?= $mid ?>">Stream</a></td>
<?php } else { ?>
<td width="25%" align="center" class="text">&nbsp;</td>
<td align="center" class="text">&nbsp;</td>
<?php } ?>
<td width="25%" align="right" class="text"><a href="javascript: closeWindow();">Close</a></td>
<td align="right" class="text"><a href="javascript: closeWindow();">Close</a></td>
</tr>
<?php
if ( $mode == "stream" )
{
$stream_src = ZM_PATH_ZMS."?monitor=$monitor[Id]&idle=".STREAM_IDLE_DELAY."&refresh=".STREAM_FRAME_DELAY;
$stream_src = ZM_PATH_ZMS."?monitor=$monitor[Id]&idle=".STREAM_IDLE_DELAY."&refresh=".STREAM_FRAME_DELAY."&scale=$scale";
if ( isNetscape() )
{
?>
<tr><td colspan="4" align="center"><img src="<?= $stream_src ?>" border="0" width="<?= $monitor[Width] ?>" height="<?= $monitor[Height] ?>"></td></tr>
<tr><td colspan="5" align="center"><img src="<?= $stream_src ?>" border="0" width="<?= reScale( $monitor[Width], $scale ) ?>" height="<?= reScale( $monitor[Height], $scale ) ?>"></td></tr>
<?php
}
else
{
?>
<tr><td colspan="4" align="center"><applet code="com.charliemouse.cambozola.Viewer" archive="<?= ZM_PATH_CAMBOZOLA ?>" align="middle" width="<?= $monitor[Width] ?>" height="<?= $monitor[Height] ?>"><param name="url" value="<?= $stream_src ?>"></applet></td></tr>
<tr><td colspan="5" align="center"><applet code="com.charliemouse.cambozola.Viewer" archive="<?= ZM_PATH_CAMBOZOLA ?>" align="middle" width="<?= reScale( $monitor[Width], $scale ) ?>" height="<?= reScale( $monitor[Height], $scale ) ?>"><param name="url" value="<?= $stream_src ?>"></applet></td></tr>
<?php
}
}
else
{
?>
<tr><td colspan="4" align="center"><img src="<?= ZM_DIR_IMAGES.'/'.$monitor[Name] ?>.jpg" border="0" width="<?= $monitor[Width] ?>" height="<?= $monitor[Height] ?>"></td></tr>
<tr><td colspan="5" align="center"><img src="<?= ZM_DIR_IMAGES.'/'.$monitor[Name] ?>.jpg" border="0" width="<?= $monitor[Width] ?>" height="<?= $monitor[Height] ?>"></td></tr>
<?php
}
?>