ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up unneeded code

pull/4167/head
Ben Dailey 2024-10-03 11:59:08 -04:00
parent 326995d810
commit 6159a74d41
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.h
View File

@ -329,9 +329,6 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
bool healthy;
std::string last_topic;
std::string last_value;
std::string last_active_topic;
std::string last_active_value;
std::string GetNoteText();
void SetNoteSet(Event::StringSet &noteSet);
#ifdef WITH_GSOAP
struct soap *soap = nullptr;
@ -353,9 +350,6 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
bool isAlarmed() const { return alarmed; };
void setAlarmed(bool p_alarmed) { alarmed = p_alarmed; };
bool isHealthy() const { return healthy; };
const std::string &lastTopic() const { return last_active_topic; };
const std::string &lastValue() const { return last_active_value; };
const std::string noteText() { return GetNoteText(); };
void setNotes(Event::StringSet &noteSet) { SetNoteSet(noteSet); };
};

9
src/zm_monitor_onvif.cpp
View File

@ -202,8 +202,6 @@ void Monitor::ONVIF::WaitForMessage() {
if (alarms.count(last_topic) == 0 )
{
alarms[last_topic] = last_value;
last_active_topic = last_topic;
last_active_value = last_value;
if (!alarmed) {
Info("Triggered Start Event on ONVIF");
alarmed = true;
@ -286,13 +284,6 @@ int SOAP_ENV__Fault(struct soap *soap, char *faultcode, char *faultstring, char
}
#endif
std::string Monitor::ONVIF::GetNoteText() {
std::string note = "";
#ifdef WITH_GSOAP
note = last_active_topic + "/" + last_active_value;
#endif
return note;
}
void Monitor::ONVIF::SetNoteSet(Event::StringSet &noteSet) {
std::string note = "";
#ifdef WITH_GSOAP