Updating for the new deinterlace/decomb preset keys.

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
index 6112a26a35dfac3a31233a06a8f6cab4db09d8e6..f84ad33100ab781bc7849e74bc085044d1b835a0 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Json/Presets/HBPreset.cs
@@ -121,25 +121,15 @@ namespace HandBrake.ApplicationServices.Interop.Json.Presets
         /// </summary>\r
         public int PictureDeblock { get; set; }\r
 \r
-        /// <summary>\r
-        /// Gets or sets the picture decomb.\r
-        /// </summary>\r
-        public string PictureDecomb { get; set; }\r
-\r
-        /// <summary>\r
-        /// Gets or sets the picture decomb custom.\r
-        /// </summary>\r
-        public string PictureDecombCustom { get; set; }\r
-\r
         /// <summary>\r
         /// Gets or sets a value indicating whether picture decomb deinterlace.\r
         /// </summary>\r
-        public bool PictureDecombDeinterlace { get; set; }\r
+        public string PictureDeinterlaceFilter { get; set; }\r
 \r
         /// <summary>\r
-        /// Gets or sets the picture deinterlace.\r
+        /// Gets or sets the picture deinterlace preset.\r
         /// </summary>\r
-        public string PictureDeinterlace { get; set; }\r
+        public string PictureDeinterlacePreset { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the picture deinterlace custom.\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index b19cd9df38933c909907fcb977d723269a96e01f..bf6e6560e241d3394f1f2c974073b5c4107f96c1 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -94,53 +94,78 @@ namespace HandBrakeWPF.Services.Presets.Factories
             /* Filter Settings */\r
             preset.Task.Grayscale = importedPreset.VideoGrayScale;\r
             preset.Task.Deblock = importedPreset.PictureDeblock;\r
-            switch (importedPreset.PictureDecomb)\r
+\r
+            switch (importedPreset.PictureDeinterlaceFilter)\r
             {\r
-                case "custom":\r
-                    preset.Task.Decomb = Decomb.Custom;\r
-                    break;\r
-                case "default":\r
+                case "decomb":\r
                     preset.Task.Decomb = Decomb.Default;\r
+                    preset.Task.Deinterlace = Deinterlace.Off;\r
                     break;\r
-                case "bob":\r
-                    preset.Task.Decomb = Decomb.Bob;\r
-                    break;\r
-                case "fast":\r
-                    preset.Task.Decomb = Decomb.Fast;\r
+                case "deinterlace":\r
+                    preset.Task.Decomb = Decomb.Off;\r
+                    preset.Task.Deinterlace = Deinterlace.Fast;\r
                     break;\r
-\r
                 default:\r
                     preset.Task.Decomb = Decomb.Off;\r
+                    preset.Task.Deinterlace = Deinterlace.Off;\r
                     break;\r
             }\r
 \r
-            preset.Task.CustomDecomb = importedPreset.PictureDecombCustom;\r
-\r
-            if (!importedPreset.PictureDecombDeinterlace)\r
+            if (preset.Task.Decomb != Decomb.Off)\r
             {\r
-                preset.Task.Decomb = Decomb.Off;\r
+                switch (importedPreset.PictureDeinterlaceFilter)\r
+                {\r
+                    case "custom":\r
+                        preset.Task.Decomb = Decomb.Custom;\r
+                        break;\r
+                    case "default":\r
+                        preset.Task.Decomb = Decomb.Default;\r
+                        break;\r
+                    case "bob":\r
+                        preset.Task.Decomb = Decomb.Bob;\r
+                        break;\r
+                    case "fast":\r
+                        preset.Task.Decomb = Decomb.Fast;\r
+                        break;\r
+                    default:\r
+                        preset.Task.Decomb = Decomb.Default;\r
+                        break;\r
+                }\r
+\r
+                if (preset.Task.Decomb == Decomb.Custom)\r
+                {\r
+                    preset.Task.CustomDecomb = importedPreset.PictureDeinterlaceCustom;\r
+                }\r
             }\r
 \r
-            switch (importedPreset.PictureDeinterlace)\r
+            if (preset.Task.Deinterlace != Deinterlace.Off)\r
             {\r
-                case "custom":\r
-                    preset.Task.Deinterlace = Deinterlace.Custom;\r
-                    break;\r
-                case "bob":\r
-                    preset.Task.Deinterlace = Deinterlace.Bob;\r
-                    break;\r
-                case "gast":\r
-                    preset.Task.Deinterlace = Deinterlace.Fast;\r
-                    break;\r
-                case "slow":\r
-                    preset.Task.Deinterlace = Deinterlace.Slow;\r
-                    break;\r
-                case "slower":\r
-                    preset.Task.Deinterlace = Deinterlace.Slower;\r
-                    break;\r
-                default:\r
-                    preset.Task.Deinterlace = Deinterlace.Off;\r
-                    break;\r
+                switch (importedPreset.PictureDeinterlaceFilter)\r
+                {\r
+                    case "custom":\r
+                        preset.Task.Deinterlace = Deinterlace.Custom;\r
+                        break;\r
+                    case "bob":\r
+                        preset.Task.Deinterlace = Deinterlace.Bob;\r
+                        break;\r
+                    case "fast":\r
+                        preset.Task.Deinterlace = Deinterlace.Fast;\r
+                        break;\r
+                    case "slow":\r
+                        preset.Task.Deinterlace = Deinterlace.Slow;\r
+                        break;\r
+                    case "slower":\r
+                        preset.Task.Deinterlace = Deinterlace.Slower;\r
+                        break;\r
+                    default:\r
+                        preset.Task.Deinterlace = Deinterlace.Fast;\r
+                        break;\r
+                }\r
+\r
+                if (preset.Task.Deinterlace == Deinterlace.Custom)\r
+                {\r
+                    preset.Task.CustomDecomb = importedPreset.PictureDeinterlaceCustom;\r
+                }\r
             }\r
 \r
             preset.Task.CustomDeinterlace = importedPreset.PictureDetelecineCustom;\r
@@ -485,10 +510,9 @@ namespace HandBrakeWPF.Services.Presets.Factories
 \r
             // Filters\r
             preset.PictureDeblock = export.Task.Deblock;\r
-            preset.PictureDecomb = EnumHelper<Decomb>.GetShortName(export.Task.Decomb);\r
-            preset.PictureDecombCustom = export.Task.CustomDecomb;\r
-            preset.PictureDecombDeinterlace = export.Task.Decomb != Decomb.Off;\r
-            preset.PictureDeinterlace = EnumHelper<Deinterlace>.GetShortName(export.Task.Deinterlace);\r
+            preset.PictureDeinterlaceFilter = export.Task.Decomb != Decomb.Off ? "decomb" : export.Task.Deinterlace != Deinterlace.Off ? "deinterlace" : "off";  \r
+            preset.PictureDeinterlacePreset = export.Task.Decomb != Decomb.Off ? EnumHelper<Decomb>.GetShortName(export.Task.Decomb) : export.Task.Deinterlace != Deinterlace.Off ? EnumHelper<Deinterlace>.GetShortName(export.Task.Deinterlace) : string.Empty;\r
+            preset.PictureDeinterlaceCustom = export.Task.Decomb != Decomb.Off ? export.Task.CustomDecomb : export.Task.Deinterlace != Deinterlace.Off ? export.Task.CustomDeinterlace : string.Empty;\r
             preset.PictureDeinterlaceCustom = export.Task.CustomDeinterlace;\r
             preset.PictureDenoiseCustom = export.Task.CustomDenoise;\r
             preset.PictureDenoiseFilter = EnumHelper<Denoise>.GetShortName(export.Task.Denoise);\r