diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Net/IHttpResultFactory.cs | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index 82cd618dd..2eeec9715 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -52,6 +52,12 @@ namespace MediaBrowser.Controller.Entities.Audio public List<string> AlbumArtists { get; set; } + [IgnoreDataMember] + public string AlbumArtist + { + get { return AlbumArtists.FirstOrDefault(); } + } + /// <summary> /// Gets the tracks. /// </summary> diff --git a/MediaBrowser.Controller/Net/IHttpResultFactory.cs b/MediaBrowser.Controller/Net/IHttpResultFactory.cs index 665c1f8d9..f0cfbbcfa 100644 --- a/MediaBrowser.Controller/Net/IHttpResultFactory.cs +++ b/MediaBrowser.Controller/Net/IHttpResultFactory.cs @@ -109,14 +109,18 @@ namespace MediaBrowser.Controller.Net /// <param name="fileShare">The file share.</param> /// <param name="responseHeaders">The response headers.</param> /// <param name="isHeadRequest">if set to <c>true</c> [is head request].</param> + /// <param name="throttle">if set to <c>true</c> [throttle].</param> + /// <param name="throttleLimit">The throttle limit.</param> /// <returns>System.Object.</returns> object GetStaticFileResult(IRequest requestContext, string path, string contentType, TimeSpan? cacheCuration = null, FileShare fileShare = FileShare.Read, - IDictionary<string, string> responseHeaders = null, - bool isHeadRequest = false); + IDictionary<string, string> responseHeaders = null, + bool isHeadRequest = false, + bool throttle = false, + long throttleLimit = 0); /// <summary> /// Gets the optimized serialized result using cache. |