From d9859ff006081d5b2ee300749cc91d6ae946f32d Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 24 Jul 2013 15:17:10 -0400 Subject: [PATCH] CC-5285: API Request: Get ON AIR light status --- airtime_mvc/application/controllers/ApiController.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index f8017eb43..5246c323b 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -221,19 +221,18 @@ class ApiController extends Zend_Controller_Action $range = Application_Model_Schedule::GetPlayOrderRange(); - $isItemCurrentlyPlaying = !is_null($range["current"]) && - $range["current"]["media_item_played"] && - count($range["currentShow"]) > 0; + $isItemCurrentlyScheduled = !is_null($range["current"]) && count($range["currentShow"]) > 0 ? true : false; - if ($isItemCurrentlyPlaying || + $isCurrentItemPlaying = !isset($range["current"]["media_item_played"]) ? true : false; + + if ($isItemCurrentlyScheduled || Application_Model_Preference::GetSourceSwitchStatus("live_dj") == "on" || Application_Model_Preference::GetSourceSwitchStatus("master_dj") == "on") { $result["on_air_light_expected_status"] = true; } - if (($isItemCurrentlyPlaying && - Application_Model_Preference::GetSourceSwitchStatus("scheduled_play") == "on")|| + if (($isItemCurrentlyScheduled && $isCurrentItemPlaying) || Application_Model_Preference::GetSourceSwitchStatus("live_dj") == "on" || Application_Model_Preference::GetSourceSwitchStatus("master_dj") == "on") {