diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs | 21 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/MusicArtist.cs | 20 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 2 |
3 files changed, 2 insertions, 41 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index 485afcaef9..1526cf46a5 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -1,5 +1,4 @@ using MediaBrowser.Model.Entities; -using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; @@ -55,26 +54,6 @@ namespace MediaBrowser.Controller.Entities.Audio } /// <summary> - /// Override to point to first child (song) - /// </summary> - /// <value>The genres.</value> - public override List<string> Genres - { - get - { - return Children - .OfType<Audio>() - .SelectMany(i => i.Genres) - .Distinct(StringComparer.OrdinalIgnoreCase) - .ToList(); - } - set - { - base.Genres = value; - } - } - - /// <summary> /// Gets or sets the images. /// </summary> /// <value>The images.</value> diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs index bf11403e57..b2fc04873f 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs @@ -1,7 +1,4 @@ -using System; -using System.Linq; -using System.Collections.Generic; - + namespace MediaBrowser.Controller.Entities.Audio { /// <summary> @@ -9,20 +6,5 @@ namespace MediaBrowser.Controller.Entities.Audio /// </summary> public class MusicArtist : Folder { - public override List<string> Genres - { - get - { - return Children - .OfType<MusicAlbum>() - .SelectMany(i => i.Genres) - .Distinct(StringComparer.OrdinalIgnoreCase) - .ToList(); - } - set - { - base.Genres = value; - } - } } } diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index d8dec46452..8aef528755 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -543,7 +543,7 @@ namespace MediaBrowser.Controller.Entities /// Gets or sets the genres. /// </summary> /// <value>The genres.</value> - public virtual List<string> Genres { get; set; } + public List<string> Genres { get; set; } /// <summary> /// Gets or sets the home page URL. |