From c95452ae8ffdbefa898b5f084e8b92aae1935d7e Mon Sep 17 00:00:00 2001 From: reven Date: Sun, 21 May 2023 13:43:34 +1200 Subject: [PATCH] fixed issue with add audio track not replacing variables in language field --- .../FfmpegBuilderNodes/Audio/FfmpegBuilderAudioAddTrack.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/VideoNodes/FfmpegBuilderNodes/Audio/FfmpegBuilderAudioAddTrack.cs b/VideoNodes/FfmpegBuilderNodes/Audio/FfmpegBuilderAudioAddTrack.cs index ad32d138..287c7894 100644 --- a/VideoNodes/FfmpegBuilderNodes/Audio/FfmpegBuilderAudioAddTrack.cs +++ b/VideoNodes/FfmpegBuilderNodes/Audio/FfmpegBuilderAudioAddTrack.cs @@ -148,9 +148,10 @@ public class FfmpegBuilderAudioAddTrack : FfmpegBuilderNode internal AudioStream GetBestAudioTrack(NodeParameters args, IEnumerable streams) { Regex? rgxLanguage = null; + string language = args.ReplaceVariables(this.Language ?? string.Empty, stripMissing: true) ?? string.Empty; try { - rgxLanguage = new Regex(this.Language, RegexOptions.IgnoreCase); + rgxLanguage = new Regex(language, RegexOptions.IgnoreCase); } catch (Exception) { } #pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code @@ -158,14 +159,14 @@ public class FfmpegBuilderAudioAddTrack : FfmpegBuilderNode #pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code .OrderBy(x => { - if (Language != string.Empty) + if (language != string.Empty) { args.Logger?.ILog("Language: " + x.Language, x); if (string.IsNullOrEmpty(x.Language)) return 50; // no language specified if (rgxLanguage != null && rgxLanguage.IsMatch(x.Language)) return 0; - if (x.Language.ToLower() != Language) + if (x.Language.ToLower() != language) return 100; // low priority not the desired language } return 0;