github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 14:08:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix default audio selection ignoring type

Browse source
This commit is contained in:
Joe Rogers 2022-05-17 21:03:51 +02:00
parent 052a59ac3e
commit 5d66c84f2d
No known key found for this signature in database
GPG key ID: 0074AD57B8FDBBB4
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Emby.Server.Implementations/Library/MediaStreamSelector.cs
View file

@ -13,11 +13,11 @@ namespace Emby.Server.Implementations.Library
{
public static int? GetDefaultAudioStreamIndex(IReadOnlyList<MediaStream> streams, IReadOnlyList<string> preferredLanguages, bool preferDefaultTrack)
{
var sortedStreams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages);
var sortedStreams = GetSortedStreams(streams, MediaStreamType.Audio, preferredLanguages).ToList();
if (preferDefaultTrack)
{
var defaultStream = streams.FirstOrDefault(i => i.IsDefault);
var defaultStream = sortedStreams.FirstOrDefault(i => i.IsDefault);
if (defaultStream != null)
{

8
tests/Jellyfin.Server.Implementations.Tests/Library/MediaStreamSelectorTests.cs
View file

@ -27,15 +27,23 @@ public class MediaStreamSelectorTests
{
var streams = new MediaStream[]
{
new()
{
Index = 0,
Type = MediaStreamType.Video,
IsDefault = true
},
new()
{
Index = 1,
Type = MediaStreamType.Audio,
Language = "fre",
IsDefault = true
},
new()
{
Index = 2,
Type = MediaStreamType.Audio,
Language = "eng",
IsDefault = false
}