diff options
Diffstat (limited to 'Emby.Server.Implementations/Library')
| -rw-r--r-- | Emby.Server.Implementations/Library/MediaSourceManager.cs | 8 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Library/MediaStreamSelector.cs | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs index e9bba05839..4513cefde8 100644 --- a/Emby.Server.Implementations/Library/MediaSourceManager.cs +++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs @@ -481,13 +481,7 @@ namespace Emby.Server.Implementations.Library return []; } - var culture = _localizationManager.FindLanguageInfo(language); - if (culture is not null) - { - return culture.Name.Contains('-', StringComparison.OrdinalIgnoreCase) ? [culture.Name] : culture.ThreeLetterISOLanguageNames; - } - - return [language]; + return _localizationManager.GetMediaStreamLanguageCodes(language); } private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection) diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs index 631179ffcf..31e36af3b8 100644 --- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs +++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs @@ -46,6 +46,7 @@ namespace Emby.Server.Implementations.Library .ThenByDescending(x => x.IsDefault) .ThenByDescending(x => !x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages)) .ThenByDescending(x => x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages)) + .ThenBy(x => GetLanguageRank(x.Language, preferredLanguages)) .ThenByDescending(x => x.IsForced && IsLanguageUndefined(x.Language)) .ThenByDescending(x => x.IsForced) .ToList(); @@ -158,6 +159,13 @@ namespace Emby.Server.Implementations.Library preferredLanguages.Contains(language, StringComparison.OrdinalIgnoreCase); } + // Earlier preferences win among matches: a pt-br preference lists [pt-br, por] and must pick the pt-br track. + private static int GetLanguageRank(string language, IReadOnlyList<string> preferredLanguages) + { + var index = preferredLanguages.FindIndex(x => string.Equals(x, language, StringComparison.OrdinalIgnoreCase)); + return index == -1 ? int.MaxValue : index; + } + private static bool IsLanguageUndefined(string language) { // Check for null, empty, or known placeholders |
