Merge pull request #2647 from MediaBrowser/dev

Dev

2 files changed, 4 insertions, 22 deletions

diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 9384446eb..d44659705 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -346,7 +346,9 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the studios.
         /// </summary>
         /// <value>The studios.</value>
-        public StudioDto[] Studios { get; set; }
+        public NameIdPair[] Studios { get; set; }
+
+        public NameIdPair[] GenreItems { get; set; }
 
         /// <summary>
         /// If the item does not have a logo, this will hold the Id of the Parent that has one.
diff --git a/MediaBrowser.Model/Dto/StudioDto.cs b/MediaBrowser.Model/Dto/StudioDto.cs
index 13623fb1a..10dc60699 100644
--- a/MediaBrowser.Model/Dto/StudioDto.cs
+++ b/MediaBrowser.Model/Dto/StudioDto.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel;
-using System.Diagnostics;
-using MediaBrowser.Model.Serialization;
+using System.Diagnostics;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -27,23 +25,5 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The primary image tag.</value>
         public string PrimaryImageTag { get; set; }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance has primary image.
-        /// </summary>
-        /// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
-        [IgnoreDataMember]
-        public bool HasPrimaryImage
-        {
-            get
-            {
-                return PrimaryImageTag != null;
-            }
-        }
-
-        /// <summary>
-        /// Occurs when [property changed].
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
     }
 }
\ No newline at end of file