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

Removed event delay config. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@650 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2003-10-10 13:34:20 +00:00
parent 3fe296d406
commit 945e8e4145
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/zm_config.php.z
View File

@ -66,7 +66,6 @@ switch ( $bandwidth )
define( "REFRESH_EVENTS", ZM_WEB_H_REFRESH_EVENTS ); // How often the event listing is refreshed in the watch window, only for recent events
define( "STREAM_IDLE_DELAY", ZM_WEB_H_STREAM_IDLE_DELAY ); // How long (in milliseconds) between streamed frames in the watch window
define( "STREAM_FRAME_DELAY", ZM_WEB_H_STREAM_FRAME_DELAY ); // How long (in milliseconds) to wait before looking for the next streamed frame
define( "STREAM_EVENT_DELAY", ZM_WEB_H_STREAM_EVENT_DELAY ); // How long (in milliseconds) to wait between each frame when streaming events
define( "IMAGE_SCALING", ZM_WEB_H_IMAGE_SCALING ); // Image scaling for thumbnails, bandwidth versus cpu in rescaling
break;
}
@ -79,7 +78,6 @@ switch ( $bandwidth )
define( "REFRESH_EVENTS", ZM_WEB_M_REFRESH_EVENTS ); // How often the event listing is refreshed in the watch window, only for recent events
define( "STREAM_IDLE_DELAY", ZM_WEB_M_STREAM_IDLE_DELAY ); // How long (in milliseconds) between streamed frames in the watch window
define( "STREAM_FRAME_DELAY", ZM_WEB_M_STREAM_FRAME_DELAY ); // How long (in milliseconds) to wait before looking for the next streamed frame
define( "STREAM_EVENT_DELAY", ZM_WEB_M_STREAM_EVENT_DELAY ); // How long (in milliseconds) to wait between each frame when streaming events
define( "IMAGE_SCALING", ZM_WEB_M_IMAGE_SCALING ); // Image scaling for thumbnails, bandwidth versus cpu in rescaling
break;
}
@ -92,7 +90,6 @@ switch ( $bandwidth )
define( "REFRESH_EVENTS", ZM_WEB_L_REFRESH_EVENTS ); // How often the event listing is refreshed in the watch window, only for recent events
define( "STREAM_IDLE_DELAY", ZM_WEB_L_STREAM_IDLE_DELAY ); // How long (in milliseconds) between streamed frames in the watch window
define( "STREAM_FRAME_DELAY", ZM_WEB_L_STREAM_FRAME_DELAY ); // How long (in milliseconds) to wait before looking for the next streamed frame
define( "STREAM_EVENT_DELAY", ZM_WEB_L_STREAM_EVENT_DELAY ); // How long (in milliseconds) to wait between each frame when streaming events
define( "IMAGE_SCALING", ZM_WEB_L_IMAGE_SCALING ); // Image scaling for thumbnails, bandwidth versus cpu in rescaling
break;
}

26
zmconfig.pl.in
View File

@ -37,7 +37,7 @@ sub Usage
print( "
Usage: zmconfig.pl [-f <config file>,--file=<config file>] [-(no)database] [--(no)interactive] [--(no)reprocess]
Parameters are :-
-f <config_file>, --file=<config_file> - Use a configuration file other and the default zmconfig.txt
-f <config_file>, --file=<config_file> - Use a configuration file other than the default zmconfig.txt
-(no)d, --(no)database - Whether the database has already been created, on by default
-(no)i, --(no)interactive - Whether to include interactive configuration, on by default
-(no)r, --(no)reprocess - Whether to reprocess files, on by default
@ -843,14 +843,6 @@ my @options =
type => $types{integer},
category => 'highband',
},
{
name => "ZM_WEB_H_STREAM_EVENT_DELAY",
default => "-1",
description => "How long to wait between each frame when streaming events",
help => "When viewing a captured event this option controls how fast frames are sent to the browser. If this is a positive value then this represents the interval in milliseconds between each frame and should roughly match your capture rate otherwise the event may appear too fast or too slow. If zero then frames are sent as fast as possible. If this value is negative then the frames are sent at a rate proportional to the real interval at which they were captured, bandwidth permitting. Thus the default of -1 will try to send the frames at a real-time rate, -2 will be double real-time etc.",
type => $types{integer},
category => 'highband',
},
{
name => "ZM_WEB_H_IMAGE_SCALING",
default => "1",
@ -917,14 +909,6 @@ my @options =
type => $types{integer},
category => 'medband',
},
{
name => "ZM_WEB_M_STREAM_EVENT_DELAY",
default => "-1",
description => "How long to wait between each frame when streaming events",
help => "When viewing a captured event this option controls how fast frames are sent to the browser. If this is a positive value then this represents the interval in milliseconds between each frame and should roughly match your capture rate otherwise the event may appear too fast or too slow. If zero then frames are sent as fast as possible. If this value is negative then the frames are sent at a rate proportional to the real interval at which they were captured, bandwidth permitting. Thus the default of -1 will try to send the frames at a real-time rate, -2 will be double real-time etc.",
type => $types{integer},
category => 'medband',
},
{
name => "ZM_WEB_M_IMAGE_SCALING",
default => "4",
@ -991,14 +975,6 @@ my @options =
type => $types{integer},
category => 'lowband',
},
{
name => "ZM_WEB_L_STREAM_EVENT_DELAY",
default => "-1",
description => "How long to wait between each frame when streaming events",
help => "When viewing a captured event this option controls how fast frames are sent to the browser. If this is a positive value then this represents the interval in milliseconds between each frame and should roughly match your capture rate otherwise the event may appear too fast or too slow. If zero then frames are sent as fast as possible. If this value is negative then the frames are sent at a rate proportional to the real interval at which they were captured, bandwidth permitting. Thus the default of -1 will try to send the frames at a real-time rate, -2 will be double real-time etc.",
type => $types{integer},
category => 'lowband',
},
{
name => "ZM_WEB_L_IMAGE_SCALING",
default => "4",