From 7e636a977a47f67af9bebfcbb6ebc89035ad91bd Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 28 Aug 2014 20:49:25 -0400
Subject: fixes #903 - Display image info on web client detail page

---
 MediaBrowser.Controller/Entities/Audio/Audio.cs    | 30 +++-------------------
 .../Entities/Audio/MusicAlbum.cs                   | 27 +++----------------
 MediaBrowser.Controller/Entities/Photo.cs          |  4 +--
 3 files changed, 9 insertions(+), 52 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 7d54e012c..3ffdf744d 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -34,6 +34,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         public Audio()
         {
             Artists = new List<string>();
+            AlbumArtists = new List<string>();
             Tags = new List<string>();
         }
 
@@ -90,12 +91,14 @@ namespace MediaBrowser.Controller.Entities.Audio
         /// <value>The artist.</value>
         public List<string> Artists { get; set; }
 
+        public List<string> AlbumArtists { get; set; }
+        
         [IgnoreDataMember]
         public List<string> AllArtists
         {
             get
             {
-                var list = AlbumArtists;
+                var list = AlbumArtists.ToList();
 
                 list.AddRange(Artists);
 
@@ -104,36 +107,11 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
-        [IgnoreDataMember]
-        public List<string> AlbumArtists
-        {
-            get
-            {
-                var list = new List<string>();
-
-                if (!string.IsNullOrEmpty(AlbumArtist))
-                {
-                    list.Add(AlbumArtist);
-                }
-
-                return list;
-            }
-            set
-            {
-                AlbumArtist = value.FirstOrDefault();
-            }
-        }
-
         /// <summary>
         /// Gets or sets the album.
         /// </summary>
         /// <value>The album.</value>
         public string Album { get; set; }
-        /// <summary>
-        /// Gets or sets the album artist.
-        /// </summary>
-        /// <value>The album artist.</value>
-        public string AlbumArtist { get; set; }
 
         /// <summary>
         /// Gets the type of the media.
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index 152d76782..82cd618dd 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -17,8 +17,9 @@ namespace MediaBrowser.Controller.Entities.Audio
 
         public MusicAlbum()
         {
-            Artists = new List<string>();
             SoundtrackIds = new List<Guid>();
+            Artists = new List<string>();
+            AlbumArtists = new List<string>();
         }
 
         public override bool SupportsAddingToPlaylist
@@ -40,7 +41,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             get
             {
-                var list = AlbumArtists;
+                var list = AlbumArtists.ToList();
 
                 list.AddRange(Artists);
 
@@ -49,25 +50,7 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
-        [IgnoreDataMember]
-        public List<string> AlbumArtists
-        {
-            get
-            {
-                var list = new List<string>();
-
-                if (!string.IsNullOrEmpty(AlbumArtist))
-                {
-                    list.Add(AlbumArtist);
-                }
-
-                return list;
-            }
-            set
-            {
-                AlbumArtist = value.FirstOrDefault();
-            }
-        }
+        public List<string> AlbumArtists { get; set; }
 
         /// <summary>
         /// Gets the tracks.
@@ -139,8 +122,6 @@ namespace MediaBrowser.Controller.Entities.Audio
             return AllArtists.Contains(artist, StringComparer.OrdinalIgnoreCase);
         }
 
-        public string AlbumArtist { get; set; }
-
         public List<string> Artists { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/Photo.cs b/MediaBrowser.Controller/Entities/Photo.cs
index 542fbaa31..aa9e63791 100644
--- a/MediaBrowser.Controller/Entities/Photo.cs
+++ b/MediaBrowser.Controller/Entities/Photo.cs
@@ -24,14 +24,12 @@ namespace MediaBrowser.Controller.Entities
 
         public int? Width { get; set; }
         public int? Height { get; set; }
-        public string CameraManufacturer { get; set; }
+        public string CameraMake { get; set; }
         public string CameraModel { get; set; }
         public string Software { get; set; }
         public double? ExposureTime { get; set; }
         public double? FocalLength { get; set; }
-
         public ImageOrientation? Orientation { get; set; }
-
         public double? Aperture { get; set; }
         public double? ShutterSpeed { get; set; }
     }
-- 
cgit v1.2.3