diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/ApiClient/IApiClient.cs | 30 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/DeviceProfile.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs | 7 |
3 files changed, 28 insertions, 13 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index e1c736f848..f4f45ec8e2 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -265,23 +265,26 @@ namespace MediaBrowser.Model.ApiClient /// Gets the episodes asynchronous. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetEpisodesAsync(EpisodeQuery query); + Task<ItemsResult> GetEpisodesAsync(EpisodeQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the seasons asynchronous. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetSeasonsAsync(SeasonQuery query); + Task<ItemsResult> GetSeasonsAsync(SeasonQuery query, CancellationToken cancellationToken); /// <summary> /// Queries for items /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> /// <exception cref="ArgumentNullException">query</exception> - Task<ItemsResult> GetItemsAsync(ItemQuery query); + Task<ItemsResult> GetItemsAsync(ItemQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the instant mix from song async. @@ -315,44 +318,50 @@ namespace MediaBrowser.Model.ApiClient /// Gets the similar movies async. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetSimilarMoviesAsync(SimilarItemsQuery query); + Task<ItemsResult> GetSimilarMoviesAsync(SimilarItemsQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the similar trailers async. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetSimilarTrailersAsync(SimilarItemsQuery query); + Task<ItemsResult> GetSimilarTrailersAsync(SimilarItemsQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the similar series async. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetSimilarSeriesAsync(SimilarItemsQuery query); + Task<ItemsResult> GetSimilarSeriesAsync(SimilarItemsQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the similar albums async. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetSimilarAlbumsAsync(SimilarItemsQuery query); + Task<ItemsResult> GetSimilarAlbumsAsync(SimilarItemsQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the similar games async. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetSimilarGamesAsync(SimilarItemsQuery query); + Task<ItemsResult> GetSimilarGamesAsync(SimilarItemsQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the people async. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> /// <exception cref="ArgumentNullException">userId</exception> - Task<ItemsResult> GetPeopleAsync(PersonsQuery query); + Task<ItemsResult> GetPeopleAsync(PersonsQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the artists. @@ -382,8 +391,9 @@ namespace MediaBrowser.Model.ApiClient /// Gets the next up async. /// </summary> /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetNextUpEpisodesAsync(NextUpQuery query); + Task<ItemsResult> GetNextUpEpisodesAsync(NextUpQuery query, CancellationToken cancellationToken); /// <summary> /// Gets the upcoming episodes asynchronous. diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs index 9a55068bf8..630e7fa604 100644 --- a/MediaBrowser.Model/Dlna/DeviceProfile.cs +++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs @@ -43,8 +43,8 @@ namespace MediaBrowser.Model.Dlna public string AlbumArtPn { get; set; } - public int? MaxAlbumArtWidth { get; set; } - public int? MaxAlbumArtHeight { get; set; } + public int MaxAlbumArtWidth { get; set; } + public int MaxAlbumArtHeight { get; set; } public int? MaxIconWidth { get; set; } public int? MaxIconHeight { get; set; } diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs index 9bbe52dbf5..3b4cc30acd 100644 --- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs +++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs @@ -400,6 +400,9 @@ namespace MediaBrowser.Model.Dlna { if (width.HasValue && height.HasValue) { + if ((width.Value <= 160) && (height.Value <= 160)) + return MediaFormatProfile.JPEG_SM; + if ((width.Value <= 640) && (height.Value <= 480)) return MediaFormatProfile.JPEG_SM; @@ -407,9 +410,11 @@ namespace MediaBrowser.Model.Dlna { return MediaFormatProfile.JPEG_MED; } + + return MediaFormatProfile.JPEG_LRG; } - return MediaFormatProfile.JPEG_LRG; + return MediaFormatProfile.JPEG_SM; } } } |