other video related updates

2 files changed, 12 insertions, 27 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 98557f7a..dc52846e 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -95,9 +95,7 @@ angular.module('zmApp.controllers')
         {
             showHiddenMonitors = false;
         }
-        // console.log (">>>>>>>>>>>>>>>>>SHOWHIDDEN IS " + showHiddenMonitors);
-
-        // lets get the abbreviated version of TZ to display
+       
         if (NVRDataModel.getLogin().useLocalTimeZone)
         {
             $scope.tzAbbr = moment().tz(moment.tz.guess()).zoneAbbr();
@@ -203,22 +201,7 @@ angular.module('zmApp.controllers')
         $http.get(apiurl)
             .success(function(data) {})
             .error(function(err) {});
-        /*
-        myevents[i].Event.humanizeTime = humanizeTime(myevents[i].Event.StartTime);
-        myevents[i].Event.MonitorName = NVRDataModel.getMonitorName(myevents[i].Event.MonitorId);
-        // 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.imageMode = NVRDataModel.getImageMode(myevents[i].Event.MonitorId);
-        // console.log ("***** MULTISERVER STREAMING URL FOR EVENTS " + myevents[i].Event.streamingURL);
-
-        //  console.log ("***** MULTISERVER BASE URL FOR EVENTS " + myevents[i].Event.baseURL);
-
-        myevents[i].Event.ShowScrub = false;
-        myevents[i].Event.BasePath = computeBasePath(myevents[i]);
-        myevents[i].Event.relativePath = computeRelativePath(myevents[i]);
-        */
+       
     }
 
     function getTextZoomCallback(tz)
@@ -948,7 +931,7 @@ angular.module('zmApp.controllers')
         {
             template: $translate.instant('kPleaseWait') + "...",
             noBackdrop: true,
-            //duration: 10000
+            duration: 20000
         });
 
         prepareImages(e)
@@ -961,10 +944,10 @@ angular.module('zmApp.controllers')
                     var ad = adjustAspect(e);
                     console.log("SAVING W=" + ad.w + " H=" + ad.h);
 
-                    //AnimatedGIF.setRepeat(null);
+                   
                     gifshot.createGIF(
                     {
-                        //'images': ['http://i.imgur.com/2OO33vX.jpg', 'http://i.imgur.com/qOwVaSN.png', 'http://i.imgur.com/Vo5mFZJ.gif'],
+                       
                         'gifWidth': ad.w,
                         'gifHeight': ad.h,
                         'images': imgs,
@@ -977,7 +960,7 @@ angular.module('zmApp.controllers')
                         'progressCallback': function (cp)
                         {
                             var p = Math.round(cp * 100);
-                            $ionicLoading.show({template: $translate.instant('kPleaseWait') + "...("+p+"%)",noBackdrop: true});}
+                            $ionicLoading.show({template: $translate.instant('kPleaseWait') + "...("+p+"%)",noBackdrop: true });}
                     }, function(obj)
                     {
                         if (!obj.error)
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 70943e49..7a66a506 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -163,7 +163,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
         // we need this timeout to avoid load interrupting
         // play -- I suppose its an angular digest foo thing
-        
+        console.log ("*********** ON PLAY READY");
         handle = api;
 
         $ionicLoading.show(
@@ -174,16 +174,18 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         NVRDataModel.debug("Player is ready");
         $timeout(function()
         {
-            handle.setPlayback(2);
-            handle.play();
+                handle.pause();
+                handle.setPlayback(2);
+                handle.play();
 
-        }, 400);
+        }, 300);
 
         // window.stop();
     };
 
     $scope.onCanPlay = function()
     {
+        console.log ("*********** CAN PLAY");
         $ionicLoading.hide();
         NVRDataModel.debug("This video can be played");
         $scope.videoObject.config.cuepoints.points = [];