From 1fa0ee49d6584f32ec03f86a007b464c2c226217 Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Thu, 30 May 2013 15:36:55 -0400
Subject: [PATCH] CC-5190 : Playlist: Copy playlist will lost cue in/out
setting
---
.../controllers/LibraryController.php | 3 +-
airtime_mvc/application/models/Playlist.php | 34 +++++++++++++------
2 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index afa4baa7a..52660ec21 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -393,7 +393,8 @@ class LibraryController extends Zend_Controller_Action
}
$c[0] = $c['item_id'];
}
- $newPl->addAudioClips($contents, null, 'begining');
+
+ $newPl->addAudioClips($contents, null, 'before');
$newPl->setCreator(Application_Model_User::getCurrentUser()->getId());
$newPl->setDescription($originalPl->getDescription());
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 660864af5..e01484d2f 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -411,26 +411,38 @@ SQL;
|| $obj instanceof CcWebstream ||
$obj instanceof CcBlock) {
- $entry = $this->plItem;
- $entry["id"] = $obj->getDbId();
- $entry["pos"] = $pos;
+ $entry = $this->plItem;
+ $entry["id"] = $obj->getDbId();
+ $entry["pos"] = $pos;
$entry["cliplength"] = $obj->getDbLength();
+
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 = Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']);
- $entry["cliplength"] = Application_Common_DateHelper::secondsToPlaylistTime($cue_out-$cue_in);
- } elseif ($obj instanceof CcWebstream && $obj) {
+ $cue_in = isset($p_item['cueInSec']) ?
+ $p_item['cueInSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']);
+
+ $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["cueout"] = $entry["cliplength"];
}
- $entry["ftype"] = $objType;
+ $entry["ftype"] = $objType;
}
return $entry;
- } else {
+ }
+ else {
throw new Exception("trying to add a object that does not exist.");
}
}