alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 17:14:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into warn12

Browse Source
This commit is contained in:
Bond_009
2020-01-10 21:18:16 +01:00
parent 7f5a174dff 162c1ac7b7
commit bb236b9591
156 changed files with 2310 additions and 7588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -1097,6 +1097,7 @@ namespace MediaBrowser.Controller.Entities
Id = item.Id.ToString("N", CultureInfo.InvariantCulture),
Protocol = protocol ?? MediaProtocol.File,
MediaStreams = MediaSourceManager.GetMediaStreams(item.Id),
MediaAttachments = MediaSourceManager.GetMediaAttachments(item.Id),
Name = GetMediaSourceName(item),
Path = enablePathSubstitution ? GetMappedPath(item, item.Path, protocol) : item.Path,
RunTimeTicks = item.RunTimeTicks,