From 3b353b47b1f70353759a642c1905277fce8dea63 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Fri, 7 Jun 2013 14:19:46 -0400
Subject: [PATCH] CC-5216: Library length does not consider cue points

---
 airtime_mvc/application/models/Scheduler.php  | 3 +--
 airtime_mvc/application/models/StoredFile.php | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index 266c7dc91..c62fed647 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -194,14 +194,13 @@ class Application_Model_Scheduler
 
         if ($type === "audioclip") {
             $file = CcFilesQuery::create()->findPK($id, $this->con);
-            $storedFile = new Application_Model_StoredFile($file, $this->con);
 
             if (is_null($file) || !$file->visible()) {
                 throw new Exception(_("A selected File does not exist!"));
             } else {
                 $data = $this->fileInfo;
                 $data["id"] = $id;
-                $data["cliplength"] = $storedFile->getRealClipLength(
+                $data["cliplength"] = Application_Model_StoredFile::getRealClipLength(
                     $file->getDbCuein(),
                     $file->getDbCueout());
 
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 207b80601..0c503344c 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -778,7 +778,8 @@ SQL;
         foreach ($results['aaData'] as &$row) {
             $row['id'] = intval($row['id']);
 
-            $len_formatter = new LengthFormatter($row['length']);
+            $len_formatter = new LengthFormatter(
+                self::getRealClipLength($row["cuein"], $row["cueout"]));
             $row['length'] = $len_formatter->format();
 
             $cuein_formatter = new LengthFormatter($row["cuein"]);
@@ -1347,7 +1348,7 @@ SQL;
             Application_Common_Database::EXECUTE);
     }
 
-    public function getRealClipLength($p_cuein, $p_cueout) {
+    public static function getRealClipLength($p_cuein, $p_cueout) {
         $sql = "SELECT :cueout::INTERVAL - :cuein::INTERVAL";
 
         return Application_Common_Database::prepareAndExecute($sql, array(