diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-13 13:27:13 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-13 13:27:13 -0400 |
| commit | 8df1ebe49967ed96b85076bf4dbfbf761fb5268d (patch) | |
| tree | d13e5447fa0551a6f6ced8fb09ae6cad3786c0e9 /MediaBrowser.Controller | |
| parent | b6ca79b73fdae969773935068c175ace43ac778d (diff) | |
add new mirror mode
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 5 insertions, 30 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 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<string, string> 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 @@ -36,14 +36,6 @@ namespace MediaBrowser.Controller.Session Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken); /// <summary> - /// Sends the browse command. - /// </summary> - /// <param name="command">The command.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>Task.</returns> - Task SendBrowseCommand(BrowseRequest command, CancellationToken cancellationToken); - - /// <summary> /// Sends the playstate command. /// </summary> /// <param name="command">The command.</param> |
