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

Rename H264PASSTHROUGH to just PASSTHROUGH. Add an analysis_it to the Monitor object as it will no longer exist in the packetqueue

This commit is contained in:
Isaac Connor 2021-01-06 11:32:09 -05:00
parent da7a50c92d
commit 432bb338e8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.h
View File

@ -104,8 +104,8 @@ public:
typedef enum { typedef enum {
DISABLED, DISABLED,
X264ENCODE, ENCODE,
H264PASSTHROUGH, PASSTHROUGH,
} VideoWriter; } VideoWriter;
protected: protected:
@ -194,6 +194,7 @@ protected:
VideoStore *videoStore; VideoStore *videoStore;
zm_packetqueue *packetqueue; zm_packetqueue *packetqueue;
packetqueue_iterator *analysis_it;
Mutex mutex; Mutex mutex;
class MonitorLink { class MonitorLink {
@ -425,6 +426,7 @@ public:
return storage; return storage;
} }
inline Function GetFunction() const { return function; } inline Function GetFunction() const { return function; }
inline zm_packetqueue * GetPacketQueue() const { return packetqueue; }
inline bool Enabled() const { inline bool Enabled() const {
if ( function <= MONITOR ) if ( function <= MONITOR )
return false; return false;