From 6e0a3ffc6012742da7c9884bc58bd7c098ef9619 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 10 May 2013 15:24:43 -0400
Subject: [PATCH] CC-5102: Cross Fading: No cross fading effect

-fixed start/end calculations
---
 airtime_mvc/application/models/Scheduler.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index e3f263360..fc3aabb01 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -438,15 +438,12 @@ class Application_Model_Scheduler
     		->find($this->con);
     
     	foreach ($schedule as $item) {
-    
-    		$itemEndDT = $item->getDbEnds(null);
-    		
-    		$item
-    			->setDbStarts($itemStartDT)
-    			->setDbEnds($itemEndDT);
-    
-    		$itemStartDT = $this->findTimeDifference($itemEndDT, $this->crossfadeDuration);
     		$itemEndDT = $this->findEndTime($itemStartDT, $item->getDbClipLength());
+
+    		$item->setDbStarts($itemStartDT)
+    			 ->setDbEnds($itemEndDT);
+
+    		$itemStartDT = $this->findTimeDifference($itemEndDT, $this->crossfadeDuration);
     	}
     
     	$schedule->save($this->con);