diff options
| author | tikuf <admin@nyalindee.com> | 2014-04-16 10:14:20 +1000 |
|---|---|---|
| committer | tikuf <admin@nyalindee.com> | 2014-04-16 10:14:20 +1000 |
| commit | 13196544c2ca525068e34d23bd98da551943bbca (patch) | |
| tree | ad9894c55a3f3078c15b7622f424b950524b4e2b /MediaBrowser.Controller/Entities | |
| parent | f9eede391b2de2ce80e75d8345aade14f70f1b9d (diff) | |
| parent | ab5f8ed13679dbe1763cafc599a8f566a36a4a14 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/Audio.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs index 8eb6236d1..0ca1ffde0 100644 --- a/MediaBrowser.Controller/Entities/Audio/Audio.cs +++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs @@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Entities.Audio /// <summary> /// Class Audio /// </summary> - public class Audio : BaseItem, IHasMediaStreams, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo<SongInfo>, IHasSeries + public class Audio : BaseItem, IHasMediaStreams, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo<SongInfo> { public Audio() { @@ -51,15 +51,6 @@ namespace MediaBrowser.Controller.Entities.Audio } } - [IgnoreDataMember] - public string SeriesName - { - get - { - return Album; - } - } - /// <summary> /// Gets or sets the artist. /// </summary> diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index cce241542..277ec8b78 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Entities.Audio /// <summary> /// Class MusicAlbum /// </summary> - public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasTags, IHasLookupInfo<AlbumInfo>, IHasSeries + public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasTags, IHasLookupInfo<AlbumInfo> { public List<Guid> SoundtrackIds { get; set; } @@ -67,15 +67,6 @@ namespace MediaBrowser.Controller.Entities.Audio } } - [IgnoreDataMember] - public string SeriesName - { - get - { - return AlbumArtist; - } - } - /// <summary> /// Override this to true if class should be grouped under a container in indicies /// The container class should be defined via IndexContainer |