revert some structure changes

This commit is contained in:
Isaac Connor 2016-04-01 14:57:48 -04:00
parent f4fc129ecf
commit 58c39f930e
1 changed files with 398 additions and 392 deletions

View File

@ -45,17 +45,20 @@
// This is the main class for monitors. Each monitor is associated
// with a camera and is effectively a collector for events.
//
class Monitor {
class Monitor
{
friend class MonitorStream;
public:
typedef enum {
typedef enum
{
QUERY=0,
CAPTURE,
ANALYSIS
} Purpose;
typedef enum {
typedef enum
{
NONE=1,
MONITOR,
MODECT,
@ -64,7 +67,8 @@ public:
NODECT
} Function;
typedef enum {
typedef enum
{
ROTATE_0=1,
ROTATE_90,
ROTATE_180,
@ -73,7 +77,8 @@ public:
FLIP_VERT
} Orientation;
typedef enum {
typedef enum
{
IDLE,
PREALARM,
ALARM,
@ -89,7 +94,8 @@ protected:
typedef enum { CLOSE_TIME, CLOSE_IDLE, CLOSE_ALARM } EventCloseMode;
/* sizeof(SharedData) expected to be 336 bytes on 32bit and 64bit */
typedef struct {
typedef struct
{
uint32_t size; /* +0 */
uint32_t last_write_index; /* +4 */
uint32_t last_read_index; /* +8 */