WinGui:

- Just some re-factored code.

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

2 files changed, 16 insertions, 16 deletions

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 65fe8b169..33a7c1267 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -96,7 +96,7 @@ namespace Handbrake.Functions
             mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;

 

             // Keep Aspect Ration Anamorphic Setting.

-            mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;

+            mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.KeepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;

 

             // Set the Width and height as Required.

             if (presetQuery.Width != 0)

@@ -127,9 +127,9 @@ namespace Handbrake.Functions
                 mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.Height == 0 ? CheckState.Checked : CheckState.Unchecked;

 

             // Custom Anamorphic Controls

-            mainWindow.PictureSettings.updownDisplayWidth.Text = presetQuery.displayWidthValue.ToString();

-            mainWindow.PictureSettings.updownParHeight.Text = presetQuery.pixelAspectWidth.ToString();

-            mainWindow.PictureSettings.updownParWidth.Text = presetQuery.pixelAspectHeight.ToString();

+            mainWindow.PictureSettings.updownDisplayWidth.Text = presetQuery.DisplayWidthValue.ToString();

+            mainWindow.PictureSettings.updownParHeight.Text = presetQuery.PixelAspectWidth.ToString();

+            mainWindow.PictureSettings.updownParWidth.Text = presetQuery.PixelAspectHeight.ToString();

             mainWindow.PictureSettings.drp_modulus.SelectedItem = presetQuery.AnamorphicModulus;

 

             #endregion

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 78a73b52b..60afe7bca 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -40,10 +40,10 @@ namespace Handbrake.Functions
         public string CropLeft { get; set; }

         public string CropRight { get; set; }

         public int AnamorphicMode { get; set; }

-        public Boolean keepDisplayAsect { get; set; }

-        public double displayWidthValue { get; set; }

-        public int pixelAspectWidth { get; set; }

-        public int pixelAspectHeight { get; set; }

+        public Boolean KeepDisplayAsect { get; set; }

+        public double DisplayWidthValue { get; set; }

+        public int PixelAspectWidth { get; set; }

+        public int PixelAspectHeight { get; set; }

         public int AnamorphicModulus { get; set; }

 

         // Video Filters

@@ -234,16 +234,16 @@ namespace Handbrake.Functions
                 else

                     thisQuery.AnamorphicMode = 0;

 

-                thisQuery.keepDisplayAsect = keepDisplayAsect.Success;

+                thisQuery.KeepDisplayAsect = keepDisplayAsect.Success;

 

                 if (displayWidth.Success)

-                    thisQuery.displayWidthValue = double.Parse(displayWidth.Groups[0].Value.Replace("--display-width ", ""));

+                    thisQuery.DisplayWidthValue = double.Parse(displayWidth.Groups[0].Value.Replace("--display-width ", ""));

 

                 if (pixelAspect.Success)

-                    thisQuery.pixelAspectWidth = int.Parse(pixelAspect.Groups[1].Value.Replace("--pixel-aspect ", ""));

+                    thisQuery.PixelAspectWidth = int.Parse(pixelAspect.Groups[1].Value.Replace("--pixel-aspect ", ""));

 

                 if (pixelAspect.Success && pixelAspect.Groups.Count >=3)

-                    thisQuery.pixelAspectHeight = int.Parse(pixelAspect.Groups[2].Value.Replace("--pixel-aspect ", ""));

+                    thisQuery.PixelAspectHeight = int.Parse(pixelAspect.Groups[2].Value.Replace("--pixel-aspect ", ""));

 

                 if (modulus.Success)

                     thisQuery.AnamorphicModulus = int.Parse(modulus.Groups[0].Value.Replace("--modulus ", ""));

@@ -375,11 +375,11 @@ namespace Handbrake.Functions
 

                     if (trackMixes != null)

                         if (trackMixes.Length >= (x + 1))                        // Audio Mix

-                            track.MixDown = getMixDown(trackMixes[x].Trim());

+                            track.MixDown = GetMixDown(trackMixes[x].Trim());

 

                     if (trackEncoders != null)

                         if (trackEncoders.Length >= (x + 1))                     // Audio Mix

-                            track.Encoder = getAudioEncoder(trackEncoders[x].Trim());

+                            track.Encoder = GetAudioEncoder(trackEncoders[x].Trim());

 

                     if (trackBitrates != null)

                         if (trackBitrates.Length >= (x + 1))                     // Audio Encoder

@@ -431,7 +431,7 @@ namespace Handbrake.Functions
 

             return thisQuery;

         }

-        private static string getMixDown(string mixdown)

+        private static string GetMixDown(string mixdown)

         {

             switch (mixdown.Trim())

             {

@@ -449,7 +449,7 @@ namespace Handbrake.Functions
                     return "Automatic";

             }

         }

-        private static string getAudioEncoder(string audioEnc)

+        private static string GetAudioEncoder(string audioEnc)

         {

             switch (audioEnc)

             {