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

change bool recording to a timeval.

This commit is contained in:
Isaac Connor 2017-04-12 13:40:17 -04:00
parent 575b3138de
commit ecb57f8f04
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_remote_camera.h
View File

@ -90,7 +90,7 @@ public:
virtual int PreCapture() = 0; virtual int PreCapture() = 0;
virtual int Capture( Image &image ) = 0; virtual int Capture( Image &image ) = 0;
virtual int PostCapture() = 0; virtual int PostCapture() = 0;
virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory )=0; virtual int CaptureAndRecord( Image &image, timeval recording, char* event_directory )=0;
}; };
#endif // ZM_REMOTE_CAMERA_H #endif // ZM_REMOTE_CAMERA_H

2
src/zm_remote_camera_http.h
View File

@ -59,7 +59,7 @@ public:
int PreCapture(); int PreCapture();
int Capture( Image &image ); int Capture( Image &image );
int PostCapture(); int PostCapture();
int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);}; int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) {return(0);};
}; };
#endif // ZM_REMOTE_CAMERA_HTTP_H #endif // ZM_REMOTE_CAMERA_HTTP_H

4
src/zm_remote_camera_rtsp.cpp
View File

@ -392,7 +392,7 @@ int RemoteCameraRtsp::Capture( Image &image ) {
//Function to handle capture and store //Function to handle capture and store
int RemoteCameraRtsp::CaptureAndRecord(Image &image, bool recording, char* event_file ) { int RemoteCameraRtsp::CaptureAndRecord(Image &image, timeval recording, char* event_file ) {
AVPacket packet; AVPacket packet;
uint8_t* directbuffer; uint8_t* directbuffer;
int frameComplete = false; int frameComplete = false;
@ -407,7 +407,7 @@ int RemoteCameraRtsp::CaptureAndRecord(Image &image, bool recording, char* event
return (-1); return (-1);
//Video recording //Video recording
if ( recording ) { if ( recording.tv_sec ) {
// The directory we are recording to is no longer tied to the current event. // The directory we are recording to is no longer tied to the current event.
// Need to re-init the videostore with the correct directory and start recording again // Need to re-init the videostore with the correct directory and start recording again
// Not sure why we are only doing this on keyframe, al // Not sure why we are only doing this on keyframe, al

2
src/zm_remote_camera_rtsp.h
View File

@ -86,7 +86,7 @@ public:
int PreCapture(); int PreCapture();
int Capture( Image &image ); int Capture( Image &image );
int PostCapture(); int PostCapture();
int CaptureAndRecord( Image &image, bool recording, char* event_directory ); int CaptureAndRecord( Image &image, timeval recording, char* event_directory );
}; };
#endif // ZM_REMOTE_CAMERA_RTSP_H #endif // ZM_REMOTE_CAMERA_RTSP_H