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

Fixed configuration and event streaming. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@280 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2003-01-11 10:15:12 +00:00
parent 1448b6ae74
commit 3a7648b66f
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/zmconfig.php.z
View File

@ -76,9 +76,9 @@ define( "ZM_DB_PASS", ZM_DB_PASSA ); // Database password
define( "ZM_PATH", "@prefix@/bin" ); // Local path to the general ZoneMonitor executables
define( "ZMU_PATH", ZM_PATH."/zmu" ); // Local path to the ZoneMinder Utility
define( "ZMS_PATH", "/cgi-bin/zms" ); // Web path to the ZoneMinder Stream server
define( "ZMS_EVENT_PATH", "@WEB_PREFIX@/".ZM_DIR_EVENTS ); // Full path (not web) to where events directory lives
define( "ZM_WEB_PATH", "@WEB_PREFIX@" ); // Full path (not web) to web directory
// These are miscelleaneous options you won't normally need to change
// These are miscellaneous options you won't normally need to change
//
define( "MAX_EVENTS", 12 ); // The maximum number of events to show in the monitor event listing
define( "EVENT_HEADER_LINES", 25 ); // How many events are listed in the event window before a new header is inserted

2
web/zmfuncs.php
View File

@ -74,7 +74,7 @@ function isNetscape()
function canStream()
{
return( isNetscape() || (ZM_PATH_CAMBOZOLA && file_exists( ZM_PATH_CAMBOZOLA )) );
return( isNetscape() || (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_CAMBOZOLA )) );
}
function fixDevices()

2
web/zmhtml.php
View File

@ -1406,7 +1406,7 @@ Learn Pref:&nbsp;<select name="learn_state" class="form" onChange="learn_form.su
<?php
if ( $mode == "stream" )
{
$stream_src = ZMS_PATH."?path=".ZMS_EVENT_PATH."&event=$eid&refresh=".STREAM_EVENT_DELAY;
$stream_src = ZMS_PATH."?path=".ZM_WEB_PATH."&event=$eid&refresh=".STREAM_EVENT_DELAY;
if ( isNetscape() )
{
?>

5
zmconfig.pl.in
View File

@ -144,7 +144,7 @@ my @options =
},
{
name => "ZM_PATH_CAMBOZOLA",
default => "",
default => "cambozola.jar",
description => "Web path to (optional) cambozola java streaming client (recommended)",
help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. It is highly recommended to install this from http://www.charliemouse.com/code/cambozola/ however if it is not installed still images at a lower refresh rate can still be viewed. Leave this blank if cambozola is installed in the same directory as the ZoneMinder web client files.",
requires => [ { name=>"ZM_OPT_CAMBOZOLA", value=>"yes" } ],
@ -159,7 +159,7 @@ my @options =
},
{
name => "ZM_PATH_MPEG_ENCODE",
default => "/usr/local/bin",
default => "/usr/local/bin/mpeg_encode",
description => "Path to (optional) mpeg video encoder",
help => "ZoneMinder can optionally encode a series of video images into an MPEG encoded file and this path should point to where the Berkeley mpeg_encode program has ben installed. This encoder is fairly slow and you don't lose much by not having it as events can still be reviewed as video stream without it.",
requires => [ { name=>"ZM_OPT_MPEG", value=>"yes" } ],
@ -773,6 +773,7 @@ if ( $reprocess )
foreach my $config_file ( @config_files )
{
print( "Processing '$config_file'\n" );
local $/ = undef;
open( CFG_IN_FILE, $config_file ) or die( "Can't open '$config_file' for reading" );
my $data = <CFG_IN_FILE>;