From 2100647d8d981e9ff53238a6ccacd83f66714a3f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 8 Apr 2018 08:20:02 -0400
Subject: #606 made simulstreaming optional

---
 www/js/DataModel.js           | 9 ++++++++-
 www/js/MontageCtrl.js         | 6 ++++++
 www/lang/locale-en.json       | 1 +
 www/templates/devoptions.html | 7 +++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 393cfd89..f930be8d 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -176,7 +176,8 @@ angular.module('zmApp.controllers')
         'momentMonitorFilter': [],
         'enableMomentSubMenu': true,
         'momentArrangeBy': 'StartTime',
-        'showLiveForInProgressEvents': true
+        'showLiveForInProgressEvents': true,
+        'disableSimulStreaming': false,
 
 
       };
@@ -843,6 +844,12 @@ angular.module('zmApp.controllers')
                     loginData.defaultPushSound = false;
                   }
 
+
+                  if (typeof loginData.disableSimulStreaming == 'undefined') {
+                   
+                    loginData.disableSimulStreaming = false;
+                  }
+
                   if (typeof loginData.exitOnSleep == 'undefined') {
                     debug("exitOnSleep does not exist. Setting to false");
                     loginData.exitOnSleep = false;
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 4bee1453..bac79b9f 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1714,6 +1714,12 @@ angular.module('zmApp.controllers')
                 simulStreaming = '1';
                 NVRDataModel.debug ("IOS detected, force enabling simulStreams");
             }
+
+            if (ld.disableSimulStreaming) {
+                simulStreaming = '0';
+                NVRDataModel.debug ("Forcing simulStreams off as you have disabled it");
+
+            }
         },
         function (err) {
             NVRDataModel.debug("******* SHOULD NEVER HAPPEN - MULTIPORT ERROR");
diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
index ca6c0405..8015468d 100644
--- a/www/lang/locale-en.json
+++ b/www/lang/locale-en.json
@@ -67,6 +67,7 @@
     "kDisableNativeSub"          :"Enable if the menu is freezing",
     "kDisablePush"               :"disable APNS/GCM",
     "kDisableSamsung"            :"If you are on a samsung device and are facing input issues, please temporarily disable auto-correction",
+    "kDisableSimulStreaming"     :"Disable Montage real-time streaming",
     "kDiscovering"               :"discovering",
     "kDiscoveringAPI"            :"discovering api",
     "kDiscoveringCGI"            :"discovering cgi",
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 531ca840..5be3fd65 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -153,6 +153,13 @@
                     <p>{{'kDisableAlarmMontageSub' | translate}}</p></span>
                 </ion-toggle>
             </label>
+
+            <label>
+                    <ion-toggle ng-model="loginData.disableSimulStreaming" ng-checked="loginData.disableSimulStreaming" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableSimulStreaming' | translate}}
+                      </span>
+                    </ion-toggle>
+                </label>
+
             <label>
                 <ion-toggle ng-model="loginData.enableLogs" ng-checked="{{loginData.enableLogs}}" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableLogs' | translate}}</span></ion-toggle>
             </label>
-- 
cgit v1.2.3