WinGui:

- Just cut down some code, got rid of some duplicated code etc.

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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index fd65e4971992a8ef0353bd2e6525b76789edb987..e7f31f688d62d4e08bb03d9250f2106e053ae2a3 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -796,7 +796,6 @@ namespace Handbrake
             DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "").Replace(".ogm", "").Replace(".avi", "");\r
 \r
             // Show the dialog and set the main form file path\r
-\r
             if (text_destination.Text.EndsWith(".mp4"))\r
                 DVD_Save.FilterIndex = 1;\r
             else if (text_destination.Text.EndsWith(".m4v"))\r
@@ -883,7 +882,6 @@ namespace Handbrake
                 check_iPodAtom.Checked = false;\r
             }\r
 \r
-\r
             //Turn off some options which are H.264 only when the user selects a non h.264 encoder\r
             if (drp_videoEncoder.Text.Contains("H.264"))\r
             {\r
@@ -1079,6 +1077,7 @@ namespace Handbrake
             }\r
             else\r
             {\r
+                // Enable the 2nd Track\r
                 drp_audbit_2.Enabled = true;\r
                 drp_audenc_2.Enabled = true;\r
                 drp_audsr_2.Enabled = true;\r
@@ -1101,6 +1100,7 @@ namespace Handbrake
         {\r
             if (drp_track3Audio.SelectedItem.Equals("None"))\r
             {\r
+                // Disable the 3rd track\r
                 drp_audbit_3.Enabled = false;\r
                 drp_audenc_3.Enabled = false;\r
                 drp_audsr_3.Enabled = false;\r
@@ -1123,6 +1123,7 @@ namespace Handbrake
             }\r
             else\r
             {\r
+                // Enable the 3rd track\r
                 drp_audbit_3.Enabled = true;\r
                 drp_audenc_3.Enabled = true;\r
                 drp_audsr_3.Enabled = true;\r
@@ -1176,40 +1177,28 @@ namespace Handbrake
             if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text == "6 Channel Discrete"))\r
                 setBitrateSelections384(drp_audbit_1);\r
             else if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text != "6 Channel Discrete"))\r
-            {\r
-                setBitrateSelections160(drp_audbit_1);\r
-                drp_audbit_1.Text = "160";\r
-            }\r
+                setBitrateSelections160(drp_audbit_1); drp_audbit_1.Text = "160";\r
         }\r
         private void drp_audmix_2_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text == "6 Channel Discrete"))\r
                 setBitrateSelections384(drp_audbit_2);\r
             else if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text != "6 Channel Discrete"))\r
-            {\r
-                setBitrateSelections160(drp_audbit_2);\r
-                drp_audbit_2.Text = "160";\r
-            }\r
+                setBitrateSelections160(drp_audbit_2); drp_audbit_2.Text = "160";\r
         }\r
         private void drp_audmix_3_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text == "6 Channel Discrete"))\r
                 setBitrateSelections384(drp_audbit_3);\r
             else if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text != "6 Channel Discrete"))\r
-            {\r
-                setBitrateSelections160(drp_audbit_3);\r
-                drp_audbit_3.Text = "160";\r
-            }\r
+                setBitrateSelections160(drp_audbit_3); drp_audbit_3.Text = "160";\r
         }\r
         private void drp_audmix_4_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text == "6 Channel Discrete"))\r
                 setBitrateSelections384(drp_audbit_4);\r
             else if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text != "6 Channel Discrete"))\r
-            {\r
-                setBitrateSelections160(drp_audbit_4);\r
-                drp_audbit_4.Text = "160";\r
-            }\r
+                setBitrateSelections160(drp_audbit_4); drp_audbit_4.Text = "160";\r
         }\r
 \r
         private void drp_audenc_1_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -1231,201 +1220,84 @@ namespace Handbrake
                 drp_audsr_1.Text = "Auto";\r
             }\r
 \r
