Merge pull request #3 from jellyfin/master

nightly, big one
This commit is contained in:
Artiume
2019-12-19 20:51:45 -05:00
committed by GitHub
37 changed files with 553 additions and 357 deletions

View File

@@ -233,7 +233,6 @@ namespace MediaBrowser.Model.Configuration
LocalNetworkSubnets = Array.Empty<string>();
LocalNetworkAddresses = Array.Empty<string>();
CodecsUsed = Array.Empty<string>();
ImageExtractionTimeoutMs = 0;
PathSubstitutions = Array.Empty<PathSubstitution>();
IgnoreVirtualInterfaces = false;
EnableSimpleArtistDetection = true;

View File

@@ -1,12 +1,15 @@
using System;
using System.Collections.Generic;
namespace MediaBrowser.Model.MediaInfo
{
public class SubtitleTrackInfo
{
public SubtitleTrackEvent[] TrackEvents { get; set; }
public IReadOnlyList<SubtitleTrackEvent> TrackEvents { get; set; }
public SubtitleTrackInfo()
{
TrackEvents = new SubtitleTrackEvent[] { };
TrackEvents = Array.Empty<SubtitleTrackEvent>();
}
}
}