From fbf5f855091f8e81125000eb97ff56b6fb6b704e Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Fri, 24 Jun 2011 10:40:31 +0200 Subject: [PATCH] CC-2423 Undefined property in StoredFile::$md uses the new file metadata access now. --- .../controllers/LibraryController.php | 2 +- .../library/get-file-meta-data.ajax.phtml | 43 +++++++------------ 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 5219e8567..fc9b472f8 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -185,7 +185,7 @@ class LibraryController extends Zend_Controller_Action if($type == "au") { $file = StoredFile::Recall($id); $this->view->type = $type; - $this->view->md = $file->md; + $this->view->md = $file->getMetadata(); } else if($type == "pl") { $file = Playlist::Recall($id); diff --git a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml index 97aeba58a..2e0bd3864 100644 --- a/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml +++ b/airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml @@ -1,32 +1,21 @@ type == "au") : ?> -
Title:md["dc:title"]);?>
-
Artist:md["dc:creator"]);?>
-
Album:md["dc:source"]);?>
-
Track:md["ls:track_num"]);?>
-
Length:md["dcterms:extent"]);?>
-
Genre:md["dc:type"]);?>
-
Sample Rate:md["ls:samplerate"]);?>
-
Bit Rate:md["ls:bitrate"]);?>
-
Channels:md["ls:channels"]);?>
+
Title:md["MDATA_KEY_TITLE"]);?>
+
Artist:md["MDATA_KEY_CREATOR"]);?>
+
Album:md["MDATA_KEY_SOURCE"]);?>
+
Track:md["MDATA_KEY_TRACKNUMBER"]);?>
+
Length:md["MDATA_KEY_DURATION"]);?>
+
Sample Rate:md["MDATA_KEY_SAMPLERATE"]);?>
+
Bit Rate:md["MDATA_KEY_BITRATE"]);?>
+
Mood:md["MDATA_KEY_MOOD"]);?>
+
Genre:md["MDATA_KEY_GENRE"]);?>
+
Year:md["MDATA_KEY_YEAR"]);?>
+
Label:md["MDATA_KEY_LABEL"]);?>
+
BPM:md["MDATA_KEY_BPM"]);?>
+
Conductor:md["MDATA_KEY_CONDUCTOR"]);?>
+
Copyright:md["MDATA_KEY_COPYRIGHT"]);?>
+
Isrc Number:md["MDATA_KEY_ISRC"]);?>
+
Website:md["MDATA_KEY_URL"]);?>
-
Year:md["ls:year"]);?>
-
Label:md["dc:publisher"]);?>
-
BPM:md["ls:bpm"]);?>
-
Channels:md["ls:channels"]);?>
-
Orchestra:md["ls:orchestra"]);?>
-
Conductor:md["ls:conductor"]);?>
-
Copyright:md["dc:rights"]);?>
-
Catalog Number:md["ls:catalognumber"]);?>
-
Isrc Number:md["ls:isrcnumber"]);?>
- -
Report Datetime:md["dcterms:temporal"]);?>
-
Report Location:md["dcterms:spatial"]);?>
-
Report Organization:md["dcterms:entity"]);?>
-
Subject:md["dc:subject"]);?>
-
Contributor:md["dc:contributor"]);?>
- -
Language:md["dc:language"]);?>
-
Comments:md["dc:description"]);?>
type == "pl") : ?>