Merge branch 'master' of dev.sourcefabric.org:airtime

2013-05-10 16:08:07 -04:00 · 2013-05-10 16:08:07 -04:00 · a9d0b53954
parent 79bc927a30 ab13acba84
commit a9d0b53954
1 changed files with 5 additions and 8 deletions
--- 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);