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

Fixed to use new format video files. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1555 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2005-11-06 19:08:55 +00:00
parent 3316c2191a
commit 278f60e9e0
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
web/zm_html_view_video.php
View File

@ -207,14 +207,30 @@ else
unlink( $video_files[$delete] );
unset( $video_files[$delete] );
}
$index = 0;
foreach ( $video_files as $file )
if ( count($video_files) > 0 )
{
preg_match( '/^(.+)-([_\d]+)-([_\d]+)\.([^.]+)$/', $file, $matches );
$rate = (int)(100 * preg_replace( '/_/', '.', $matches[2] ) );
$scale = (int)(100 * preg_replace( '/_/', '.', $matches[3] ) );
$rate_text = isset($rates[$rate])?$rates[$rate]:($rate."x");
$scale_text = isset($scales[$scale])?$scales[$scale]:($scale."x");
$index = 0;
foreach ( $video_files as $file )
{
preg_match( '/^(.+)-((?:r[_\d]+)|(?:F[_\d]+))-((?:s[_\d]+)|(?:S[0-9a-z]+))\.([^.]+)$/', $file, $matches );
if ( preg_match( '/^r(.+)$/', $matches[2], $temp_matches ) )
{
$rate = (int)(100 * preg_replace( '/_/', '.', $temp_matches[1] ) );
$rate_text = isset($rates[$rate])?$rates[$rate]:($rate."x");
}
elseif ( preg_match( '/^F(.+)$/', $matches[2], $temp_matches ) )
{
$rate_text = $temp_matches[1]."fps";
}
if ( preg_match( '/^s(.+)$/', $matches[3], $temp_matches ) )
{
$scale = (int)(100 * preg_replace( '/_/', '.', $temp_matches[1] ) );
$scale_text = isset($scales[$scale])?$scales[$scale]:($scale."x");
}
elseif ( preg_match( '/^S(.+)$/', $matches[3], $temp_matches ) )
{
$scale_text = $temp_matches[1];
}
?>
<tr>
<td class="text" align="center"><?= $matches[4] ?></td>
@ -224,7 +240,8 @@ else
<td class="text" align="center"><a href="javascript:viewVideo( '<?= $file ?>', 'zmVideo<?= $eid ?>-<?= $scale ?>', 12+<?= reScale( $event['Width'], $scale ) ?>, 20+<?= reScale( $event['Height'], $scale ) ?> );"><?= $zmSlangView ?></a>&nbsp;/&nbsp;<a href="<?= $file ?>" onClick="window.location='<?= $PHP_SELF ?>?view=<?= $view ?>&eid=<?= $eid ?>&download=<?= $index ?>'" target="_blank"><?= $zmSlangDownload ?></a>&nbsp;/&nbsp;<a href="javascript: deleteVideo( <?= $index ?> )"><?= $zmSlangDelete ?></a></td>
</tr>
<?php
$index++;
$index++;
}
}
}
else