From ddfa531e00dfaf04da17cad391bd652a11e5af70 Mon Sep 17 00:00:00 2001
From: PliablePixels <pliablepixels@gmail.com>
Date: Sun, 26 Jul 2015 20:18:21 -0400
Subject: made sure auto play of events matches FPS of  event

---
 www/js/EventCtrl.js             | 9 +++++++++
 www/templates/events-modal.html | 3 ++-
 www/templates/events.html       | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'www')

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 93fdba0e..2371983d 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -160,6 +160,15 @@ angular.module('zmApp.controllers')
         // not explictly handling error --> I have a default "No events found" message
         // displayed in the template if events list is null
 
+        $scope.calcMsTimer = function(frames,len)
+        {
+            var myframes, mylen;
+             myframes = parseFloat(frames);
+             mylen = parseFloat(len);
+          //  console.log ("frames " + myframes + "length " + mylen);
+          //  console.log ("*** MS COUNT " + (1000.0/(myframes/mylen)));
+            return (Math.round(1000/(myframes/mylen)));
+        };
 
         $scope.openMenu = function () {
             $ionicSideMenuDelegate.toggleLeft();
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index cf333eb8..60f49707 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -1,6 +1,7 @@
 <div ng-controller="ModalCtrl">
     <ion-modal-view cache="false">
         <ion-content style="background-color:#444444"  ng-cloak>
+
             <ion-scroll has-bouncing=false min-zoom=1 zooming="true"
                         direction="xy" style="width: 100%; ">
                 <div style="height: 100vh;">
@@ -8,7 +9,7 @@
                      <ul rn-carousel  rn-carousel-buffered
                     rn-carousel-transition="none" rn-swipe-disabled="true"
                     rn-carousel-index="mycarousel.index"
-                    rn-carousel-auto-slide="0.3" rn-carousel-pause-on-hover >
+                    rn-carousel-auto-slide="{{calcMsTimer(eFramesNum, eventDur)/1000.0}}" rn-carousel-pause-on-hover >
 
                     <li ng-repeat="slide in slides">
 
diff --git a/www/templates/events.html b/www/templates/events.html
index 12e9f220..547305ec 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -101,6 +101,7 @@
 
                     <!-- this is the event scrub area -->
                     <div ng-if = "isGroupShown(event)">
+
                         <br/>
                         <br/>
                         <br/>
@@ -130,7 +131,7 @@
                             <ul rn-carousel  rn-carousel-buffered
                                 rn-carousel-transition="none" rn-swipe-disabled="true"
                                 rn-carousel-index="mycarousel.index"
-                                rn-carousel-auto-slide="0.3" rn-carousel-pause-on-hover >
+                                rn-carousel-auto-slide="{{calcMsTimer(event.Event.Frames, event.Event.Length)/1000.0}}" rn-carousel-pause-on-hover >
                                 <li ng-repeat="slide in slides">
                                         <img imageonload="finishedLoadingImage($index)"
                                          image-spinner-src="{{event.Event.BasePath}}{{slide.img}}?rand={{rand}}"
-- 
cgit v1.2.3