From f62627151cf0bcadecfcde9f27b99d0c922a24e1 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 9 Sep 2017 16:00:01 +0100 Subject: [PATCH] WinGui: Fix Custom Deinterlace / Decomb / Comb Detect preset options --- .../Services/Presets/Factories/JsonPresetFactory.cs | 8 +++----- win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs index 787e5ea46..b3d138efd 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs @@ -205,7 +205,7 @@ namespace HandBrakeWPF.Services.Presets.Factories if (preset.Task.Deinterlace == Deinterlace.Custom) { - preset.Task.CustomDecomb = importedPreset.PictureDeinterlaceCustom; + preset.Task.CustomDeinterlace = importedPreset.PictureDeinterlaceCustom; } } @@ -234,7 +234,6 @@ namespace HandBrakeWPF.Services.Presets.Factories } } - preset.Task.CustomDeinterlace = importedPreset.PictureDetelecineCustom; preset.Task.CustomDenoise = importedPreset.PictureDenoiseCustom; preset.Task.CustomDetelecine = importedPreset.PictureDetelecineCustom; preset.Task.CustomCombDetect = importedPreset.PictureCombDetectCustom; @@ -629,14 +628,13 @@ namespace HandBrakeWPF.Services.Presets.Factories // Filters preset.PictureDeblock = export.Task.Deblock; + preset.PictureDeinterlaceFilter = export.Task.DeinterlaceFilter == DeinterlaceFilter.Decomb ? "decomb" : export.Task.DeinterlaceFilter == DeinterlaceFilter.Yadif ? "yadif" : "off"; - preset.PictureDeinterlacePreset = export.Task.DeinterlaceFilter == DeinterlaceFilter.Decomb ? EnumHelper.GetShortName(export.Task.Decomb) : export.Task.DeinterlaceFilter == DeinterlaceFilter.Yadif ? EnumHelper.GetShortName(export.Task.Deinterlace) : string.Empty; - preset.PictureDeinterlaceCustom = export.Task.DeinterlaceFilter == DeinterlaceFilter.Decomb ? export.Task.CustomDecomb : export.Task.DeinterlaceFilter == DeinterlaceFilter.Yadif ? export.Task.CustomDeinterlace : string.Empty; @@ -644,12 +642,12 @@ namespace HandBrakeWPF.Services.Presets.Factories preset.PictureCombDetectPreset = EnumHelper.GetShortName(export.Task.CombDetect); preset.PictureCombDetectCustom = export.Task.CustomCombDetect; - preset.PictureDeinterlaceCustom = export.Task.CustomDeinterlace; preset.PictureDenoiseCustom = export.Task.CustomDenoise; preset.PictureDenoiseFilter = EnumHelper.GetShortName(export.Task.Denoise); preset.PictureDenoisePreset = EnumHelper.GetShortName(export.Task.DenoisePreset); preset.PictureDenoiseTune = EnumHelper.GetShortName(export.Task.DenoiseTune); preset.PictureDetelecine = EnumHelper.GetShortName(export.Task.Detelecine); + preset.PictureDetelecineCustom = export.Task.CustomDetelecine; preset.PictureSharpenFilter = EnumHelper.GetShortName(export.Task.Sharpen); diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs index d3afd0e8b..cd6b29d03 100644 --- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs @@ -773,6 +773,7 @@ namespace HandBrakeWPF.ViewModels // Custom Values this.CustomDecomb = preset.Task.CustomDecomb; + this.CustomCombDetect = preset.Task.CustomCombDetect; this.CustomDeinterlace = preset.Task.CustomDeinterlace; this.CustomDetelecine = preset.Task.CustomDetelecine; this.CustomDenoise = preset.Task.CustomDenoise; -- 2.40.0