WinGui:

- Fixes a small bug with the PSY RD slider not having a default of 1. Some code cleanups. (Thanks ExDeus)
- Cleaned up a few bits of code

git-svn-id: svn://localhost/HandBrake/trunk@2290 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index 59b049b..55a7bc0 100644 (file)
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -1,9 +1,4 @@
 using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel;\r
-using System.Drawing;\r
-using System.Data;\r
-using System.Text;\r
 using System.Windows.Forms;\r
 \r
 namespace Handbrake.Controls\r
@@ -149,7 +144,7 @@ namespace Handbrake.Controls
             drop_refFrames.SelectedIndex = 0;\r
             drop_subpixelMotionEstimation.SelectedIndex = 0;\r
             drop_trellis.SelectedIndex = 0;\r
-            slider_psyrd.Value = 0;\r
+            slider_psyrd.Value = 10;\r
             slider_psytrellis.Value = 0;\r
             drop_adaptBFrames.SelectedIndex = 0;\r
 \r
@@ -389,15 +384,9 @@ namespace Handbrake.Controls
                                 }\r
                                 else\r
                                 {\r
-                                    if (!alphaDeblock.Equals("0"))\r
-                                        drop_deblockAlpha.SelectedItem = alphaDeblock;\r
-                                    else\r
-                                        drop_deblockAlpha.SelectedItem = "0";\r
-\r
-                                    if (!betaDeblock.Replace("\n", "").Equals("0"))\r
-                                        drop_deblockBeta.SelectedItem = betaDeblock.Replace("\n", "");\r
-                                    else\r
-                                        drop_deblockBeta.SelectedItem = "0";\r
+                                    drop_deblockAlpha.SelectedItem = !alphaDeblock.Equals("0") ? alphaDeblock : "0";\r
+\r
+                                    drop_deblockBeta.SelectedItem = !betaDeblock.Replace("\n", "").Equals("0") ? betaDeblock.Replace("\n", "") : "0";\r
                                 }\r
                                 continue;\r
                             case "analyse":\r
@@ -417,13 +406,13 @@ namespace Handbrake.Controls
                             case "psy-rd":\r
                                 string[] x = optValue.Split(',');\r
 \r
-                                double psyrd = 0, psytrellis = 0;\r
+                                double psyrd, psytrellis;\r
                                 int val, val2;\r
-                                double.TryParse(x[0], out psyrd);\r
-                                double.TryParse(x[1], out psytrellis);\r
 \r
-                                psyrd = psyrd * 10;\r
-                                psytrellis = psytrellis * 10;\r
+                                // default psy-rd = 1 (10 for the slider)\r
+                                psyrd = double.TryParse(x[0], out psyrd) ? psyrd * 10 : 10.0;\r
+                                // default psy-trellis = 0\r
+                                psytrellis = double.TryParse(x[1], out psytrellis) ? psytrellis * 10 : 0.0; \r
 \r
                                 int.TryParse(psyrd.ToString(), out val);\r
                                 int.TryParse(psytrellis.ToString(), out val2);\r
@@ -527,69 +516,27 @@ namespace Handbrake.Controls
                             {\r
                                 double psyrd = slider_psyrd.Value * 0.1;\r
                                 double psytre = slider_psytrellis.Value * 0.1;\r
-                                string rd, rt;\r
-                                if (psyrd == 1)\r
-                                    rd = "1.0";\r
-                                else\r
-                                    rd = psyrd.ToString();\r
 \r
-                                if (psytre == 1)\r
-                                    rt = "1.0";\r
-                                else\r
-                                    rt = psytre.ToString();\r
+                                string rd = psyrd.ToString("f1");\r
+                                string rt = psytre.ToString("f1");\r
 \r
                                 thisOpt = "psy-rd=" + rd + "," + rt;\r
                             }\r
                         }\r
                         else if (optNameToChange.Equals("mixed-refs"))\r
