michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7440 from 1337joe/fix-add-external-audio

Browse Source 
Match external sub/audio stream adding logic
This commit is contained in:
Claus Vium 2022-03-11 08:03:18 +01:00 committed by GitHub
commit 21ef6661d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View File

@ -594,7 +594,7 @@ namespace MediaBrowser.Providers.MediaInfo
} }
} }
video.SubtitleFiles = externalSubtitleStreams.Select(i => i.Path).ToArray(); video.SubtitleFiles = externalSubtitleStreams.Select(i => i.Path).Distinct().ToArray();
currentStreams.AddRange(externalSubtitleStreams); currentStreams.AddRange(externalSubtitleStreams);
} }
@ -615,10 +615,9 @@ namespace MediaBrowser.Providers.MediaInfo
var startIndex = currentStreams.Count == 0 ? 0 : currentStreams.Max(i => i.Index) + 1; var startIndex = currentStreams.Count == 0 ? 0 : currentStreams.Max(i => i.Index) + 1;
var externalAudioStreams = await _audioResolver.GetExternalStreamsAsync(video, startIndex, options.DirectoryService, false, cancellationToken).ConfigureAwait(false); var externalAudioStreams = await _audioResolver.GetExternalStreamsAsync(video, startIndex, options.DirectoryService, false, cancellationToken).ConfigureAwait(false);
currentStreams = currentStreams.Concat(externalAudioStreams).ToList(); video.AudioFiles = externalAudioStreams.Select(i => i.Path).Distinct().ToArray();
// Select all external audio file paths currentStreams.AddRange(externalAudioStreams);
video.AudioFiles = currentStreams.Where(i => i.Type == MediaStreamType.Audio && i.IsExternal).Select(i => i.Path).Distinct().ToArray();
} }
/// <summary> /// <summary>