-\r
             if (drp_audenc_1.Text == "AAC")\r
             {\r
-                drp_audmix_1.Items.Clear();\r
-                drp_audmix_1.Items.Add("Mono");\r
-                drp_audmix_1.Items.Add("Stereo");\r
-                drp_audmix_1.Items.Add("Dolby Surround");\r
-                drp_audmix_1.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_1.Items.Add("6 Channel Discrete");\r
-\r
+                setMixDownAllOptions(drp_audmix_1);\r
                 setBitrateSelections160(drp_audbit_1);\r
             }\r
             else\r
             {\r
-                drp_audmix_1.Items.Clear();\r
-                drp_audmix_1.Items.Add("Stereo");\r
-                drp_audmix_1.Items.Add("Dolby Surround");\r
-                drp_audmix_1.Items.Add("Dolby Pro Logic II");\r
-\r
+                setMixDownNotAAC(drp_audmix_1);\r
                 setBitrateSelections320(drp_audbit_1);\r
             }\r
         }\r
         private void drp_audenc_2_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_audenc_2.Text == "AC3")\r
-            {\r
-                drp_audmix_2.Enabled = false;\r
-                drp_audbit_2.Enabled = false;\r
-                drp_audsr_2.Enabled = false;\r
-\r
-                drp_audmix_2.Text = "Automatic";\r
-                drp_audbit_2.Text = "160";\r
-                drp_audsr_2.Text = "Auto";\r
-            }\r
-            else\r
-            {\r
-                // Just make sure not to re-enable the following boxes if the track2 is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_2.Enabled = true;\r
-                    drp_audbit_2.Enabled = true;\r
-                    drp_audsr_2.Enabled = true;\r
-\r
-                    drp_audmix_2.Text = "Automatic";\r
-                    drp_audbit_2.Text = "160";\r
-                    drp_audsr_2.Text = "Auto";\r
-                }\r
-            }\r
+            // Setup the other audio configuration options as required.\r
+            audioEncoderChange(drp_audenc_2, drp_audmix_2, drp_audbit_2, drp_audsr_2);\r
 \r
             if (drp_audenc_2.Text == "AAC")\r
             {\r
-                drp_audmix_2.Items.Clear();\r
-                drp_audmix_2.Items.Add("Mono");\r
-                drp_audmix_2.Items.Add("Stereo");\r
-                drp_audmix_2.Items.Add("Dolby Surround");\r
-                drp_audmix_2.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_2.Items.Add("6 Channel Discrete");\r
-\r
+                setMixDownAllOptions(drp_audmix_2);\r
                 setBitrateSelections160(drp_audbit_2);\r
             }\r
             else\r
             {\r
-                drp_audmix_2.Items.Clear();\r
-                drp_audmix_2.Items.Add("Stereo");\r
-                drp_audmix_2.Items.Add("Dolby Surround");\r
-                drp_audmix_2.Items.Add("Dolby Pro Logic II");\r
-\r
+                setMixDownNotAAC(drp_audmix_2);\r
                 setBitrateSelections320(drp_audbit_2);\r
             }\r
         }\r
         private void drp_audenc_3_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_audenc_3.Text == "AC3")\r
-            {\r
-                drp_audmix_3.Enabled = false;\r
-                drp_audbit_3.Enabled = false;\r
-                drp_audsr_3.Enabled = false;\r
-\r
-                drp_audmix_3.Text = "Automatic";\r
-                drp_audbit_3.Text = "160";\r
-                drp_audsr_3.Text = "Auto";\r
-            }\r
-            else\r
-            {\r
-                // Just make sure not to re-enable the following boxes if the track above is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_3.Enabled = true;\r
-                    drp_audbit_3.Enabled = true;\r
-                    drp_audsr_3.Enabled = true;\r
-\r
-                    drp_audmix_3.Text = "Automatic";\r
-                    drp_audbit_3.Text = "160";\r
-                    drp_audsr_3.Text = "Auto";\r
-                }\r
-            }\r
-\r
+            // Setup the other audio configuration options as required.\r
+            audioEncoderChange(drp_audenc_3, drp_audmix_3, drp_audbit_3, drp_audsr_3);\r
 \r
             if (drp_audenc_3.Text == "AAC")\r
             {\r
-                drp_audmix_3.Items.Clear();\r
-                drp_audmix_3.Items.Add("Mono");\r
-                drp_audmix_3.Items.Add("Stereo");\r
-                drp_audmix_3.Items.Add("Dolby Surround");\r
-                drp_audmix_3.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_3.Items.Add("6 Channel Discrete");\r
-\r
+                setMixDownAllOptions(drp_audmix_3);\r
                 setBitrateSelections160(drp_audbit_3);\r
             }\r
             else\r
             {\r
-                drp_audmix_3.Items.Clear();\r
-                drp_audmix_3.Items.Add("Stereo");\r
-                drp_audmix_3.Items.Add("Dolby Surround");\r
-                drp_audmix_3.Items.Add("Dolby Pro Logic II");\r
-\r
+                setMixDownNotAAC(drp_audmix_3);\r
                 setBitrateSelections320(drp_audbit_3);\r
             }\r
         }\r
         private void drp_audenc_4_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
