From 3a72302a3ca7f38e9f1562f9297a449d658541f4 Mon Sep 17 00:00:00 2001 From: james Date: Wed, 9 Jan 2013 22:19:39 -0500 Subject: [PATCH 1/2] CC-4819: Tracks length in Scheduler is 0.0 all the time - fixed --- airtime_mvc/application/models/ShowBuilder.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index a04bb4c8a..1b339b501 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -269,7 +269,12 @@ class Application_Model_ShowBuilder $cue_out = Application_Common_DateHelper::calculateLengthInSeconds($p_item['cue_out']); $cue_in = Application_Common_DateHelper::calculateLengthInSeconds($p_item['cue_in']); - $run_time = $cue_out-$cue_in; + + if ($cue_out == 0 && $cue_in == 0) { + $run_time = Application_Common_DateHelper::calculateLengthInSeconds($p_item['file_length']); + } else { + $run_time = $cue_out-$cue_in; + } $formatter = new LengthFormatter(Application_Common_DateHelper::ConvertMSToHHMMSSmm($run_time*1000)); $row['runtime'] = $formatter->format(); From 594a38da162cda0cb157db6486cf4a9a126cfa06 Mon Sep 17 00:00:00 2001 From: james Date: Wed, 9 Jan 2013 22:53:29 -0500 Subject: [PATCH 2/2] CC-4770: Playlist's length doesn't counts Webstream and Smartblock in - the bug was introduced by CC-4668 - fixed --- airtime_mvc/application/models/airtime/CcPlaylist.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/airtime/CcPlaylist.php b/airtime_mvc/application/models/airtime/CcPlaylist.php index bfa1e5354..c16ad2dea 100644 --- a/airtime_mvc/application/models/airtime/CcPlaylist.php +++ b/airtime_mvc/application/models/airtime/CcPlaylist.php @@ -89,9 +89,9 @@ class CcPlaylist extends BaseCcPlaylist { { $sql = <<prepare($sql); $stmt->bindValue(':p1', $this->getDbId());