summaryrefslogtreecommitdiff
path: root/www/js/EventModalCtrl.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2020-06-03 16:57:07 -0400
committerPliable Pixels <pliablepixels@gmail.com>2020-06-03 16:57:07 -0400
commit32d07119c85e9d1c6d310c9a530335d0e8930830 (patch)
tree6b2969a7568b84f3b0242e4ee3c95eaa11b48316 /www/js/EventModalCtrl.js
parent87c1e58c3ad43bb03ad47949131e7a30e820fffd (diff)
#951 add forced mjpeg support on per monitor basis
Diffstat (limited to 'www/js/EventModalCtrl.js')
-rw-r--r--www/js/EventModalCtrl.js15
1 files changed, 14 insertions, 1 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 351253c8..c62c2cf6 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -35,6 +35,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
var playState = 'play';
var isSeeking = false;
$scope.useFilters = true;
+
var broadcastHandles = [];
@@ -2136,7 +2137,19 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
}
- $scope.defaultVideo = event.Event.DefaultVideo;
+
+
+ var ld = NVR.getLogin();
+ if (ld.monitorSpecific[event.Event.MonitorId] &&
+ ld.monitorSpecific[event.Event.MonitorId].forceMjpeg) {
+ NVR.debug ('Monitor:'+event.Event.MonitorId+' has forced MJPEG playback');
+ $scope.defaultVideo ='';
+ } else {
+
+ $scope.defaultVideo = event.Event.DefaultVideo;
+ }
+
+
$scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();