From 1c9b134748caea699f882cb3f5a26966d583828a Mon Sep 17 00:00:00 2001 From: Yuchen Wang Date: Wed, 4 Jan 2012 17:10:14 -0500 Subject: [PATCH] CC-3183: recorder shows have extra 1ms which cause the now playing to report the show exceeding its time Done --- airtime_mvc/application/models/Nowplaying.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/Nowplaying.php b/airtime_mvc/application/models/Nowplaying.php index b59bb4e6a..95037cb00 100644 --- a/airtime_mvc/application/models/Nowplaying.php +++ b/airtime_mvc/application/models/Nowplaying.php @@ -23,8 +23,9 @@ class Application_Model_Nowplaying $showEnds = $showEndDateTime->format("Y-m-d H:i:s"); $itemStarts = $itemStartDateTime->format("Y-m-d H:i:s"); $itemEnds = $itemEndDateTime->format("Y-m-d H:i:s"); - - $status = ($dbRow['show_ends'] < $dbRow['item_ends']) ? "x" : ""; + + // Allow show to exceed 1 second per CC-3183 + $status = ($showEnds < $itemEnds) ? "x" : ""; $type = "a"; $type .= ($itemEndDateTime->getTimestamp() > $epochNow && $itemStartDateTime->getTimestamp() <= $epochNow) ? "c" : "";