Merge branch '2.3.x' into devel

Conflicts: airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00 · 2013-02-02 21:07:34 -05:00 · 93ec4c001b
commit 93ec4c001b
parent 8309593a0f 71b811348b
39 changed files with 424 additions and 146 deletions
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@ -1310,6 +1310,14 @@ SQL;

        return $updateIsScheduled;
    }
+
+    public function getRealClipLength($p_cuein, $p_cueout) {
+        $sql = "SELECT :cueout::INTERVAL - :cuein::INTERVAL";
+
+        return Application_Common_Database::prepareAndExecute($sql, array(
+            ':cueout' => $p_cueout,
+            ':cuein' => $p_cuein), 'column');
+    }
 }

 class DeleteScheduledFileException extends Exception {}