Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-5216: Library length does not consider cue points

This commit is contained in:
denise 2013-06-07 14:19:46 -04:00
parent ede618b3ad
commit 3b353b47b1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/models/Scheduler.php
View File

@ -194,14 +194,13 @@ class Application_Model_Scheduler
if ($type === "audioclip") { if ($type === "audioclip") {
$file = CcFilesQuery::create()->findPK($id, $this->con); $file = CcFilesQuery::create()->findPK($id, $this->con);
$storedFile = new Application_Model_StoredFile($file, $this->con);
if (is_null($file) || !$file->visible()) { if (is_null($file) || !$file->visible()) {
throw new Exception(_("A selected File does not exist!")); throw new Exception(_("A selected File does not exist!"));
} else { } else {
$data = $this->fileInfo; $data = $this->fileInfo;
$data["id"] = $id; $data["id"] = $id;
$data["cliplength"] = $storedFile->getRealClipLength( $data["cliplength"] = Application_Model_StoredFile::getRealClipLength(
$file->getDbCuein(), $file->getDbCuein(),
$file->getDbCueout()); $file->getDbCueout());

5
airtime_mvc/application/models/StoredFile.php
View File

@ -778,7 +778,8 @@ SQL;
foreach ($results['aaData'] as &$row) { foreach ($results['aaData'] as &$row) {
$row['id'] = intval($row['id']); $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(); $row['length'] = $len_formatter->format();
$cuein_formatter = new LengthFormatter($row["cuein"]); $cuein_formatter = new LengthFormatter($row["cuein"]);
@ -1347,7 +1348,7 @@ SQL;
Application_Common_Database::EXECUTE); 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"; $sql = "SELECT :cueout::INTERVAL - :cuein::INTERVAL";
return Application_Common_Database::prepareAndExecute($sql, array( return Application_Common_Database::prepareAndExecute($sql, array(