From 8726b9ca952b33e8a4810f27ac6a00807df676be Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 13 Jun 2013 14:17:42 -0400
Subject: Set initial display media type at resolve time

---
 MediaBrowser.Controller/Entities/Audio/Audio.cs          | 12 ------------
 MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs     | 16 ----------------
 MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs | 16 +---------------
 3 files changed, 1 insertion(+), 43 deletions(-)

(limited to 'MediaBrowser.Controller/Entities/Audio')

diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index dd28218ceb..5ee1e8152a 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -101,17 +101,5 @@ namespace MediaBrowser.Controller.Entities.Audio
         {
             return string.Equals(Artist, name, StringComparison.OrdinalIgnoreCase) || string.Equals(AlbumArtist, name, StringComparison.OrdinalIgnoreCase);
         }
-
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return "Song";
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index f3fdbb4990..79624826ae 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -164,22 +164,6 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
-        /// <summary>
-        /// Gets or sets the display type of the media.
-        /// </summary>
-        /// <value>The display type of the media.</value>
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return "Album";
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
-
         /// <summary>
         /// Gets or sets the music brainz release group id.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs
index 9007a1bfd4..27b7337c8f 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbumDisc.cs
@@ -6,20 +6,6 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// </summary>
     public class MusicAlbumDisc : Folder
     {
-        /// <summary>
-        /// Gets or sets the display type of the media.
-        /// </summary>
-        /// <value>The display type of the media.</value>
-        public override string DisplayMediaType
-        {
-            get
-            {
-                return "Disc";
-            }
-            set
-            {
-                base.DisplayMediaType = value;
-            }
-        }
+
     }
 }
-- 
cgit v1.2.3