alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-28 03:18:27 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Improve OriginalLanguage normalization and inheritance (#16829)
Some checks failed
CodeQL / Analyze (csharp) (push) Has been cancelled
Details
Format / format-check (push) Has been cancelled
Details
Tests / run-tests (macos-latest) (push) Has been cancelled
Details
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Details
Tests / run-tests (windows-latest) (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Artifact (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Unstable Spec (push) Has been cancelled
Details
OpenAPI Publish / OpenAPI - Publish Stable Spec (push) Has been cancelled
Details
Project Automation / Project board (push) Has been cancelled
Details
Merge Conflict Labeler / Labeling (push) Has been cancelled
Details
Stale PR Check / Check PRs with merge conflicts (push) Has been cancelled
Details

Browse Source 
Improve OriginalLanguage normalization and inheritance
This commit is contained in:
Erik W
2026-05-26 21:02:43 +02:00
committed by GitHub
parent b015d2d219
commit 4af66c4e1a
6 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Emby.Server.Implementations/Library/MediaSourceManager.cs
View File

@@ -440,10 +440,6 @@ namespace Emby.Server.Implementations.Library
if (string.Equals(user.AudioLanguagePreference, "OriginalLanguage", StringComparison.OrdinalIgnoreCase))
{
originalLanguage = !string.IsNullOrWhiteSpace(originalLanguage)
? originalLanguage.Split(',').FirstOrDefault()
: null;
if (user.PlayDefaultAudioTrack)
{
source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(
@@ -498,17 +494,7 @@ namespace Emby.Server.Implementations.Library
var allowRememberingSelection = item is null || item.EnableRememberingTrackSelections;
var originalLanguage = item?.OriginalLanguage ?? item switch
{
Episode episode => episode.Series.OriginalLanguage,
Video video => video.GetOwner() switch
{
Episode ownerEpisode => ownerEpisode.OriginalLanguage ?? ownerEpisode.Series.OriginalLanguage,
BaseItem owner => owner.OriginalLanguage,
null => null
},
_ => null
};
var originalLanguage = item?.GetInheritedOriginalLanguage();
SetDefaultAudioStreamIndex(source, userData, user, allowRememberingSelection, originalLanguage);
SetDefaultSubtitleStreamIndex(source, userData, user, allowRememberingSelection);