Merge branch 'devel' into 2.3.x-saas

2013-01-18 14:45:55 -05:00 · 2013-01-18 14:45:55 -05:00 · c1941fea2b
parent 4d57233170 5ab43c7c72
commit c1941fea2b
1 changed files with 6 additions and 0 deletions
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@ -448,6 +448,12 @@ class Application_Model_Scheduler
                    } else {
                        $sched = new CcSchedule();
                    }
+
+                    // default fades are in seconds
+                    // we need to convert to '00:00:00' format
+                    $file['fadein'] = Application_Common_DateHelper::secondsToPlaylistTime($file['fadein']);
+                    $file['fadeout'] = Application_Common_DateHelper::secondsToPlaylistTime($file['fadeout']);
+                    
                    $sched->setDbStarts($nextStartDT)
                        ->setDbEnds($endTimeDT)
                        ->setDbCueIn($file['cuein'])