Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Initial proof of concept for time remaining smart block limit

Browse source
This commit is contained in:
Robbt 2018-11-24 17:08:39 -05:00
parent 6031d95351
commit c759f8b8aa
4 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/models/Scheduler.php
View file

@ -207,10 +207,11 @@ final class Application_Model_Scheduler
/*
* @param $id
* @param $type
* @param $show
*
* @return $files
*/
private function retrieveMediaFiles($id, $type)
private function retrieveMediaFiles($id, $type, $show)
{
$files = array();
@ -337,7 +338,7 @@ final class Application_Model_Scheduler
} else {
$defaultFadeIn = Application_Model_Preference::GetDefaultFadeIn();
$defaultFadeOut = Application_Model_Preference::GetDefaultFadeOut();
$dynamicFiles = $bl->getListOfFilesUnderLimit();
$dynamicFiles = $bl->getListOfFilesUnderLimit($show);
foreach ($dynamicFiles as $f) {
$fileId = $f['id'];
$file = CcFilesQuery::create()->findPk($fileId);
@ -788,11 +789,14 @@ final class Application_Model_Scheduler
Logging::debug(floatval($pend) - floatval($pstart));
}
// passing $schedule["instance"] so that the instance being scheduled
// can be used to determine the remaining time
// in the case of a fill remaining time smart block
if (is_null($filesToInsert)) {
$filesToInsert = array();
foreach ($mediaItems as $media) {
$filesToInsert = array_merge($filesToInsert,
$this->retrieveMediaFiles($media["id"], $media["type"]));
$this->retrieveMediaFiles($media["id"], $media["type"], $schedule["instance"]));
}
}