code documentation, whitespace

This commit is contained in:
Isaac Connor 2017-05-20 09:03:51 -04:00
parent e7ca892efd
commit 457d7e5c94
2 changed files with 15 additions and 14 deletions

View File

@ -1214,7 +1214,8 @@ bool Monitor::Analyse() {
} }
shared_data->action &= ~RESUME; shared_data->action &= ~RESUME;
} }
} } // end if shared_data->action
if ( auto_resume_time && (now.tv_sec >= auto_resume_time) ) { if ( auto_resume_time && (now.tv_sec >= auto_resume_time) ) {
Info( "Auto resuming at count %d", image_count ); Info( "Auto resuming at count %d", image_count );
shared_data->active = true; shared_data->active = true;

View File

@ -158,7 +158,7 @@ protected:
typedef struct { typedef struct {
uint32_t size; uint32_t size;
char event_file[4096]; char event_file[4096];
timeval 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;
@ -216,18 +216,18 @@ protected:
protected: protected:
// These are read from the DB and thereafter remain unchanged // These are read from the DB and thereafter remain unchanged
unsigned int id; unsigned int id;
char name[64]; char name[64];
unsigned int server_id; unsigned int server_id; // Id of the Server object
Function function; // What the monitor is doing Function function; // What the monitor is doing
bool enabled; // Whether the monitor is enabled or asleep bool enabled; // Whether the monitor is enabled or asleep
unsigned int width; // Normally the same as the camera, but not if partly rotated unsigned int width; // Normally the same as the camera, but not if partly rotated
unsigned int height; // Normally the same as the camera, but not if partly rotated unsigned int height; // Normally the same as the camera, but not if partly rotated
bool v4l_multi_buffer; bool v4l_multi_buffer;
unsigned int v4l_captures_per_frame; unsigned int v4l_captures_per_frame;
Orientation orientation; // Whether the image has to be rotated at all Orientation orientation; // Whether the image has to be rotated at all
unsigned int deinterlacing; unsigned int deinterlacing;
bool videoRecording; bool videoRecording;
int savejpegspref; int savejpegspref;
VideoWriter videowriter; VideoWriter videowriter;