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

Added mpeg_encode path and improved PATH handling. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@52 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2002-09-23 21:54:57 +00:00
parent f382047643
commit 2b510069a1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/zm.php
View File

@ -31,6 +31,7 @@ define( "ZMU_PATH", ZM_PATH."/zmu" ); // Path to the Zone Monitor Utility
define( "ZMS_PATH", "/cgi-bin/zms" ); // Path to the Zone Monitor Stream server define( "ZMS_PATH", "/cgi-bin/zms" ); // Path to the Zone Monitor Stream server
define( "ZMS_EVENT_PATH", "/data/zm" ); // Full path (not web) to where events directory lives define( "ZMS_EVENT_PATH", "/data/zm" ); // Full path (not web) to where events directory lives
define( "CAMBOZOLA_PATH", "cambozola.jar" ); // Path to (optional) cambozola java streaming client (recommended) define( "CAMBOZOLA_PATH", "cambozola.jar" ); // Path to (optional) cambozola java streaming client (recommended)
define( "MPEG_ENCODE_PATH", "./mpeg_encode" ); // Path to (optional) mpeg video encoder
if ( $bandwidth == "high" ) if ( $bandwidth == "high" )
{ {
@ -880,7 +881,11 @@ function newWindow(Url,Name,Width,Height) {
<?php } else { ?> <?php } else { ?>
<td align="center" class="text">&nbsp;</td> <td align="center" class="text">&nbsp;</td>
<?php } ?> <?php } ?>
<?php if ( MPEG_ENCODE_PATH && file_exists( MPEG_ENCODE_PATH ) ) { ?>
<td align="center" class="text"><a href="javascript: newWindow( '<?php echo $PHP_SELF ?>?view=video&eid=<?php echo $eid ?>', 'zmVideo', 100, 80 );">Video</a></td> <td align="center" class="text"><a href="javascript: newWindow( '<?php echo $PHP_SELF ?>?view=video&eid=<?php echo $eid ?>', 'zmVideo', 100, 80 );">Video</a></td>
<?php } else { ?>
<td align="center" class="text">&nbsp;</td>
<?php } ?>
<td align="right" class="text"><a href="javascript: closeWindow();">Close</a></td> <td align="right" class="text"><a href="javascript: closeWindow();">Close</a></td>
</tr> </tr>
@ -1447,7 +1452,7 @@ elseif( $view == "video" )
fputs( $fp, "END_INPUT\n" ); fputs( $fp, "END_INPUT\n" );
fclose( $fp ); fclose( $fp );
exec( escapeshellcmd( "./mpeg_encode $param_file >$event_dir/mpeg.log" ) ); exec( escapeshellcmd( MPEG_ENCODE_PATH." $param_file >$event_dir/mpeg.log" ) );
} }
//chdir( $event_dir ); //chdir( $event_dir );
@ -1611,7 +1616,7 @@ function isNetscape()
function canStream() function canStream()
{ {
return( isNetscape() || file_exists( CAMBOZOLA_PATH ) ); return( isNetscape() || (CAMBOZOLA_PATH && file_exists( CAMBOZOLA_PATH )) );
} }
function startDaemon( $daemon, $did ) function startDaemon( $daemon, $did )