From 1884bebf159ee05b07a07c414884ef4790e62aed Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 30 Aug 2012 14:36:23 -0400 Subject: [PATCH 1/2] CC-4281: Webstream: Nothing appears in the timeline if dr... -fixed --- airtime_mvc/application/models/Scheduler.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index d82d1e8c4..b47e2ad38 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -160,6 +160,15 @@ class Application_Model_Scheduler $data["fadeout"] = $plItem['fadeout']; $data["type"] = 0; $files[] = $data; + } elseif ($plItem['type'] == 1) { + $data["id"] = $plItem['item_id']; + $data["cliplength"] = $plItem['length']; + $data["cuein"] = $plItem['cuein']; + $data["cueout"] = $plItem['cueout']; + $data["fadein"] = "00.500000";//$plItem['fadein']; + $data["fadeout"] = "00.500000";//$plItem['fadeout']; + $data["type"] = 1; + $files[] = $data; } elseif ($plItem['type'] == 2) { // if it's a block $bl = new Application_Model_Block($plItem['item_id']); From 7eefbf3e24020603ece0ed4205bf9ae335c7fe49 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 30 Aug 2012 14:36:55 -0400 Subject: [PATCH 2/2] CC-4311: On Air button gets greyed out few seconds after show starts -additional debug info --- airtime_mvc/application/controllers/ApiController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 6d2032693..76ee2b5f5 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -346,6 +346,7 @@ class ApiController extends Zend_Controller_Action $schedule_group_id = $this->_getParam("schedule_id"); $media_id = $this->_getParam("media_id"); + Logging::debug("Received notification of new media item start: $media_id"); $result = Application_Model_Schedule::UpdateMediaPlayedStatus($media_id); //set a 'last played' timestamp for media item