lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update now playing screen

Browse Source
This commit is contained in:
Luke Pulverenti 2017-01-24 00:52:47 -05:00
parent 7c3ec71d6f
commit 2ebcbdece8
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Emby.Server.Implementations/Library/MusicManager.cs
View File

@ -105,11 +105,10 @@ namespace Emby.Server.Implementations.Library
return inputItems
.Cast<Audio>()
.Select(i => new Tuple<Audio, int>(i, i.Genres.Count(genresDictionary.ContainsKey)))
.Where(i => i.Item2 > 0)
.OrderByDescending(i => i.Item2)
.ThenBy(i => Guid.NewGuid())
.Select(i => i.Item1)
.Take(100)
.Take(200)
.OrderBy(i => Guid.NewGuid());
}

9
MediaBrowser.Api/UserLibrary/UserLibraryService.cs
View File

@ -404,13 +404,6 @@ namespace MediaBrowser.Api.UserLibrary
/// <param name="request">The request.</param>
/// <returns>System.Object.</returns>
public object Get(GetLocalTrailers request)
{
var result = GetAsync(request);
return ToOptimizedSerializedResultUsingCache(result);
}
private List<BaseItemDto> GetAsync(GetLocalTrailers request)
{
var user = _userManager.GetUserById(request.UserId);
@ -430,7 +423,7 @@ namespace MediaBrowser.Api.UserLibrary
.Select(_libraryManager.GetItemById)
.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item));
return dtos.ToList();
return ToOptimizedSerializedResultUsingCache(dtos);
}
/// <summary>

2
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -47,6 +47,8 @@ namespace MediaBrowser.MediaEncoding.Probing
info.MediaStreams = internalStreams.Select(s => GetMediaStream(isAudio, s, data.format))
.Where(i => i != null)
// Drop subtitle streams if we don't know the codec because it will just cause failures if we don't know how to handle them
.Where(i => i.Type != MediaStreamType.Subtitle || !string.IsNullOrWhiteSpace(i.Codec))
.ToList();
if (data.format != null)