diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-05-03 01:04:19 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-05-03 01:04:19 -0400 |
| commit | 1c06111497f0ecfa6ca374599b5641601b004077 (patch) | |
| tree | 8d83bd03b76f87f429ab82a54fd73bc029eae6f0 /Emby.Server.Implementations/Library/MediaStreamSelector.cs | |
| parent | 7e467f9faa18168ddff0607751f3929e4e3e0285 (diff) | |
| parent | 2bf3dee4c4fe56537c542bcc0c9df562552fb74d (diff) | |
Merge remote-tracking branch 'upstream/master' into integration-tests
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) |