diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-20 19:17:21 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-20 19:17:21 -0400 |
| commit | 89211bbbd526bbc587361085b119a19d296f6a7f (patch) | |
| tree | a33b3f7cef77e6ea1ef4bf66e595194d16cba8ea /www/js/TimelineCtrl.js | |
| parent | 8d42918b774175be477e949c4739a1ae40238359 (diff) | |
#724 cleanup and making sure we take recordingURL for playback
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index e1fbc4ef..4a144092 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -864,11 +864,11 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla myevents[j].Event.MonitorName = NVRDataModel.getMonitorName(myevents[j].Event.MonitorId); myevents[j].Event.streamingURL = NVRDataModel.getStreamingURL(myevents[j].Event.MonitorId); - myevents[j].Event.baseURL = NVRDataModel.getBaseURL(myevents[j].Event.MonitorId); + myevents[j].Event.recordingURL = NVRDataModel.getRecordingURL(myevents[j].Event.MonitorId); myevents[j].Event.imageMode = NVRDataModel.getImageMode(myevents[j].Event.MonitorId); - if (NVRDataModel.getLogin().url != myevents[j].Event.baseURL) { + if (NVRDataModel.getLogin().url != myevents[j].Event.recordingURL) { - myevents[j].Event.baseURL = NVRDataModel.getLogin().url; + myevents[j].Event.recordingURL = NVRDataModel.getLogin().url; } if (typeof myevents[j].Event.DefaultVideo === 'undefined') @@ -1168,16 +1168,14 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // now construct base path myevents[i].Event.streamingURL = NVRDataModel.getStreamingURL(myevents[i].Event.MonitorId); - myevents[i].Event.baseURL = NVRDataModel.getBaseURL(myevents[i].Event.MonitorId); + myevents[i].Event.recordingURL = NVRDataModel.getRecordingURL(myevents[i].Event.MonitorId); myevents[i].Event.imageMode = NVRDataModel.getImageMode(myevents[i].Event.MonitorId); - if (NVRDataModel.getLogin().url != myevents[i].Event.baseURL) { + if (NVRDataModel.getLogin().url != myevents[i].Event.recordingURL) { //NVRDataModel.debug ("Multi server, changing base"); - myevents[i].Event.baseURL = NVRDataModel.getLogin().url; + myevents[i].Event.recordingURL = NVRDataModel.getLogin().url; } - // console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL); - - // console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL); + if (idfound) { |