From 942e97539c021573a56f16190752e312d8fdd550 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Thu, 5 May 2016 15:08:29 -0400 Subject: don't send ZMS commands if playing mp4 Former-commit-id: ea5aa036d8e03deabce335b4d04a1335d9155124 --- www/js/EventModalCtrl.js | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'www/js') diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 77d033a9..2aa2a3be 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -127,14 +127,30 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro { //console.log ("Event timer"); //console.log ("Event timer"); - processEvent('99',$scope.connKey); + if ($scope.defaultVideo !== undefined && $scope.defaultVideo !='') + { + console.log ("playing video, not using zms, skipping event commands"); + } + else + { + processEvent('99',$scope.connKey); + } } function sendCommand(cmd,connkey,extras,rq) { - console.log ("Sending CGI command to " + $scope.commandURL); var d = $q.defer(); + + if ($scope.defaultVideo !== undefined && $scope.defaultVideo !='') + { + console.log ("playing video, not using zms, skipping event commands"); + d.resolve(true); + return (d.promise); + } + + console.log ("Sending CGI command to " + $scope.commandURL); + var loginData = ZMDataModel.getLogin(); var rqtoken = rq? rq:"stream"; var myauthtoken = $rootScope.authSession.replace("&auth=",""); @@ -1162,7 +1178,11 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro event.Event.BasePath = computeBasePath(event); event.Event.relativePath = computeRelativePath(event); - + + event.Event.streamingURL = ZMDataModel.getStreamingURL (event.Event.MonitorId); + // event.Event.baseURL = ZMDataModel.getBaseURL (event.Event.MonitorId); + event.Event.baseURL = loginData.url; + event.Event.imageMode = ZMDataModel.getImageMode (event.Event.MonitorId); //console.log (JSON.stringify( success)); $scope.eventName = event.Event.Name; -- cgit v1.2.3