diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-07-18 16:52:54 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-07-18 16:52:54 -0400 |
| commit | 6e594ab97ae1bc71d9737e49cdcb51be984731f2 (patch) | |
| tree | 27f7b649488713eb090fd8f9e0aef13ba59dd37d /www/js/MonitorModalCtrl.js | |
| parent | ef082993d703c355576b9f163737adef53380a48 (diff) | |
allow max FPS settings for Montage Mode (irrelevant if not using multiport)
Diffstat (limited to 'www/js/MonitorModalCtrl.js')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index bf6c95dd..1f0ce944 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -421,6 +421,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ var apiurl = NVR.getLogin().apiurl; var alarmurl = apiurl + "/monitors/alarm/id:" + $scope.monitorId + "/command:status.json?"+$rootScope.authSession; NVR.log("Invoking " + alarmurl); + console.log ("ALARM = "+alarmurl); $http.get(alarmurl) .then(function (data) { @@ -1061,6 +1062,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ var c = mode == 'on' ? 'on' : 'off'; var alarmurl = apiurl + "/monitors/alarm/id:" + mid + "/command:" + c + ".json?"+$rootScope.authSession; NVR.log("Invoking " + alarmurl); + var status = mode ? $translate.instant('kForcingAlarm') : $translate.instant('kCancellingAlarm'); $ionicLoading.show({ @@ -1257,7 +1259,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ var stream; - var fps = NVR.getLogin().liveFPS; + var fps = NVR.getLogin().singleliveFPS; stream = $scope.monitor.Monitor.streamingURL + "/nph-zms?mode=" + getSingleStreamMode() + "&monitor=" + $scope.monitorId + |