WinGui: Couple of fixes and updates to the Plist parser.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 2bbdfffcd6b6cefb9220949eb47908536b73c0a0..c6ffc4194ca5af5b964972bfcd18a8f2826c08bc 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -15,7 +15,6 @@ namespace HandBrake.ApplicationServices.Utilities
     using HandBrake.ApplicationServices.Functions;\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
-    using HandBrake.ApplicationServices.Services;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
@@ -81,6 +80,9 @@ namespace HandBrake.ApplicationServices.Utilities
                         case "AudioTrackDRCSlider":\r
                             track.DRC = double.Parse(value);\r
                             break;\r
+                        case "AudioTrackGainSlider":\r
+                            track.Gain = int.Parse(value);\r
+                            break;\r
                     }\r
                 }\r
                 audioTracks.Add(track);\r
@@ -102,7 +104,7 @@ namespace HandBrake.ApplicationServices.Utilities
                 {\r
                         // Output Settings\r
                     case "FileFormat":\r
-                        parsed.OutputFormat = Converters.GetFileFormat(value);\r
+                        parsed.OutputFormat = Converters.GetFileFormat(value.Replace("file", string.Empty).Trim());\r
                         break;\r
                     case "Mp4HttpOptimize":\r
                         parsed.OptimizeMP4 = value == "1";\r
@@ -116,7 +118,7 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
                         // Picture Settings\r
                     case "PictureAutoCrop":\r
-                        // Not used\r
+                        parsed.HasCropping = value != "1";\r
                         break;\r
                     case "PictureTopCrop":\r
                         parsed.Cropping.Top = int.Parse(value);\r
@@ -249,7 +251,7 @@ namespace HandBrake.ApplicationServices.Utilities
                         }\r
                         break;\r
                     case "VideoEncoder":\r
-                        parsed.VideoEncoder = Converters.GetVideoEncoder(value);\r
+                        parsed.VideoEncoder = EnumHelper<VideoEncoder>.GetValue(value);\r
                         break;\r
                     case "VideoFramerate":\r
 \r
@@ -259,7 +261,21 @@ namespace HandBrake.ApplicationServices.Utilities
                         }\r
                         else if (!string.IsNullOrEmpty(value))\r
                         {\r
-                            parsed.Framerate = int.Parse(value);\r
+                            parsed.Framerate = double.Parse(value);\r
+                        }\r
+                        break;\r
+                    case "VideoFramerateMode":\r
+                        switch (value)\r
+                        {\r
+                            case "vfr":\r
+                                parsed.FramerateMode = FramerateMode.VFR;\r
+                                break;\r
+                            case "cfr":\r
+                                parsed.FramerateMode = FramerateMode.CFR;\r
+                                break;\r
+                            default:\r
+                                parsed.FramerateMode = FramerateMode.PFR;\r
+                                break;\r
                         }\r
                         break;\r
                     case "VideoGrayScale":\r

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 599cf31d4ea015064bf1e851060d62b0bbc04280..f7f859b2fc15df89eecf38837f239fe3f724ccfb 100644 (file)
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -14,14 +14,12 @@ namespace Handbrake
     using System.IO;\r
     using System.Linq;\r
     using System.Threading;\r
-    using System.Windows;\r
     using System.Windows.Forms;\r
 \r
     using Functions;\r
 \r
     using HandBrake.ApplicationServices;\r
     using HandBrake.ApplicationServices.EventArgs;\r
-    using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Model.General;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.ApplicationServices.Functions;\r