Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc

This commit is contained in:
Claus Vium
2019-03-07 20:16:51 +01:00
94 changed files with 1778 additions and 1249 deletions

View File

@@ -1090,7 +1090,7 @@ namespace Emby.Server.Implementations.Session
await SendMessageToSession(session, "Play", command, cancellationToken).ConfigureAwait(false);
}
private IList<BaseItem> TranslateItemForPlayback(Guid id, User user)
private IEnumerable<BaseItem> TranslateItemForPlayback(Guid id, User user)
{
var item = _libraryManager.GetItemById(id);