From c90e4b23945ce93fd518c1595aa3d9275743f788 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 3 Nov 2019 09:51:31 -0500
Subject: add option to pause streams for simul, turn it off for default

---
 www/js/MontageCtrl.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'www/js/MontageCtrl.js')

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 9abbcd03..d9bfd19b 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1276,11 +1276,16 @@ angular.module('zmApp.controllers')
 
 
         if (simulStreaming) {
-          NVR.debug("Pausing all streams in montage to save memory/nw...");
 
+          var ld = NVR.getLogin();
+          if (ld.pauseStreams) {
+            NVR.debug("Pausing all streams in montage to save memory/nw...");
+            for (var i = 0; i < $scope.MontageMonitors.length; i++) {
+              if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show') NVR.pauseLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL, $scope.MontageMonitors[i].Monitor.Name);
+            }
 
-          for (var i = 0; i < $scope.MontageMonitors.length; i++) {
-            if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show') NVR.pauseLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL, $scope.MontageMonitors[i].Monitor.Name);
+          } else {
+            NVR.debug ("Not pausing streams as pauseStreams is off");
           }
 
         }
@@ -1419,11 +1424,16 @@ angular.module('zmApp.controllers')
       // once regenerated 
       if (simulStreaming) {
 
-        NVR.debug("Resuming all stream connkeys in montage ...");
+        if (ld.pauseStreams) {
+          NVR.debug("Resuming all stream connkeys in montage ...");
 
-        for (var i = 0; i < $scope.MontageMonitors.length; i++) {
-          if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show') NVR.resumeLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL, $scope.MontageMonitors[i].Monitor.Name);
+          for (var i = 0; i < $scope.MontageMonitors.length; i++) {
+            if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show') NVR.resumeLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL, $scope.MontageMonitors[i].Monitor.Name);
+          }
+        } else {
+          NVR.debug ("Not resuming streams as pauseStreams is off");
         }
+        
       
       }
 
-- 
cgit v1.2.3