diff --git a/airtime_mvc/application/common/AutoPlaylistManager.php b/airtime_mvc/application/common/AutoPlaylistManager.php index f71a2566e..47b0c188c 100644 --- a/airtime_mvc/application/common/AutoPlaylistManager.php +++ b/airtime_mvc/application/common/AutoPlaylistManager.php @@ -46,7 +46,17 @@ class AutoPlaylistManager { while(!$full) { $si = new Application_Model_ShowInstance($autoplaylist->getDbId()); $ps = $si->getPercentScheduled(); - //Logging::info("The total percent scheduled is % $ps"); + if ($introplaylistid != null) { + sleep(20); + Logging::info('adding intro'); + $si->addPlaylistToShowStart($introplaylistid, false); + } + if ($outroplaylistid != null) { + sleep(20); + Logging::info('adding outro'); + $si->addPlaylistToShow($outroplaylistid, false); + //Logging::info("The total percent scheduled is % $ps"); + } if ($ps > 100) { $full = true; } @@ -56,9 +66,13 @@ class AutoPlaylistManager { else { $si->addPlaylistToShow($playlistid, false); if ($introplaylistid != null) { + sleep(20); + Logging::info('adding intro'); $si->addPlaylistToShowStart($introplaylistid, false); } if ($outroplaylistid != null) { + sleep(20); + Logging::info('adding outro'); $si->addPlaylistToShow($outroplaylistid, false); } } diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 7ec84ddef..aece2a7fa 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -5,6 +5,7 @@ class LibraryController extends Zend_Controller_Action public function init() { + Logging::info('debugging wtf'); $ajaxContext = $this->_helper->getHelper('AjaxContext'); $ajaxContext->addActionContext('contents-feed', 'json') ->addActionContext('delete', 'json') diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index a98505014..a7cc40618 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1644,7 +1644,6 @@ SQL; // construct limit restriction $limits = array(); - if (isset($storedCrit['limit'])) { if ($storedCrit['limit']['modifier'] == "items") { $limits['time'] = 1440 * 60; diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index ef031554f..317c7c284 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -214,7 +214,6 @@ final class Application_Model_Scheduler private function retrieveMediaFiles($id, $type, $show) { $files = array(); - if ($type === "audioclip") { $file = CcFilesQuery::create()->findPK($id, $this->con);