Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-5190 : Playlist: Copy playlist will lost cue in/out setting

This commit is contained in:
Naomi 2013-05-30 15:36:55 -04:00
parent bc22a8a871
commit 1fa0ee49d6
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/controllers/LibraryController.php
View File

@ -393,7 +393,8 @@ class LibraryController extends Zend_Controller_Action
} }
$c[0] = $c['item_id']; $c[0] = $c['item_id'];
} }
$newPl->addAudioClips($contents, null, 'begining');
$newPl->addAudioClips($contents, null, 'before');
$newPl->setCreator(Application_Model_User::getCurrentUser()->getId()); $newPl->setCreator(Application_Model_User::getCurrentUser()->getId());
$newPl->setDescription($originalPl->getDescription()); $newPl->setDescription($originalPl->getDescription());

34
airtime_mvc/application/models/Playlist.php
View File

@ -411,26 +411,38 @@ SQL;
|| $obj instanceof CcWebstream || || $obj instanceof CcWebstream ||
$obj instanceof CcBlock) { $obj instanceof CcBlock) {
$entry = $this->plItem; $entry = $this->plItem;
$entry["id"] = $obj->getDbId(); $entry["id"] = $obj->getDbId();
$entry["pos"] = $pos; $entry["pos"] = $pos;
$entry["cliplength"] = $obj->getDbLength(); $entry["cliplength"] = $obj->getDbLength();
if ($obj instanceof CcFiles && $obj) { if ($obj instanceof CcFiles && $obj) {
$entry["cuein"] = $obj->getDbCuein();
$entry["cueout"] = $obj->getDbCueout(); $entry["cuein"] = isset($p_item['cuein']) ?
$p_item['cuein'] : $obj->getDbCuein();
$entry["cueout"] = isset($p_item['cueout']) ?
$p_item['cueout'] : $obj->getDbCueout();
$cue_out = Application_Common_DateHelper::calculateLengthInSeconds($entry['cueout']); $cue_in = isset($p_item['cueInSec']) ?
$cue_in = Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']); $p_item['cueInSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']);
$entry["cliplength"] = Application_Common_DateHelper::secondsToPlaylistTime($cue_out-$cue_in);
} elseif ($obj instanceof CcWebstream && $obj) { $cue_out = isset($p_item['cueOutSec']) ?
$p_item['cueOutSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cueout']);
$entry["cliplength"] = isset($p_item['length']) ?
$p_item['length'] : Application_Common_DateHelper::secondsToPlaylistTime($cue_out-$cue_in);
}
elseif ($obj instanceof CcWebstream && $obj) {
$entry["cuein"] = "00:00:00"; $entry["cuein"] = "00:00:00";
$entry["cueout"] = $entry["cliplength"]; $entry["cueout"] = $entry["cliplength"];
} }
$entry["ftype"] = $objType; $entry["ftype"] = $objType;
} }
return $entry; return $entry;
} else { }
else {
throw new Exception("trying to add a object that does not exist."); throw new Exception("trying to add a object that does not exist.");
} }
} }