diff options
| author | gion <oancaionutandrei@gmail.com> | 2020-05-15 18:59:35 +0200 |
|---|---|---|
| committer | gion <oancaionutandrei@gmail.com> | 2020-05-15 18:59:35 +0200 |
| commit | 029bb80910688cb4a0278dec949926efd5602258 (patch) | |
| tree | d835ed8a4f6ee890c7da39f3aced53b995b77f33 /Emby.Server.Implementations/Library/MediaStreamSelector.cs | |
| parent | e8f45248aab753797ee9b2e3d8d58c2a243fc598 (diff) | |
| parent | 18953d95e6692290bf56547d4c9614790687654c (diff) | |
Merge remote-tracking branch 'upstream/master' into syncplay
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) |