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

Match external sub/audio stream adding logic
pull/7444/head
Claus Vium 2 years ago committed by GitHub
commit 21ef6661d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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>

Loading…
Cancel
Save