WinGui: Lots of fixes to the Plist Import / Export functionality.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4593 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index ccac8289364ab73ead3ce126f12a82339523b6d8..96e8d917cb74c8ffce920e280ea1eb359c610abb 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -6,7 +6,6 @@
 namespace HandBrake.ApplicationServices.Utilities\r
 {\r
     using System;\r
-    using System.Collections.Generic;\r
     using System.Collections.ObjectModel;\r
     using System.IO;\r
     using System.Text;\r
@@ -32,6 +31,14 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
         #region Import\r
 \r
+        /// <summary>\r
+        /// Import a Plist Preset\r
+        /// </summary>\r
+        /// <param name="filename">\r
+        /// The filename.\r
+        /// </param>\r
+        /// <returns>\r
+        /// </returns>\r
         public static Preset Import(string filename)\r
         {\r
             Preset preset = new Preset();\r
@@ -94,7 +101,7 @@ namespace HandBrake.ApplicationServices.Utilities
                             track.SampleRate = value == "Auto" ? 0 : double.Parse(value);\r
                             break;\r
                         case "AudioTrack":\r
-                           //track.SourceTrack = value;\r
+                            //track.SourceTrack = value;\r
                             break;\r
                         case "AudioTrackDRCSlider":\r
                             track.DRC = double.Parse(value);\r
@@ -121,7 +128,7 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
                 switch (key)\r
                 {\r
-                        // Output Settings\r
+                    // Output Settings\r
                     case "FileFormat":\r
                         parsed.OutputFormat = Converters.GetFileFormat(value.Replace("file", string.Empty).Trim());\r
                         break;\r
@@ -129,13 +136,13 @@ namespace HandBrake.ApplicationServices.Utilities
                         parsed.OptimizeMP4 = value == "1";\r
                         break;\r
                     case "Mp4LargeFile":\r
-                        parsed.IPod5GSupport = value == "1";\r
+                        parsed.LargeFile = value == "1";\r
                         break;\r
                     case "Mp4iPodCompatible":\r
                         parsed.IPod5GSupport = value == "1";\r
                         break;\r
 \r
-                        // Picture Settings\r
+                    // Picture Settings\r
                     case "PictureAutoCrop":\r
                         parsed.HasCropping = value != "1";\r
                         break;\r
@@ -178,16 +185,23 @@ namespace HandBrake.ApplicationServices.Utilities
                         }\r
                         break;\r
 \r
-                        // Filters\r
+                    // Filters\r
                     case "PictureDeblock":\r
                         parsed.Deblock = int.Parse(value);\r
                         break;\r
                     case "PictureDecomb":\r
                         parsed.Decomb = Decomb.Off;\r
-                        // Don't place custom here as it's handled in the filter panel\r
-                        if (value == "2")\r
+                        switch (value)\r
                         {\r
-                            parsed.Decomb = Decomb.Default;\r
+                            case "1":\r
+                                parsed.Decomb = Decomb.Custom;\r
+                                break;\r
+                            case "2":\r
+                                parsed.Decomb = Decomb.Default;\r
+                                break;\r
+                            case "3":\r
+                                parsed.Decomb = Decomb.Fast;\r
+                                break;\r
                         }\r
                         break;\r
                     case "PictureDecombCustom":\r
@@ -205,7 +219,9 @@ namespace HandBrake.ApplicationServices.Utilities
                             case "0":\r
                                 parsed.Deinterlace = Deinterlace.Off;\r
                                 break;\r
-                                // Don't place custom here as it's handled in the filter panel\r
+                            case "1":\r
+                                parsed.Deinterlace = Deinterlace.Custom;\r
+                                break;\r
                             case "2":\r
                                 parsed.Deinterlace = Deinterlace.Fast;\r
                                 break;\r
@@ -229,7 +245,9 @@ namespace HandBrake.ApplicationServices.Utilities
                             case "0":\r
                                 parsed.Denoise = Denoise.Off;\r
                                 break;\r
-                                // Don't place custom here as it's handled in the filter panel\r
+                            case "1":\r
+                                parsed.Denoise = Denoise.Custom;\r
+                                break;\r
                             case "2":\r
                                 parsed.Denoise = Denoise.Weak;\r
                                 break;\r
@@ -251,6 +269,10 @@ namespace HandBrake.ApplicationServices.Utilities
                     case "PictureDetelecine":\r
                         parsed.Detelecine = Detelecine.Off;\r
                         if (value == "1")\r
+                        {\r
+                            parsed.Detelecine = Detelecine.Custom;\r
+                        }\r
+                        if (value == "2")\r
                         {\r
                             parsed.Detelecine = Detelecine.Default;\r
                         }\r
@@ -262,7 +284,7 @@ namespace HandBrake.ApplicationServices.Utilities
                         }\r
                         break;\r
 \r
-                        // Video Tab\r
+                    // Video Tab\r
                     case "VideoAvgBitrate":\r
                         if (!string.IsNullOrEmpty(value))\r
                         {\r
@@ -316,17 +338,17 @@ namespace HandBrake.ApplicationServices.Utilities
                         parsed.TwoPass = value == "1";\r
                         break;\r
 \r
-                        // Chapter Markers Tab\r
+                    // Chapter Markers Tab\r
                     case "ChapterMarkers":\r
                         parsed.IncludeChapterMarkers = value == "1";\r
                         break;\r
 \r
-                        // Advanced x264 tab\r
+                    // Advanced x264 tab\r
                     case "x264Option":\r
                         parsed.AdvancedEncoderOptions = value;\r
                         break;\r
 \r
-                        // Preset Information\r
+                    // Preset Information\r
                     case "PresetBuildNumber":\r
                         preset.Version = value;\r
                         break;\r
@@ -554,11 +576,15 @@ namespace HandBrake.ApplicationServices.Utilities
                     AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);\r
                     break;\r
                 case Decomb.Default:\r
-                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "1");\r
+                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "2");\r
                     AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);\r
                     break;\r
