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

fix merge

This commit is contained in:
Isaac Connor 2018-08-31 19:12:05 -04:00
parent 42c6d90339
commit fd550c13ab
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
View File

@ -663,11 +663,7 @@ sub Dump {
sub debug { sub debug {
my $log = shift; my $log = shift;
<<<<<<< HEAD
$log->logPrint(DEBUG, @_);
=======
$log->logPrint(DEBUG, @_, caller); $log->logPrint(DEBUG, @_, caller);
>>>>>>> storageareas
} }
sub Debug( @ ) { sub Debug( @ ) {

3
src/zm_camera.h
View File

@ -117,9 +117,8 @@ public:
virtual int PrimeCapture() { return 0; } virtual int PrimeCapture() { return 0; }
virtual int PreCapture() = 0; virtual int PreCapture() = 0;
virtual int Capture(Image &image) = 0; virtual int Capture(ZMPacket &p)=0;
virtual int PostCapture() = 0; virtual int PostCapture() = 0;
virtual int CaptureAndRecord(Image &image, timeval recording, char* event_directory) = 0;
virtual int Close() = 0; virtual int Close() = 0;
}; };

5
src/zm_event.cpp
View File

@ -146,14 +146,9 @@ Event::Event(
errno = 0; errno = 0;
if ( mkdir(path.c_str(), 0755) ) { if ( mkdir(path.c_str(), 0755) ) {
// FIXME This should not be fatal. Should probably move to a different storage area. // FIXME This should not be fatal. Should probably move to a different storage area.
<<<<<<< HEAD
if ( errno != EEXIST ) { if ( errno != EEXIST ) {
Error("Can't mkdir %s: %s", path.c_str(), strerror(errno)); Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
} }
=======
if ( errno != EEXIST )
Error("Can't mkdir %s: %s", path, strerror(errno));
>>>>>>> storageareas
} }
if ( i == 2 ) if ( i == 2 )
strncpy(date_path, path.c_str(), sizeof(date_path)); strncpy(date_path, path.c_str(), sizeof(date_path));