From 2c1fa283dad3d05c7a4f763d994514011aba9a71 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 11 Feb 2013 14:17:18 -0500 Subject: [PATCH] CC-4941: Dynamic Smart Block ignores the silan check -fixed for playlists that contain dynamic blocks --- airtime_mvc/application/models/Scheduler.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index b5047cc5d..bd6a3bb4d 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -203,9 +203,12 @@ class Application_Model_Scheduler $file = CcFilesQuery::create()->findPk($fileId); if (isset($file) && $file->visible()) { $data["id"] = $file->getDbId(); - $data["cliplength"] = $file->getDbLength(); - $data["cuein"] = "00:00:00"; - $data["cueout"] = $file->getDbLength(); + $data["cuein"] = $file->getDbCuein(); + $data["cueout"] = $file->getDbCueout(); + + $cuein = Application_Common_DateHelper::calculateLengthInSeconds($data["cuein"]); + $cueout = Application_Common_DateHelper::calculateLengthInSeconds($data["cueout"]); + $data["cliplength"] = Application_Common_DateHelper::secondsToPlaylistTime($cueout - $cuein); $defaultFade = Application_Model_Preference::GetDefaultFade(); if (isset($defaultFade)) { //fade is in format SS.uuuuuu