Merge branch 'master' of github.com:ZoneMinder/zoneminder

ZoneMinder · Oct 10, 2024 · 2be8cf7 · 2be8cf7
2 parents 0019857 + f1a72c9
commit 2be8cf7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/zm_monitor_onvif.cpp b/src/zm_monitor_onvif.cpp
@@ -188,8 +188,8 @@ void Monitor::ONVIF::WaitForMessage() {
           if (last_value.find("false") == 0) {
             Info("Triggered off ONVIF");
             alarms.erase(last_topic);
-            if(alarms.empty()) {
-              Debug(1, "ONVIF Alarms Empty: Alarms count is %zu, alarmed is %s", alarms.size(), alarmed ? "true": "false");
+              Debug(1, "ONVIF Alarms Empty: Alarms count is %zu, alarmed is %s, empty is %d ", alarms.size(), alarmed ? "true": "false", alarms.empty());
+            if (alarms.empty()) {
               alarmed = false;
             }
             if (!parent->Event_Poller_Closes_Event) { //If we get a close event, then we know to expect them.
@@ -284,13 +284,15 @@ int SOAP_ENV__Fault(struct soap *soap, char *faultcode, char *faultstring, char
 #endif
 
 void Monitor::ONVIF::SetNoteSet(Event::StringSet &noteSet) {
-  std::string note = "";
   #ifdef WITH_GSOAP
+    if (alarms.empty()) return;
+
+    std::string note = "";
     for (auto it = alarms.begin(); it != alarms.end(); ++it) {
       note = it->first + "/" + it->second;
       noteSet.insert(note);
     }
   #endif
-  return ;
+  return;
 }
 
diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
@@ -1152,7 +1152,7 @@ button.btn.btn-zoom-out {
   position: absolute;
   left: 3px;
   top: 3px;
-  z-index: 10;
+  z-index: 20;
   text-shadow:
     -1px -1px 0 #575757,
     1px -1px 0 #575757,
@@ -1166,7 +1166,7 @@ button.btn.btn-zoom-in {
   position: absolute;
   right: 3px;
   top: 3px;
-  z-index: 10;
+  z-index: 20;
   text-shadow:
     -1px -1px 0 #575757,
     1px -1px 0 #575757,

diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
@@ -151,7 +151,7 @@
 }
 
 $video_tag = ($codec == 'MP4') || 
-  ((false !== strpos($Event->DefaultVideo(), 'h264')) || (false !== strpos($Event->DefaultVideo(), 'av1')) && ($codec === 'auto'));
+  ((false !== strpos($Event->DefaultVideo(), 'h264') || false !== strpos($Event->DefaultVideo(), 'av1')) && ($codec === 'auto'));
 
 // videojs zoomrotate only when direct recording
 $Zoom = 1;
@@ -342,7 +342,7 @@
                           function($r){return $r >= 0 ? true : false;}
                         ))) ?>], "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'
                   >
-                  <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mpeg','format'=>'h264'),'&amp;'); ?>" type="video/mp4">
+                  <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mp4','format'=>'h264'),'&amp;'); ?>" type="video/mp4">
                   <track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default/>
                   Your browser does not support the video tag.
                   </video>