alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-26 02:27:06 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

add error handling to dlna channel support

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-31 20:37:06 -04:00
parent a37a11c486
commit 3fa2a001c7
46 changed files with 1689 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MediaBrowser.Model/ApiClient/IApiClient.cs
View File

@@ -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.

4
MediaBrowser.Model/Dlna/DeviceProfile.cs
View File

@@ -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; }

7
MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
View File

@@ -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;
}
}
}