-            if (drp_audenc_4.Text == "AC3")\r
-            {\r
-                drp_audmix_4.Enabled = false;\r
-                drp_audbit_4.Enabled = false;\r
-                drp_audsr_4.Enabled = false;\r
-\r
-                drp_audmix_4.Text = "Automatic";\r
-                drp_audbit_4.Text = "160";\r
-                drp_audsr_4.Text = "Auto";\r
-            }\r
-            else\r
-            {\r
-                // Just make sure not to re-enable the following boxes if the track above is none\r
-                if (drp_track2Audio.Text != "None")\r
-                {\r
-                    drp_audmix_4.Enabled = true;\r
-                    drp_audbit_4.Enabled = true;\r
-                    drp_audsr_4.Enabled = true;\r
-\r
-                    drp_audmix_4.Text = "Automatic";\r
-                    drp_audbit_4.Text = "160";\r
-                    drp_audsr_4.Text = "Auto";\r
-                }\r
-            }\r
-\r
+            // Setup the other audio configuration options as required.\r
+            audioEncoderChange(drp_audenc_4, drp_audmix_4, drp_audbit_4, drp_audsr_4);\r
 \r
             if (drp_audenc_4.Text == "AAC")\r
             {\r
-                drp_audmix_4.Items.Clear();\r
-                drp_audmix_4.Items.Add("Mono");\r
-                drp_audmix_4.Items.Add("Stereo");\r
-                drp_audmix_4.Items.Add("Dolby Surround");\r
-                drp_audmix_4.Items.Add("Dolby Pro Logic II");\r
-                drp_audmix_4.Items.Add("6 Channel Discrete");\r
-\r
+                setMixDownAllOptions(drp_audmix_4);\r
                 setBitrateSelections160(drp_audbit_4);\r
             }\r
             else\r
             {\r
-                drp_audmix_4.Items.Clear();\r
-                drp_audmix_4.Items.Add("Stereo");\r
-                drp_audmix_4.Items.Add("Dolby Surround");\r
-                drp_audmix_4.Items.Add("Dolby Pro Logic II");\r
-\r
+                setMixDownNotAAC(drp_audmix_4);\r
                 setBitrateSelections320(drp_audbit_4);\r
             }\r
         }\r
 \r
         private void trackBar1_Scroll(object sender, EventArgs e)\r
         {\r
-            double value = trackBar1.Value / 10.0;\r
-            value++;\r
-\r
+            double value = (trackBar1.Value / 10.0) + 1;\r
             lbl_drc1.Text = value.ToString();\r
         }\r
         private void trackBar2_Scroll(object sender, EventArgs e)\r
         {\r
-            double value = trackBar2.Value / 10.0;\r
-            value++;\r
-\r
+            double value = (trackBar2.Value / 10.0) + 1;\r
             lbl_drc2.Text = value.ToString();\r
         }\r
         private void trackBar3_Scroll(object sender, EventArgs e)\r
         {\r
-            double value = trackBar3.Value / 10.0;\r
-            value++;\r
-\r
+            double value = (trackBar3.Value / 10.0) + 1;\r
             lbl_drc3.Text = value.ToString();\r
         }\r
         private void trackBar4_Scroll(object sender, EventArgs e)\r
         {\r
-            double value = trackBar4.Value / 10.0;\r
-            value++;\r
-\r
+            double value = (trackBar4.Value / 10.0) + 1;\r
             lbl_drc4.Text = value.ToString();\r
         }\r
 \r
