From 8df1ebe49967ed96b85076bf4dbfbf761fb5268d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 13 Apr 2014 13:27:13 -0400 Subject: add new mirror mode --- MediaBrowser.Controller/Entities/Audio/Audio.cs | 11 +---------- MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs | 11 +---------- MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 5 +++-- MediaBrowser.Controller/Session/ISessionController.cs | 8 -------- 4 files changed, 5 insertions(+), 30 deletions(-) (limited to 'MediaBrowser.Controller') 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 /// /// Class Audio /// - public class Audio : BaseItem, IHasMediaStreams, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo, IHasSeries + public class Audio : BaseItem, IHasMediaStreams, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo { public Audio() { @@ -51,15 +51,6 @@ namespace MediaBrowser.Controller.Entities.Audio } } - [IgnoreDataMember] - public string SeriesName - { - get - { - return Album; - } - } - /// /// Gets or sets the artist. /// 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 /// /// Class MusicAlbum /// - public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasTags, IHasLookupInfo, IHasSeries + public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasTags, IHasLookupInfo { public List SoundtrackIds { get; set; } @@ -67,15 +67,6 @@ namespace MediaBrowser.Controller.Entities.Audio } } - [IgnoreDataMember] - public string SeriesName - { - get - { - return AlbumArtist; - } - } - /// /// Override this to true if class should be grouped under a container in indicies /// The container class should be defined via IndexContainer diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index 9c757503c..8ca482b11 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs @@ -103,8 +103,9 @@ namespace MediaBrowser.Controller.Resolvers ".wav", ".ape", ".ogg", - ".oga" - + ".oga", + ".asf", + ".mp4" }; private static readonly Dictionary AudioFileExtensionsDictionary = AudioFileExtensions.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); diff --git a/MediaBrowser.Controller/Session/ISessionController.cs b/MediaBrowser.Controller/Session/ISessionController.cs index 170b50bf5..d4612acb5 100644 --- a/MediaBrowser.Controller/Session/ISessionController.cs +++ b/MediaBrowser.Controller/Session/ISessionController.cs @@ -35,14 +35,6 @@ namespace MediaBrowser.Controller.Session /// Task. Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken); - /// - /// Sends the browse command. - /// - /// The command. - /// The cancellation token. - /// Task. - Task SendBrowseCommand(BrowseRequest command, CancellationToken cancellationToken); - /// /// Sends the playstate command. /// -- cgit v1.2.3