diff options
| author | crobibero <cody@robibe.ro> | 2020-11-06 14:46:21 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-06 14:46:21 -0700 |
| commit | 9056908bc776a4a8b3f02c294311a24a7c38a331 (patch) | |
| tree | a0b3956f02a56c27691ee9f8e9340f47d7d186ad /Jellyfin.Api/Controllers/MoviesController.cs | |
| parent | d42bb515ce3692abd9295008872c7f9d62b47652 (diff) | |
| parent | 4a5651e5b2fb8e483cabae4443f327f1cdf70b92 (diff) | |
Merge remote-tracking branch 'upstream/master' into video-resolver
Diffstat (limited to 'Jellyfin.Api/Controllers/MoviesController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/MoviesController.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.cs index 7fcfc749d..afb536e74 100644 --- a/Jellyfin.Api/Controllers/MoviesController.cs +++ b/Jellyfin.Api/Controllers/MoviesController.cs @@ -85,8 +85,8 @@ namespace Jellyfin.Api.Controllers IncludeItemTypes = new[] { nameof(Movie), - // typeof(Trailer).Name, - // typeof(LiveTvProgram).Name + // nameof(Trailer), + // nameof(LiveTvProgram) }, // IsMovie = true OrderBy = new[] { ItemSortBy.DatePlayed, ItemSortBy.Random }.Select(i => new ValueTuple<string, SortOrder>(i, SortOrder.Descending)).ToArray(), |