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

Merge branch 'master' into janus

This commit is contained in:
Jonathan Bennett 2022-01-12 13:04:13 -06:00 committed by GitHub
parent 84a73bb007 c9db5f44a4
commit aeefc512ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_monitor.cpp
View File

@ -1077,6 +1077,7 @@ bool Monitor::connect() {
shared_data->valid = true; shared_data->valid = true;
#ifdef WITH_GSOAP #ifdef WITH_GSOAP
//ONVIF Setup //ONVIF Setup
ONVIF_Trigger_State = FALSE; ONVIF_Trigger_State = FALSE;
if (onvif_event_listener) { //Temporarily using this option to enable the feature if (onvif_event_listener) { //Temporarily using this option to enable the feature
@ -1095,6 +1096,7 @@ bool Monitor::connect() {
proxyEvent = PullPointSubscriptionBindingProxy(soap); proxyEvent = PullPointSubscriptionBindingProxy(soap);
std::string full_url = onvif_url + "/Events"; std::string full_url = onvif_url + "/Events";
proxyEvent.soap_endpoint = full_url.c_str(); proxyEvent.soap_endpoint = full_url.c_str();
set_credentials(soap); set_credentials(soap);
Debug(1, "ONVIF Endpoint: %s", proxyEvent.soap_endpoint); Debug(1, "ONVIF Endpoint: %s", proxyEvent.soap_endpoint);
if (proxyEvent.CreatePullPointSubscription(&request, response) != SOAP_OK) { if (proxyEvent.CreatePullPointSubscription(&request, response) != SOAP_OK) {
@ -3140,7 +3142,9 @@ int Monitor::PrimeCapture() {
#ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options. #ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options.
//ONVIF Thread //ONVIF Thread
if (onvif_event_listener && ONVIF_Healthy) {
if (onvif_event_listener && ONVIF_Healthy) {
if (!Poller) { if (!Poller) {
Poller = zm::make_unique<PollThread>(this); Poller = zm::make_unique<PollThread>(this);
} else { } else {