-                default:\r
-                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "2");\r
+                case Decomb.Fast:\r
+                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "3");\r
+                    AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);\r
+                    break;\r
+                case Decomb.Custom:\r
+                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "1");\r
                     AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", parsed.CustomDecomb);\r
                     break;\r
             }\r
@@ -571,19 +597,19 @@ namespace HandBrake.ApplicationServices.Utilities
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);\r
                     break;\r
                 case Deinterlace.Fast:\r
-                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "1");\r
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "2");\r
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);\r
                     break;\r
                 case Deinterlace.Slow:\r
-                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "2");\r
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "3");\r
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);\r
                     break;\r
                 case Deinterlace.Slower:\r
-                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "3");\r
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "4");\r
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);\r
                     break;\r
-                default:\r
-                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "4");\r
+                case Deinterlace.Custom:\r
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "1");\r
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", parsed.CustomDeinterlace);\r
                     break;\r
             }\r
@@ -595,24 +621,24 @@ namespace HandBrake.ApplicationServices.Utilities
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);\r
                     break;\r
                 case Denoise.Weak:\r
-                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "1");\r
+                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "2");\r
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);\r
                     break;\r
                 case Denoise.Medium:\r
-                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "2");\r
+                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "3");\r
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);\r
                     break;\r
                 case Denoise.Strong:\r
-                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "3");\r
+                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "4");\r
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);\r
                     break;\r
-                default:\r
-                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "4");\r
+                case Denoise.Custom:\r
+                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "1");\r
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", parsed.CustomDenoise);\r
                     break;\r
             }\r
 \r
-            int detelecine;\r
+            int detelecine = 0;\r
             switch (parsed.Detelecine)\r
             {\r
                 case Detelecine.Off:\r
@@ -621,7 +647,7 @@ namespace HandBrake.ApplicationServices.Utilities
                 case Detelecine.Default:\r
                     detelecine = 2;\r
                     break;\r
-                default:\r
+                case Detelecine.Custom:\r
                     detelecine = 1;\r
                     break;\r
             }\r
@@ -779,7 +805,7 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
             xmlWriter.WriteElementString("key", "AudioTrackGainSlider");\r
             xmlWriter.WriteElementString("real", audioTrack.Gain.ToString());\r
-            \r
+\r
             xmlWriter.WriteEndElement();\r
         }\r
         #endregion\r