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

change bool recording to a timeval. and add GetPreEventCount

This commit is contained in:
Isaac Connor 2017-04-12 13:39:12 -04:00
parent e3d3fc3411
commit a0b57cedeb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_monitor.h
View File

@ -172,7 +172,7 @@ class Monitor
{ {
uint32_t size; uint32_t size;
char event_file[4096]; char event_file[4096];
uint32_t recording; //bool arch dependent so use uint32 instead timeval recording; // used as both bool and a pointer to the timestamp when recording should begin
//uint32_t frameNumber; //uint32_t frameNumber;
} VideoStoreData; } VideoStoreData;
@ -441,9 +441,10 @@ public:
VideoWriter GetOptVideoWriter() const { return( videowriter ); } VideoWriter GetOptVideoWriter() const { return( videowriter ); }
const std::vector<EncoderParameter_t>* GetOptEncoderParams() const { return( &encoderparamsvec ); } const std::vector<EncoderParameter_t>* GetOptEncoderParams() const { return( &encoderparamsvec ); }
unsigned int GetPreEventCount() const { return pre_event_count; };
State GetState() const; State GetState() const;
int GetImage( int index=-1, int scale=100 ); int GetImage( int index=-1, int scale=100 );
Snapshot *getSnapshot(); Snapshot *getSnapshot();
struct timeval GetTimestamp( int index=-1 ) const; struct timeval GetTimestamp( int index=-1 ) const;
void UpdateAdaptiveSkip(); void UpdateAdaptiveSkip();
useconds_t GetAnalysisRate(); useconds_t GetAnalysisRate();