diff options
| author | Bond_009 <Bond.009@outlook.com> | 2020-05-27 20:49:18 +0200 |
|---|---|---|
| committer | Bond_009 <Bond.009@outlook.com> | 2020-05-27 20:49:18 +0200 |
| commit | 7439e095e276034f05a0c9e9c7687b4a0aa1b3e5 (patch) | |
| tree | c1c0a8f64157cac9117e3a885f7308802a5a98d8 /Emby.Server.Implementations/Library/MediaStreamSelector.cs | |
| parent | 27ce10d0c13bc30fa1b08682e13bab67784b289d (diff) | |
| parent | 777c9c7bc974fafb09e6a5a6b23bd29cf8529af9 (diff) | |
Merge branch 'master' into nullable3
Diffstat (limited to 'Emby.Server.Implementations/Library/MediaStreamSelector.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/MediaStreamSelector.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs index 6b9f4d052..e27145a1d 100644 --- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs +++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs @@ -35,7 +35,8 @@ namespace Emby.Server.Implementations.Library return null; } - public static int? GetDefaultSubtitleStreamIndex(List<MediaStream> streams, + public static int? GetDefaultSubtitleStreamIndex( + List<MediaStream> streams, string[] preferredLanguages, SubtitlePlaybackMode mode, string audioTrackLanguage) @@ -115,7 +116,8 @@ namespace Emby.Server.Implementations.Library .ThenBy(i => i.Index); } - public static void SetSubtitleStreamScores(List<MediaStream> streams, + public static void SetSubtitleStreamScores( + List<MediaStream> streams, string[] preferredLanguages, SubtitlePlaybackMode mode, string audioTrackLanguage) |
