From ea437273cecf5bddcc7b8913bb4e8eef6b60d53b Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sun, 25 Sep 2011 15:57:28 +0000
Subject: [PATCH] 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
---
 .../Utilities/PlistUtility.cs                 | 26 +++++++++++++++----
 win/CS/frmMain.cs                             |  2 --
 2 files changed, 21 insertions(+), 7 deletions(-)

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