From fbf5f855091f8e81125000eb97ff56b6fb6b704e Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
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 @@
 <?php if($this->type == "au") : ?>
-<div><span>Title:</span><span><?php echo ($this->md["dc:title"]);?></span></div>
-<div><span>Artist:</span><span><?php echo ($this->md["dc:creator"]);?></span></div>
-<div><span>Album:</span><span><?php echo ($this->md["dc:source"]);?></span></div>
-<div><span>Track:</span><span><?php echo ($this->md["ls:track_num"]);?></span></div>
-<div><span>Length:</span><span><?php echo ($this->md["dcterms:extent"]);?></span></div>
-<div><span>Genre:</span><span><?php echo ($this->md["dc:type"]);?></span></div>
-<div><span>Sample Rate:</span><span><?php echo ($this->md["ls:samplerate"]);?></span></div>
-<div><span>Bit Rate:</span><span><?php echo ($this->md["ls:bitrate"]);?></span></div>
-<div><span>Channels:</span><span><?php echo ($this->md["ls:channels"]);?></span></div>
+<div><span>Title:</span><span><?php echo ($this->md["MDATA_KEY_TITLE"]);?></span></div>
+<div><span>Artist:</span><span><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></span></div>
+<div><span>Album:</span><span><?php echo ($this->md["MDATA_KEY_SOURCE"]);?></span></div>
+<div><span>Track:</span><span><?php echo ($this->md["MDATA_KEY_TRACKNUMBER"]);?></span></div>
+<div><span>Length:</span><span><?php echo ($this->md["MDATA_KEY_DURATION"]);?></span></div>
+<div><span>Sample Rate:</span><span><?php echo ($this->md["MDATA_KEY_SAMPLERATE"]);?></span></div>
+<div><span>Bit Rate:</span><span><?php echo ($this->md["MDATA_KEY_BITRATE"]);?></span></div>
+<div><span>Mood:</span><span><?php echo ($this->md["MDATA_KEY_MOOD"]);?></span></div>
+<div><span>Genre:</span><span><?php echo ($this->md["MDATA_KEY_GENRE"]);?></span></div>
+<div><span>Year:</span><span><?php echo ($this->md["MDATA_KEY_YEAR"]);?></span></div>
+<div><span>Label:</span><span><?php echo ($this->md["MDATA_KEY_LABEL"]);?></span></div>
+<div><span>BPM:</span><span><?php echo ($this->md["MDATA_KEY_BPM"]);?></span></div>
+<div><span>Conductor:</span><span><?php echo ($this->md["MDATA_KEY_CONDUCTOR"]);?></span></div>
+<div><span>Copyright:</span><span><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></span></div>
+<div><span>Isrc Number:</span><span><?php echo ($this->md["MDATA_KEY_ISRC"]);?></span></div>
+<div><span>Website:</span><span><?php echo ($this->md["MDATA_KEY_URL"]);?></span></div>
 
-<div><span>Year:</span><span><?php echo ($this->md["ls:year"]);?></span></div>
-<div><span>Label:</span><span><?php echo ($this->md["dc:publisher"]);?></span></div>
-<div><span>BPM:</span><span><?php echo ($this->md["ls:bpm"]);?></span></div>
-<div><span>Channels:</span><span><?php echo ($this->md["ls:channels"]);?></span></div>
-<div><span>Orchestra:</span><span><?php echo ($this->md["ls:orchestra"]);?></span></div>
-<div><span>Conductor:</span><span><?php echo ($this->md["ls:conductor"]);?></span></div>
-<div><span>Copyright:</span><span><?php echo ($this->md["dc:rights"]);?></span></div>
-<div><span>Catalog Number:</span><span><?php echo ($this->md["ls:catalognumber"]);?></span></div>
-<div><span>Isrc Number:</span><span><?php echo ($this->md["ls:isrcnumber"]);?></span></div>
-
-<div><span>Report Datetime:</span><span><?php echo ($this->md["dcterms:temporal"]);?></span></div>
-<div><span>Report Location:</span><span><?php echo ($this->md["dcterms:spatial"]);?></span></div>
-<div><span>Report Organization:</span><span><?php echo ($this->md["dcterms:entity"]);?></span></div>
-<div><span>Subject:</span><span><?php echo ($this->md["dc:subject"]);?></span></div>
-<div><span>Contributor:</span><span><?php echo ($this->md["dc:contributor"]);?></span></div>
-
-<div><span>Language:</span><span><?php echo ($this->md["dc:language"]);?></span></div>
-<div><span>Comments:</span><span><?php echo ($this->md["dc:description"]);?></span></div>
 <?php endif; ?>
 
 <?php if($this->type == "pl") : ?>