@@ -1445,9 +1317,7 @@ namespace Handbrake
         {\r
             if (Check_ChapterMarkers.Checked)\r
             {\r
-                string destination = text_destination.Text;\r
-                destination = destination.Replace(".mp4", ".m4v");\r
-                text_destination.Text = destination;\r
+                text_destination.Text = text_destination.Text.Replace(".m4v", ".mp4");\r
                 data_chpt.Rows.Clear();\r
                 data_chpt.Enabled = true;\r
                 DataGridView chapterGridView = hb_common_func.chapterNaming(data_chpt, drop_chapterStart.Text, drop_chapterFinish.Text);\r
@@ -1456,9 +1326,7 @@ namespace Handbrake
             }\r
             else\r
             {\r
-                string destination = text_destination.Text;\r
-                destination = destination.Replace(".m4v", ".mp4");\r
-                text_destination.Text = destination;\r
+                text_destination.Text = text_destination.Text.Replace(".m4v", ".mp4");\r
                 data_chpt.Rows.Clear();\r
                 data_chpt.Enabled = false;\r
             }\r
@@ -1666,7 +1534,7 @@ namespace Handbrake
         #endregion\r
 \r
         #region Audio Panel Code Helpers\r
-        public void setAudioByContainer(String path)\r
+        private void setAudioByContainer(String path)\r
         {\r
             string oldval = "";\r
 \r
@@ -1815,7 +1683,7 @@ namespace Handbrake
                 }\r
             }\r
         }\r
-        public void setVideoByContainer(String path)\r
+        private void setVideoByContainer(String path)\r
         {\r
             string oldval = "";\r
 \r
@@ -1867,7 +1735,7 @@ namespace Handbrake
                 drp_videoEncoder.Text = oldval;\r
             }\r
         }\r
-        public void setBitrateSelections384(ComboBox dropDown)\r
+        private void setBitrateSelections384(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1886,7 +1754,7 @@ namespace Handbrake
             dropDown.Items.Add("320");\r
             dropDown.Items.Add("384");\r
         }\r
-        public void setBitrateSelections320(ComboBox dropDown)\r
+        private void setBitrateSelections320(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1904,7 +1772,7 @@ namespace Handbrake
             dropDown.Items.Add("256");\r
             dropDown.Items.Add("320");\r
         }\r
-        public void setBitrateSelections160(ComboBox dropDown)\r
+        private void setBitrateSelections160(ComboBox dropDown)\r
         {\r
             dropDown.Items.Clear();\r
             dropDown.Items.Add("32");\r
@@ -1918,6 +1786,49 @@ namespace Handbrake
             dropDown.Items.Add("128");\r
             dropDown.Items.Add("160");\r
         }\r
+        private void setMixDownAllOptions(ComboBox dropdown)\r
+        {\r
+            dropdown.Items.Clear();\r
+            dropdown.Items.Add("Mono");\r
+            dropdown.Items.Add("Stereo");\r
+            dropdown.Items.Add("Dolby Surround");\r
+            dropdown.Items.Add("Dolby Pro Logic II");\r
+            dropdown.Items.Add("6 Channel Discrete");\r
+        }\r
+        private void setMixDownNotAAC(ComboBox dropdown)\r
+        {\r
+            dropdown.Items.Clear();\r
+            dropdown.Items.Add("Stereo");\r
+            dropdown.Items.Add("Dolby Surround");\r
+            dropdown.Items.Add("Dolby Pro Logic II");\r
+        }\r
+        private void audioEncoderChange(ComboBox audenc, ComboBox audMix, ComboBox audbit, ComboBox audsr)\r
+        {\r
+            if (audenc.Text == "AC3")\r
+            {\r
+                audMix.Enabled = false;\r
+                audbit.Enabled = false;\r
+                audsr.Enabled = false;\r
+\r
+                audMix.Text = "Automatic";\r
+                audbit.Text = "160";\r
+                audsr.Text = "Auto";\r
+            }\r
+            else\r
+            {\r
+                // Just make sure not to re-enable the following boxes if the track above is none\r
+                if (drp_track2Audio.Text != "None")\r
+                {\r
+                    audMix.Enabled = true;\r
+                    audbit.Enabled = true;\r
+                    audsr.Enabled = true;\r
+\r
+                    audMix.Text = "Automatic";\r
+                    audbit.Text = "160";\r
+                    audsr.Text = "Auto";\r
+                }\r
+            }\r
+        }\r
         #endregion\r
 \r
         #region Public Methods\r