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

move set|getStartTime functions down to where they need to be.

This commit is contained in:
Isaac Connor 2016-09-15 11:42:51 -04:00
parent ae4a4681cd
commit 06c73954d6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_monitor.h
View File

@ -220,12 +220,6 @@ class Monitor
inline time_t getLastConnectTime() const { inline time_t getLastConnectTime() const {
return( last_connect_time ); return( last_connect_time );
} }
inline time_t getStartupTime() const {
return( shared_data->startup_time );
}
inline void setStartupTime( time_t p_time ) {
shared_data->startup_time = p_time;
}
bool connect(); bool connect();
bool disconnect(); bool disconnect();
@ -462,6 +456,12 @@ public:
void ForceAlarmOff(); void ForceAlarmOff();
void CancelForced(); void CancelForced();
TriggerState GetTriggerState() const { return( (TriggerState)(trigger_data?trigger_data->trigger_state:TRIGGER_CANCEL )); } TriggerState GetTriggerState() const { return( (TriggerState)(trigger_data?trigger_data->trigger_state:TRIGGER_CANCEL )); }
inline time_t getStartupTime() const {
return( shared_data->startup_time );
}
inline void setStartupTime( time_t p_time ) {
shared_data->startup_time = p_time;
}
void actionReload(); void actionReload();
void actionEnable(); void actionEnable();