Add ModectDuringPTZ and suspend and resume functions
parent
e256d9a5a8
commit
4843cb8593
|
@ -27,11 +27,13 @@ package ZoneMinder::Monitor;
|
||||||
use 5.006;
|
use 5.006;
|
||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
use Time::HiRes qw(usleep);
|
||||||
|
|
||||||
require ZoneMinder::Base;
|
require ZoneMinder::Base;
|
||||||
require ZoneMinder::Object;
|
require ZoneMinder::Object;
|
||||||
require ZoneMinder::Storage;
|
require ZoneMinder::Storage;
|
||||||
require ZoneMinder::Server;
|
require ZoneMinder::Server;
|
||||||
|
require ZoneMinder::Memory;
|
||||||
require ZoneMinder::Monitor_Status;
|
require ZoneMinder::Monitor_Status;
|
||||||
|
|
||||||
#our @ISA = qw(Exporter ZoneMinder::Base);
|
#our @ISA = qw(Exporter ZoneMinder::Base);
|
||||||
|
@ -115,6 +117,7 @@ $serial = $primary_key = 'Id';
|
||||||
TrackDelay
|
TrackDelay
|
||||||
ReturnLocation
|
ReturnLocation
|
||||||
ReturnDelay
|
ReturnDelay
|
||||||
|
ModectDuringPTZ
|
||||||
DefaultRate
|
DefaultRate
|
||||||
DefaultScale
|
DefaultScale
|
||||||
SignalCheckPoints
|
SignalCheckPoints
|
||||||
|
@ -200,6 +203,7 @@ $serial = $primary_key = 'Id';
|
||||||
TrackDelay => undef,
|
TrackDelay => undef,
|
||||||
ReturnLocation => -1,
|
ReturnLocation => -1,
|
||||||
ReturnDelay => undef,
|
ReturnDelay => undef,
|
||||||
|
ModectDuringPTZ => 0,
|
||||||
DefaultRate => 100,
|
DefaultRate => 100,
|
||||||
DefaultScale => 100,
|
DefaultScale => 100,
|
||||||
SignalCheckPoints => 0,
|
SignalCheckPoints => 0,
|
||||||
|
@ -254,6 +258,37 @@ sub Status {
|
||||||
return $$self{Status};
|
return $$self{Status};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub connect {
|
||||||
|
my $self = shift;
|
||||||
|
return ZoneMinder::Memory::zmMemVerify($self);
|
||||||
|
}
|
||||||
|
|
||||||
|
sub disconnect {
|
||||||
|
my $self = shift;
|
||||||
|
ZoneMinder::Memory::zmMemInvalidate($self); # Close our file handle to the zmc process we are about to end
|
||||||
|
}
|
||||||
|
|
||||||
|
sub suspendMotionDetection {
|
||||||
|
my $self = shift;
|
||||||
|
return 0 if ! ZoneMinder::Memory::zmMemVerify($self);
|
||||||
|
while (ZoneMinder::Memory::zmMemRead($self, 'shared_data:active', 1)) {
|
||||||
|
ZoneMinder::Logger::Debug(1, 'Suspending motion detection');
|
||||||
|
ZoneMinder::Memory::zmMonitorSuspend($self);
|
||||||
|
usleep(100000);
|
||||||
|
}
|
||||||
|
ZoneMinder::Logger::Debug(1,ZoneMinder::Memory::zmMemRead($self, 'shared_data:active', 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
sub resumeMotionDetection {
|
||||||
|
my $self = shift;
|
||||||
|
return 0 if ! ZoneMinder::Memory::zmMemVerify($self);
|
||||||
|
#while (zmMemRead($self, 'shared_data:active', 1)) {
|
||||||
|
ZoneMinder::Logger::Debug(1, 'Resuming motion detection');
|
||||||
|
ZoneMinder::Memory::zmMonitorResume($self);
|
||||||
|
#}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
__END__
|
__END__
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue