remove crf flag and all uses of it

[handbrake-jp/handbrake-jp-git.git] / win / C# / Functions / PresetLoader.cs

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 051f309..3018b91 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -5,6 +5,7 @@
           It may be used under the terms of the GNU General Public License. */\r
 \r
 using System;\r
+using System.Drawing;\r
 using System.Windows.Forms;\r
 \r
 namespace Handbrake.Functions\r
@@ -46,9 +47,19 @@ namespace Handbrake.Functions
             if (presetQuery.Format != null)\r
             {\r
                 if (presetQuery.Format == "mp4" || presetQuery.Format == "m4v")\r
-                    mainWindow.drop_format.SelectedIndex = 0;\r
+                {\r
+                    if (mainWindow.drop_format.SelectedIndex == 0)\r
+                        mainWindow.SetExtension(".mp4");\r
+                    else \r
+                        mainWindow.drop_format.SelectedIndex = 0;\r
+                }\r
                 else if (presetQuery.Format == "mkv")\r
-                    mainWindow.drop_format.SelectedIndex = 1;\r
+                {\r
+                    if(mainWindow.drop_format.SelectedIndex == 1)\r
+                        mainWindow.SetExtension(".mkv");\r
+                    else\r
+                        mainWindow.drop_format.SelectedIndex = 1;\r
+                }\r
             }\r
 \r
             mainWindow.check_iPodAtom.CheckState = presetQuery.IpodAtom ? CheckState.Checked : CheckState.Unchecked;\r
@@ -62,11 +73,9 @@ namespace Handbrake.Functions
             #endregion\r
 \r
             #region Picture\r
-\r
+            mainWindow.PictureSettings.check_autoCrop.Checked = true;\r
             if (pictureSettings) // only Load picture settings if the perset requires it\r
             {\r
-                mainWindow.PictureSettings.check_autoCrop.Checked = true;\r
-\r
                 if (presetQuery.CropValues != null)\r
                 {\r
                     int top, bottom, left, right;\r
@@ -82,7 +91,7 @@ namespace Handbrake.Functions
                     mainWindow.PictureSettings.crop_right.Value = right;\r
                 }\r
             }\r
-\r
+            \r
             // Set the anamorphic mode 0,1,2,3\r
             mainWindow.PictureSettings.drp_anamorphic.SelectedIndex = presetQuery.AnamorphicMode;\r
 \r
@@ -98,16 +107,12 @@ namespace Handbrake.Functions
 \r
             // Max Width/Height override Width/Height\r
             if (presetQuery.MaxWidth != 0)\r
-            {\r
                 mainWindow.PictureSettings.text_width.Value = presetQuery.MaxWidth;\r
-                mainWindow.PictureSettings.MaximumWidth = presetQuery.MaxWidth;\r
-            }\r
 \r
             if (presetQuery.MaxHeight != 0)\r
-            {\r
                 mainWindow.PictureSettings.text_height.Value = presetQuery.MaxHeight;\r
-                mainWindow.PictureSettings.MaximumHeight = presetQuery.MaxHeight;\r
-            }\r
+\r
+            mainWindow.PictureSettings.PresetMaximumResolution = new Size(presetQuery.MaxWidth, presetQuery.MaxHeight);\r
 \r
             // Case where both height and max height are 0 - For built-in presets\r
             if (presetQuery.MaxHeight == 0 && presetQuery.Height == 0)\r
@@ -117,8 +122,6 @@ namespace Handbrake.Functions
                 if (mainWindow.selectedTitle != null && mainWindow.selectedTitle.Resolution.Width != 0)\r
                     mainWindow.PictureSettings.text_width.Value = mainWindow.selectedTitle.Resolution.Width;\r
 \r
-            mainWindow.PictureSettings.setMax();\r
-\r
             // Custom Anamorphic Controls\r
             mainWindow.PictureSettings.updownDisplayWidth.Text = presetQuery.displayWidthValue.ToString();\r
             mainWindow.PictureSettings.updownParHeight.Text = presetQuery.pixelAspectWidth.ToString();\r
@@ -156,8 +159,9 @@ namespace Handbrake.Functions
                 mainWindow.radio_cq.Checked = true;\r
                 if (presetQuery.VideoEncoder == "H.264 (x264)")\r
                 {\r
+                    double cqStep = Properties.Settings.Default.x264cqstep;\r
                     int value;\r
-                    double x264step = Properties.Settings.Default.x264cqstep;\r
+                    double x264step = cqStep;\r
                     double presetValue = presetQuery.VideoQuality;\r
 \r
                     double x = 51 / x264step;\r
@@ -174,7 +178,8 @@ namespace Handbrake.Functions
                         double val = Math.Round(calculated, 0);\r
                         int.TryParse(val.ToString(), out value);\r
                     }\r
-                    mainWindow.slider_videoQuality.Value = value;\r
+                    if (value < mainWindow.slider_videoQuality.Maximum)\r
+                        mainWindow.slider_videoQuality.Value = value;\r
                 }\r
                 else\r
                 {\r
@@ -186,7 +191,6 @@ namespace Handbrake.Functions
 \r
             mainWindow.check_2PassEncode.CheckState = presetQuery.TwoPass ? CheckState.Checked : CheckState.Unchecked;\r
 \r
-\r
             mainWindow.drp_videoFramerate.Text = presetQuery.VideoFramerate;\r
 \r
             mainWindow.check_turbo.CheckState = presetQuery.TurboFirstPass ? CheckState.Checked : CheckState.Unchecked;\r
@@ -207,12 +211,12 @@ namespace Handbrake.Functions
 \r
             #region Audio\r
             // Clear the audio listing\r
-            mainWindow.AudioSettings.clearAudioList();\r
+            mainWindow.AudioSettings.ClearAudioList();\r
 \r
             if (presetQuery.AudioInformation != null)\r
                 foreach (AudioTrack track in presetQuery.AudioInformation)\r
                 {\r
-                    ListViewItem newTrack = new ListViewItem(mainWindow.AudioSettings.getNewID().ToString());\r
+                    ListViewItem newTrack = new ListViewItem(mainWindow.AudioSettings.GetNewID().ToString());\r
 \r
                     newTrack.SubItems.Add("Automatic");\r
                     newTrack.SubItems.Add(track.Encoder);\r
@@ -223,7 +227,7 @@ namespace Handbrake.Functions
                     else\r
                         newTrack.SubItems.Add(track.Bitrate);\r
                     newTrack.SubItems.Add(track.DRC);\r
-                    mainWindow.AudioSettings.addTrackForPreset(newTrack);\r
+                    mainWindow.AudioSettings.AddTrackForPreset(newTrack);\r
                 }\r
             #endregion\r
 \r