diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 9 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 2 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 13 |
3 files changed, 21 insertions, 3 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index fdc0355c..bf6c95dd 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1257,12 +1257,17 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ var stream; + var fps = NVR.getLogin().liveFPS; stream = $scope.monitor.Monitor.streamingURL + "/nph-zms?mode=" + getSingleStreamMode() + "&monitor=" + $scope.monitorId + "&scale=" + $scope.quality + - '&buffer=1000' + - $rootScope.authSession + + '&buffer=1000'; + + if (fps) { + stream +='&maxfps='+fps; + } + stream += $rootScope.authSession + "&rand=" + $rootScope.modalRand + appendSingleStreamConnKey(); diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index f1f4f4f4..4ddc91af 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -173,6 +173,7 @@ "kLanguage" :"Language", "kLatestEvents" :"latest events", "kLiveView" :"Live View", + "kLoad" :"load", "kLoading" :"loading", "kLoadingEvents" :"loading events", @@ -359,6 +360,7 @@ "kShowLiveForInProgress" :"play live feed if event recording in progress", "kShowTimeDiffFrames" :"unique times", "kShowTip" :"show tip", + "kSingleViewFPS" :"single live view FPS", "kSoundOnPush" :"Play sound on push", "kSpeed" :"speed", "kStart" :"Start", diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index 03d51047..ab8ad90b 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -14,12 +14,23 @@ <i class="ion-android-settings" style="font-size:150%"></i> {{'kDeveloperOptionsFor'|translate}} {{loginData.serverName}} </span> - <div class="item item-input-inset"> + <div class="item item-input-inset item-text-wrap"> {{'kFrameUpdate'|translate}} ({{'kSec'|translate}}.) <label class="item-input-wrapper"> <input id="devoptions-move-3" type="tel" placeholder="min is 1s" ng-model="loginData.refreshSec"> </label> </div> + + <div class="item item-input-inset item-text-wrap"> + {{'kSingleViewFPS'|translate}} ({{'kSec'|translate}}.) + + <label class="item-input-wrapper"> + <input id="devoptions-move-3_1" type="tel" placeholder="leave empty for auto" ng-model="loginData.liveFPS"> + </label> + + </div> + + <label> <ion-toggle id="devoptions-move-4" ng-model="loginData.use24hr" toggle-class="toggle-calm"> <span class="item-text-wrap">{{'kEnable24hr' | translate}}</span> |