From 35cbeffd4a687a4770e9b41bd77c1cd91e91986e Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 16 Jun 2011 12:39:17 +0200 Subject: [PATCH] CC-1799 Put Airtime Storage into a Human Readable File Naming Convention fixing a couple playlist things to work with the new storedfile class. --- airtime_mvc/application/controllers/PlaylistController.php | 6 +++--- airtime_mvc/application/models/Playlist.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index a3ece83ab..ec2cc345b 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -113,8 +113,8 @@ class PlaylistController extends Zend_Controller_Action $this->changePlaylist($pl_id); $pl = $this->getPlaylist(); - $title = $pl->getPLMetaData(UI_MDATA_KEY_TITLE); - $desc = $pl->getPLMetaData(UI_MDATA_KEY_DESCRIPTION); + $title = $pl->getPLMetaData("dc:title"); + $desc = $pl->getPLMetaData("dc:description"); $data = array( 'title' => $title, 'description' => $desc); $form->populate($data); @@ -130,7 +130,7 @@ class PlaylistController extends Zend_Controller_Action $pl->setName($title); if(isset($description)) { - $pl->setPLMetaData(UI_MDATA_KEY_DESCRIPTION, $description); + $pl->setPLMetaData("dc:description", $description); } $this->view->pl = $pl; diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 1b7ee4e05..9613c002c 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -387,7 +387,7 @@ class Playlist { ->orderByDbPosition() ->filterByDbPlaylistId($this->id) ->find(); - + $i = 0; $offset = 0; foreach ($rows as $row) { @@ -496,7 +496,7 @@ class Playlist { } $metadata = $media->getMetadata(); - $length = $metadata["dcterms:extent"]; + $length = $metadata['MDATA_KEY_DURATION']; if (!is_null($p_clipLength)) { $length = $p_clipLength;