mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-19 03:56:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

1) Rebased to 1.24.4

Browse Source 
2) Reverted to stock zmdc.pl.in and zmwatch.pl.in because the bugs are fixed
3) Updated configure and Makefile files
This commit is contained in:
Kfir Itzhak
2011-06-11 11:50:53 +03:00
parent eeaed7ccd3
commit 2fd6e99ec5
4 changed files with 4 additions and 11056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11047
configure vendored
View File

File diff suppressed because it is too large Load Diff

3
scripts/zmdc.pl.in
View File

@@ -128,9 +128,6 @@ foreach my $arg ( @ARGV )
}
}
# Create the directory first if it doesn't exist
mkdir(ZM_PATH_SOCKS);
socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 ) or Fatal( "Can't open socket: $!" );
my $saddr = sockaddr_un( SOCK_FILE );

8
scripts/zmwatch.pl.in
View File

@@ -87,7 +87,6 @@ while( 1 )
{
# Check we have got an image recently
my $image_time = zmGetLastWriteTime( $monitor );
zmMemInvalidate( $monitor );
next if ( !defined($image_time) ); # Can't read from shared data
next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
@@ -96,9 +95,9 @@ while( 1 )
Debug( "Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay\n" );
if ( $image_delay > $max_image_delay )
{
Info( "Restarting capture daemon for ".$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n" );
$restart = 1;
}
Info( "Restarting capture daemon for ".$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n" );
$restart = 1;
}
}
else
{
@@ -125,7 +124,6 @@ while( 1 )
{
# Check we have got an image recently
my $image_time = zmGetLastReadTime( $monitor );
zmMemInvalidate( $monitor );
next if ( !defined($image_time) ); # Can't read from shared data
next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.

2
src/Makefile.in
View File

@@ -242,7 +242,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = gnu
AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -finline-functions
#AM_CXXFLAGS = -frepo
CLEANFILES = *.rpo