-                        {\r
-                            if (check_mixedReferences.CheckState == CheckState.Checked)\r
-                                thisOpt = "mixed-refs=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
+                            thisOpt = check_mixedReferences.CheckState == CheckState.Checked ? "mixed-refs=1" : "";\r
                         else if (optNameToChange.Equals("weightb"))\r
-                        {\r
-                            if (check_weightedBFrames.CheckState == CheckState.Checked)\r
-                                thisOpt = "weightb=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
+                            thisOpt = check_weightedBFrames.CheckState == CheckState.Checked ? "weightb=1" : "";\r
                         else if (optNameToChange.Equals("b-pyramid"))\r
-                        {\r
-                            if (check_pyrmidalBFrames.CheckState == CheckState.Checked)\r
-                                thisOpt = "b-pyramid=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
+                            thisOpt = check_pyrmidalBFrames.CheckState == CheckState.Checked ? "b-pyramid=1" : "";\r
                         else if (optNameToChange.Equals("no-fast-pskip"))\r
-                        {\r
-                            if (check_noFastPSkip.CheckState == CheckState.Checked)\r
-                                thisOpt = "no-fast-pskip=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
+                            thisOpt = check_noFastPSkip.CheckState == CheckState.Checked ? "no-fast-pskip=1" : "";\r
                         else if (optNameToChange.Equals("no-dct-decimate"))\r
-                        {\r
-                            if (check_noDCTDecimate.CheckState == CheckState.Checked)\r
-                                thisOpt = "no-dct-decimate=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
+                            thisOpt = check_noDCTDecimate.CheckState == CheckState.Checked ? "no-dct-decimate=1" : "";\r
                         else if (optNameToChange.Equals("8x8dct"))\r
-                        {\r
-                            if (check_8x8DCT.CheckState == CheckState.Checked)\r
-                                thisOpt = "8x8dct=1";\r
-                            else\r
-                                thisOpt = "";\r
-                        }\r
+                            thisOpt = check_8x8DCT.CheckState == CheckState.Checked ? "8x8dct=1" : "";\r
                         else if (optNameToChange.Equals("cabac"))\r
-                        {\r
-                            if (check_Cabac.CheckState == CheckState.Checked)\r
-                                thisOpt = "";\r
-                            else\r
-                                thisOpt = "cabac=0";\r
-                        }\r
+                            thisOpt = check_Cabac.CheckState == CheckState.Checked ? "" : "cabac=0";\r
                         else if (optNameToChange.Equals("me"))\r
                         {\r
                             switch (drop_MotionEstimationMethod.SelectedIndex)\r
@@ -663,60 +610,49 @@ namespace Handbrake.Controls
                         }\r
                         else if (optNameToChange.Equals("merange"))\r
                         {\r
-                            if (!drop_MotionEstimationRange.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "merange=" + drop_MotionEstimationRange.SelectedItem;\r
-                            else\r
-                                thisOpt = "";\r
+                            thisOpt = !drop_MotionEstimationRange.SelectedItem.ToString().Contains("Default")\r
+                                          ? "merange=" + drop_MotionEstimationRange.SelectedItem\r
+                                          : "";\r
                         }\r
                         else if (optNameToChange.Equals("b-adapt"))\r
                         {\r
-                            if (!drop_adaptBFrames.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "b-adapt=" + (drop_adaptBFrames.SelectedIndex - 1);\r
-                            else\r
-                                thisOpt = "";\r
+                            thisOpt = !drop_adaptBFrames.SelectedItem.ToString().Contains("Default")\r
+                                          ? "b-adapt=" + (drop_adaptBFrames.SelectedIndex - 1)\r
+                                          : "";\r
                         }\r
                         else if (optNameToChange.Equals("ref"))\r
                         {\r
-                            if (!drop_refFrames.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "ref=" + drop_refFrames.SelectedItem;\r
-                            else\r
-                                thisOpt = "";\r
+                            thisOpt = !drop_refFrames.SelectedItem.ToString().Contains("Default")\r
+                                          ? "ref=" + drop_refFrames.SelectedItem\r
+                                          : "";\r
                         }\r
                         else if (optNameToChange.Equals("bframes"))\r
                         {\r
                             String value = drop_bFrames.SelectedItem.ToString();\r
-                            if (!drop_bFrames.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "bframes=" + value;\r
-                            else\r
-                                thisOpt = "";\r
+                            thisOpt = !drop_bFrames.SelectedItem.ToString().Contains("Default")\r
+                                          ? "bframes=" + value\r
+                                          : "";\r
                         }\r
                         else if (optNameToChange.Equals("subq"))\r
                         {\r
                             String value = drop_subpixelMotionEstimation.SelectedItem.ToString();\r
-                            if (!drop_subpixelMotionEstimation.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "subq=" + value;\r
-                            else\r
-                                thisOpt = "";\r
+                            thisOpt = !drop_subpixelMotionEstimation.SelectedItem.ToString().Contains("Default")\r
+                                          ? "subq=" + value\r
+                                          : "";\r
                         }\r
                         else if (optNameToChange.Equals("trellis"))\r
                         {\r
                             String value = drop_trellis.SelectedItem.ToString();\r
-                            if (!drop_trellis.SelectedItem.ToString().Contains("Default"))\r
-                                thisOpt = "trellis=" + value;\r
-                            else\r
-                                thisOpt = "";\r
+                            thisOpt = !drop_trellis.SelectedItem.ToString().Contains("Default")\r
+                                          ? "trellis=" + value\r
+                                          : "";\r
                         }\r
                     }\r
                 }\r
 \r
                 /* Construct New String for opts here */\r
                 if (!thisOpt.Equals(""))\r
-                {\r
-                    if (changedOptString.Equals(""))\r
-                        changedOptString = thisOpt;\r
-                    else\r
-                        changedOptString = changedOptString + ":" + thisOpt;\r
-                }\r
+                    changedOptString = changedOptString.Equals("") ? thisOpt : changedOptString + ":" + thisOpt;\r
             }\r
 \r
             /* Change the option string to reflect the new mod settings */\r
@@ -844,16 +780,9 @@ namespace Handbrake.Controls
                 {\r
                     double psyrd = slider_psyrd.Value * 0.1;\r
                     double psytre = slider_psytrellis.Value * 0.1;\r
-                    string rd, rt;\r
-                    if (psyrd == 1)\r
-                        rd = "1.0";\r
-                    else\r
-                        rd = psyrd.ToString();\r
 \r
-                    if (psytre == 1)\r
-                        rt = "1.0";\r
-                    else\r
-                        rt = psytre.ToString();\r
+                    string rd = psyrd.ToString("f1");\r
+                    string rt = psytre.ToString("f1");\r
 \r
                     query += colon + "psy-rd=" + rd + "," + rt;\r
                 }\r
@@ -1070,4 +999,4 @@ namespace Handbrake.Controls
             }\r
         }\r
     }\r
-}
\ No newline at end of file
+}\r