mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
back port model changes
This commit is contained in:
parent
56c71468b5
commit
2420f24ab1
@ -17,7 +17,6 @@
|
||||
public ChapterOptions()
|
||||
{
|
||||
DownloadMovieChapters = true;
|
||||
ExtractDuringLibraryScan = true;
|
||||
|
||||
DisabledFetchers = new string[] { };
|
||||
FetcherOrder = new string[] { };
|
||||
|
@ -525,6 +525,15 @@ namespace MediaBrowser.Model.Dlna
|
||||
bool isEligibleForDirectPlay,
|
||||
bool isEligibleForDirectStream)
|
||||
{
|
||||
if (videoStream == null)
|
||||
{
|
||||
_logger.Info("Profile: {0}, Cannot direct stream with no known video stream. Path: {1}",
|
||||
profile.Name ?? "Unknown Profile",
|
||||
mediaSource.Path ?? "Unknown path");
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
// See if it can be direct played
|
||||
DirectPlayProfile directPlay = null;
|
||||
foreach (DirectPlayProfile i in profile.DirectPlayProfiles)
|
||||
|
@ -216,17 +216,6 @@ namespace MediaBrowser.Model.Dlna
|
||||
|
||||
list.Add(new NameValuePair("Level", item.VideoLevel.HasValue ? StringHelper.ToStringCultureInvariant(item.VideoLevel.Value) : string.Empty));
|
||||
|
||||
if (isDlna)
|
||||
{
|
||||
// The player may see it as separate resources due to url differences
|
||||
// And then try to request more than one at playback
|
||||
list.Add(new NameValuePair("ClientTime", string.Empty));
|
||||
}
|
||||
else
|
||||
{
|
||||
list.Add(new NameValuePair("ClientTime", item.IsDirectStream ? string.Empty : DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture)));
|
||||
}
|
||||
|
||||
list.Add(new NameValuePair("MaxRefFrames", item.MaxRefFrames.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxRefFrames.Value) : string.Empty));
|
||||
list.Add(new NameValuePair("MaxVideoBitDepth", item.MaxVideoBitDepth.HasValue ? StringHelper.ToStringCultureInvariant(item.MaxVideoBitDepth.Value) : string.Empty));
|
||||
list.Add(new NameValuePair("Profile", item.VideoProfile ?? string.Empty));
|
||||
|
@ -36,8 +36,6 @@ namespace MediaBrowser.Model.Entities
|
||||
MusicBrainzArtist = 10,
|
||||
MusicBrainzReleaseGroup = 11,
|
||||
Zap2It = 12,
|
||||
NesBox = 13,
|
||||
NesBoxRom = 14,
|
||||
TvRage = 15,
|
||||
AudioDbArtist = 16,
|
||||
AudioDbAlbum = 17,
|
||||
|
Loading…
Reference in New Issue
Block a user