WinGui:

- Move some code that sets the available audio bit-rates into functions instead of just repeating the code.
- Fixed some issues with the Audio panel. All tracks are now visible by default, however they will remain disabled if a previous track is not selected.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index b1408bb..4cd18b5 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -334,15 +334,6 @@ namespace Handbrake.Functions
                 mainWindow.drp_audbit_3.Enabled = false;\r
                 mainWindow.trackBar3.Enabled = false;\r
 \r
-                mainWindow.drp_track3Audio.Visible = false;\r
-                mainWindow.drp_audsr_3.Visible = false;\r
-                mainWindow.drp_audmix_3.Visible = false;\r
-                mainWindow.drp_audenc_3.Visible = false;\r
-                mainWindow.drp_audbit_3.Visible = false;\r
-                mainWindow.trackBar3.Visible = false;\r
-                mainWindow.lbl_drc3.Visible = false;\r
-                mainWindow.lbl_t3.Visible = false;\r
-\r
                 mainWindow.drp_track3Audio.Text = "None";\r
                 mainWindow.drp_audsr_3.Text = "";\r
                 mainWindow.drp_audmix_3.Text = "Automatic";\r
@@ -359,15 +350,6 @@ namespace Handbrake.Functions
                 mainWindow.drp_audenc_3.Enabled = true;\r
                 mainWindow.drp_audbit_3.Enabled = true;\r
                 mainWindow.trackBar3.Enabled = true;\r
-\r
-                mainWindow.drp_track3Audio.Visible = true;\r
-                mainWindow.drp_audsr_3.Visible = true;\r
-                mainWindow.drp_audmix_3.Visible = true;\r
-                mainWindow.drp_audenc_3.Visible = true;\r
-                mainWindow.drp_audbit_3.Visible = true;\r
-                mainWindow.trackBar3.Visible = true;\r
-                mainWindow.lbl_drc3.Visible = true;\r
-                mainWindow.lbl_t3.Visible = true;\r
             }\r
 \r
             // Handle Track 4\r
@@ -380,15 +362,6 @@ namespace Handbrake.Functions
                 mainWindow.drp_audbit_4.Enabled = false;\r
                 mainWindow.trackBar4.Enabled = false;\r
 \r
-                mainWindow.drp_track4Audio.Visible = false;\r
-                mainWindow.drp_audsr_4.Visible = false;\r
-                mainWindow.drp_audmix_4.Visible = false;\r
-                mainWindow.drp_audenc_4.Visible = false;\r
-                mainWindow.drp_audbit_4.Visible = false;\r
-                mainWindow.trackBar4.Visible = false;\r
-                mainWindow.lbl_drc4.Visible = false;\r
-                mainWindow.lbl_t4.Visible = false;\r
-\r
                 mainWindow.drp_track4Audio.Text = "None";\r
                 mainWindow.drp_audsr_4.Text = "";\r
                 mainWindow.drp_audmix_4.Text = "Automatic";\r
@@ -404,15 +377,6 @@ namespace Handbrake.Functions
                 mainWindow.drp_audenc_4.Enabled = true;\r
                 mainWindow.drp_audbit_4.Enabled = true;\r
                 mainWindow.trackBar4.Enabled = true;\r
-\r
-                mainWindow.drp_track4Audio.Visible = true;\r
-                mainWindow.drp_audsr_4.Visible = true;\r
-                mainWindow.drp_audmix_4.Visible = true;\r
-                mainWindow.drp_audenc_4.Visible = true;\r
-                mainWindow.drp_audbit_4.Visible = true;\r
-                mainWindow.trackBar4.Visible = true;\r
-                mainWindow.lbl_drc4.Visible = true;\r
-                mainWindow.lbl_t4.Visible = true;\r
             }\r
 \r
             // Now lets start setting stuff\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index ad7f0ce..e2e6df1 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.Label Label38;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -81,6 +81,8 @@ namespace Handbrake
             this.drp_audbit_4 = new System.Windows.Forms.ComboBox();\r
             this.drp_audenc_4 = new System.Windows.Forms.ComboBox();\r
             this.drp_audmix_4 = new System.Windows.Forms.ComboBox();\r
+            this.lbl_RecomendedCrop = new System.Windows.Forms.Label();\r
+            this.Label8 = new System.Windows.Forms.Label();\r
             this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog();\r
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
@@ -179,8 +181,6 @@ namespace Handbrake
             this.check_detelecine = new System.Windows.Forms.CheckBox();\r
             this.label4 = new System.Windows.Forms.Label();\r
             this.drp_deInterlace_option = new System.Windows.Forms.ComboBox();\r
-            this.lbl_RecomendedCrop = new System.Windows.Forms.Label();\r
-            this.Label8 = new System.Windows.Forms.Label();\r
             this.Label1 = new System.Windows.Forms.Label();\r
             this.Label53 = new System.Windows.Forms.Label();\r
             this.Label52 = new System.Windows.Forms.Label();\r
@@ -621,9 +621,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle2.Format = "N0";\r
-            dataGridViewCellStyle2.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle3.Format = "N0";\r
+            dataGridViewCellStyle3.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -790,7 +790,6 @@ namespace Handbrake
             this.drp_audsr_3.TabIndex = 28;\r
             this.drp_audsr_3.Text = "48";\r
             this.ToolTip.SetToolTip(this.drp_audsr_3, "Set the Audio Sample Rate");\r
-            this.drp_audsr_3.Visible = false;\r
             // \r
             // drp_audbit_3\r
             // \r
@@ -814,7 +813,6 @@ namespace Handbrake
             this.drp_audbit_3.TabIndex = 29;\r
             this.drp_audbit_3.Text = "160";\r
             this.ToolTip.SetToolTip(this.drp_audbit_3, "Set the Audio Bit-Rate");\r
-            this.drp_audbit_3.Visible = false;\r
             // \r
             // drp_audenc_3\r
             // \r
@@ -832,7 +830,6 @@ namespace Handbrake
             this.drp_audenc_3.TabIndex = 26;\r
             this.drp_audenc_3.Text = "AAC";\r
             this.ToolTip.SetToolTip(this.drp_audenc_3, "Select an audio encoder.");\r
-            this.drp_audenc_3.Visible = false;\r
             this.drp_audenc_3.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_3_SelectedIndexChanged);\r
             // \r
             // drp_audmix_3\r
@@ -853,7 +850,6 @@ namespace Handbrake
             this.drp_audmix_3.TabIndex = 27;\r
             this.drp_audmix_3.Text = "Automatic";\r
             this.ToolTip.SetToolTip(this.drp_audmix_3, "Please note: Some options require a 5.1 audio channel to be selected");\r
-            this.drp_audmix_3.Visible = false;\r
             this.drp_audmix_3.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_3_SelectedIndexChanged);\r
             // \r
             // drp_audsr_4\r
@@ -873,7 +869,6 @@ namespace Handbrake
             this.drp_audsr_4.TabIndex = 36;\r
             this.drp_audsr_4.Text = "48";\r
             this.ToolTip.SetToolTip(this.drp_audsr_4, "Set the Audio Sample Rate");\r
-            this.drp_audsr_4.Visible = false;\r
             // \r
             // drp_audbit_4\r
             // \r
@@ -897,7 +892,6 @@ namespace Handbrake
             this.drp_audbit_4.TabIndex = 37;\r
             this.drp_audbit_4.Text = "160";\r
             this.ToolTip.SetToolTip(this.drp_audbit_4, "Set the Audio Bit-Rate");\r
-            this.drp_audbit_4.Visible = false;\r
             // \r
             // drp_audenc_4\r
             // \r
@@ -915,7 +909,6 @@ namespace Handbrake
             this.drp_audenc_4.TabIndex = 34;\r
             this.drp_audenc_4.Text = "AAC";\r
             this.ToolTip.SetToolTip(this.drp_audenc_4, "Select an audio encoder.");\r
-            this.drp_audenc_4.Visible = false;\r
             this.drp_audenc_4.SelectedIndexChanged += new System.EventHandler(this.drp_audenc_4_SelectedIndexChanged);\r
             // \r
             // drp_audmix_4\r
@@ -936,9 +929,31 @@ namespace Handbrake
             this.drp_audmix_4.TabIndex = 35;\r
             this.drp_audmix_4.Text = "Automatic";\r
             this.ToolTip.SetToolTip(this.drp_audmix_4, "Please note: Some options require a 5.1 audio channel to be selected");\r
-            this.drp_audmix_4.Visible = false;\r
             this.drp_audmix_4.SelectedIndexChanged += new System.EventHandler(this.drp_audmix_4_SelectedIndexChanged);\r
             // \r
+            // lbl_RecomendedCrop\r
+            // \r
+            this.lbl_RecomendedCrop.AutoSize = true;\r
+            this.lbl_RecomendedCrop.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_RecomendedCrop.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_RecomendedCrop.Location = new System.Drawing.Point(116, 69);\r
+            this.lbl_RecomendedCrop.Name = "lbl_RecomendedCrop";\r
+            this.lbl_RecomendedCrop.Size = new System.Drawing.Size(72, 12);\r
+            this.lbl_RecomendedCrop.TabIndex = 4;\r
+            this.lbl_RecomendedCrop.Text = "Select a Title";\r
+            this.ToolTip.SetToolTip(this.lbl_RecomendedCrop, "Top / Bottom / Left / Right");\r
+            // \r
+            // Label8\r
+            // \r
+            this.Label8.AutoSize = true;\r
+            this.Label8.BackColor = System.Drawing.Color.Transparent;\r
+            this.Label8.Location = new System.Drawing.Point(13, 68);\r
+            this.Label8.Name = "Label8";\r
+            this.Label8.Size = new System.Drawing.Size(70, 13);\r
+            this.Label8.TabIndex = 2;\r
+            this.Label8.Text = "Auto Crop:";\r
+            this.ToolTip.SetToolTip(this.Label8, "Top / Bottom / Left / Right");\r
+            // \r
             // DVD_Open\r
             // \r
             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drive.";\r
@@ -1345,7 +1360,6 @@ namespace Handbrake
             this.lbl_drc4.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_drc4.TabIndex = 39;\r
             this.lbl_drc4.Text = "1:";\r
-            this.lbl_drc4.Visible = false;\r
             // \r
             // lbl_drc3\r
             // \r
@@ -1357,7 +1371,6 @@ namespace Handbrake
             this.lbl_drc3.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_drc3.TabIndex = 31;\r
             this.lbl_drc3.Text = "1:";\r
-            this.lbl_drc3.Visible = false;\r
             // \r
             // lbl_drc2\r
             // \r
@@ -1392,7 +1405,6 @@ namespace Handbrake
             this.trackBar4.Size = new System.Drawing.Size(49, 42);\r
             this.trackBar4.TabIndex = 38;\r
             this.trackBar4.TickFrequency = 10;\r
-            this.trackBar4.Visible = false;\r
             this.trackBar4.ValueChanged += new System.EventHandler(this.trackBar4_Scroll);\r
             // \r
             // drp_track4Audio\r
@@ -1405,7 +1417,6 @@ namespace Handbrake
             this.drp_track4Audio.Name = "drp_track4Audio";\r
             this.drp_track4Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track4Audio.TabIndex = 33;\r
-            this.drp_track4Audio.Visible = false;\r
             this.drp_track4Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track4Audio_SelectedIndexChanged);\r
             // \r
             // lbl_t4\r
@@ -1418,7 +1429,6 @@ namespace Handbrake
             this.lbl_t4.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_t4.TabIndex = 32;\r
             this.lbl_t4.Text = "4:";\r
-            this.lbl_t4.Visible = false;\r
             // \r
             // trackBar3\r
             // \r
@@ -1431,7 +1441,6 @@ namespace Handbrake
             this.trackBar3.Size = new System.Drawing.Size(49, 42);\r
             this.trackBar3.TabIndex = 30;\r
             this.trackBar3.TickFrequency = 10;\r
-            this.trackBar3.Visible = false;\r
             this.trackBar3.ValueChanged += new System.EventHandler(this.trackBar3_Scroll);\r
             // \r
             // drp_track3Audio\r
@@ -1444,7 +1453,6 @@ namespace Handbrake
             this.drp_track3Audio.Name = "drp_track3Audio";\r
             this.drp_track3Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track3Audio.TabIndex = 25;\r
-            this.drp_track3Audio.Visible = false;\r
             this.drp_track3Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track3Audio_SelectedIndexChanged);\r
             // \r
             // lbl_t3\r
@@ -1457,7 +1465,6 @@ namespace Handbrake
             this.lbl_t3.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_t3.TabIndex = 24;\r
             this.lbl_t3.Text = "3:";\r
-            this.lbl_t3.Visible = false;\r
             // \r
             // trackBar2\r
             // \r
@@ -1638,13 +1645,11 @@ namespace Handbrake
             this.drp_track1Audio.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_track1Audio.FormattingEnabled = true;\r
             this.drp_track1Audio.Items.AddRange(new object[] {\r
-            "Automatic",\r
-            "None"});\r
+            "Automatic"});\r
             this.drp_track1Audio.Location = new System.Drawing.Point(36, 54);\r
             this.drp_track1Audio.Name = "drp_track1Audio";\r
             this.drp_track1Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track1Audio.TabIndex = 3;\r
-            this.drp_track1Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track1Audio_SelectedIndexChanged);\r
             // \r
             // Label32\r
             // \r
@@ -2068,29 +2073,6 @@ namespace Handbrake
             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deInterlace_option.TabIndex = 17;\r
             // \r
-            // lbl_RecomendedCrop\r
-            // \r
-            this.lbl_RecomendedCrop.AutoSize = true;\r
-            this.lbl_RecomendedCrop.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_RecomendedCrop.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_RecomendedCrop.Location = new System.Drawing.Point(116, 69);\r
-            this.lbl_RecomendedCrop.Name = "lbl_RecomendedCrop";\r
-            this.lbl_RecomendedCrop.Size = new System.Drawing.Size(72, 12);\r
-            this.lbl_RecomendedCrop.TabIndex = 4;\r
-            this.lbl_RecomendedCrop.Text = "Select a Title";\r
-            this.ToolTip.SetToolTip(this.lbl_RecomendedCrop, "Top / Bottom / Left / Right");\r
-            // \r
-            // Label8\r
-            // \r
-            this.Label8.AutoSize = true;\r
-            this.Label8.BackColor = System.Drawing.Color.Transparent;\r
-            this.Label8.Location = new System.Drawing.Point(13, 68);\r
-            this.Label8.Name = "Label8";\r
-            this.Label8.Size = new System.Drawing.Size(70, 13);\r
-            this.Label8.TabIndex = 2;\r
-            this.Label8.Text = "Auto Crop:";\r
-            this.ToolTip.SetToolTip(this.Label8, "Top / Bottom / Left / Right");\r
-            // \r
             // Label1\r
             // \r
             this.Label1.AutoSize = true;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 978d9b0..cb8dd7e 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -871,34 +871,6 @@ namespace Handbrake
         }\r
 \r
         // Audio Tab\r
-        private void drp_track1Audio_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            if (drp_track1Audio.SelectedItem.Equals("None"))\r
-            {\r
-                drp_audbit_1.Enabled = false;\r
-                drp_audenc_1.Enabled = false;\r
-                drp_audsr_1.Enabled = false;\r
-                drp_audmix_1.Enabled = false;\r
-                trackBar1.Enabled = false;\r
-                drp_audbit_1.Text = "";\r
-                drp_audenc_1.Text = "";\r
-                drp_audsr_1.Text = "";\r
-                drp_audmix_1.Text = "";\r
-                trackBar1.Value = 0;\r
-            }\r
-            else\r
-            {\r
-                drp_audbit_1.Enabled = true;\r
-                drp_audenc_1.Enabled = true;\r
-                drp_audsr_1.Enabled = true;\r
-                drp_audmix_1.Enabled = true;\r
-                trackBar1.Enabled = true;\r
-                drp_audbit_1.Text = "160";\r
-                drp_audenc_1.Text = "AAC";\r
-                drp_audsr_1.Text = "48";\r
-                drp_audmix_1.Text = "Automatic";\r
-            }\r
-        }\r
         private void drp_track2Audio_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (drp_track2Audio.SelectedItem.Equals("None"))\r
@@ -911,17 +883,12 @@ namespace Handbrake
                 drp_audbit_2.Text = "";\r
                 drp_audenc_2.Text = "";\r
                 drp_audsr_2.Text = "";\r
-                drp_audmix_2.Text = "";\r
+                drp_audmix_2.Text = "Automatic";\r
                 trackBar2.Value = 0;\r
 \r
                 // Disable the 3rd Track.\r
-                drp_track3Audio.Visible = false;\r
-                drp_audbit_3.Visible = false;\r
-                drp_audenc_3.Visible = false;\r
-                drp_audsr_3.Visible = false;\r
-                drp_audmix_3.Visible = false;\r
-                trackBar3.Visible = false;\r
-                lbl_drc3.Visible = false;\r
+                drp_track3Audio.Enabled = false;\r
+                drp_track3Audio.Text = "None";\r
                 drp_audbit_3.Text = "";\r
                 drp_audenc_3.Text = "";\r
                 drp_audsr_3.Text = "";\r
@@ -941,17 +908,11 @@ namespace Handbrake
                 drp_audmix_2.Text = "Automatic";\r
 \r
                 // Enable the 3rd Track.\r
-                drp_track3Audio.Visible = true;\r
-                drp_audbit_3.Visible = true;\r
-                drp_audenc_3.Visible = true;\r
-                drp_audsr_3.Visible = true;\r
-                drp_audmix_3.Visible = true;\r
-                trackBar3.Visible = true;\r
-                lbl_drc3.Visible = true;\r
+                drp_track3Audio.Enabled = true;\r
                 drp_audbit_3.Text = "";\r
                 drp_audenc_3.Text = "";\r
                 drp_audsr_3.Text = "";\r
-                drp_audmix_3.Text = "";\r
+                drp_audmix_3.Text = "Automatic";\r
             }\r
         }\r
         private void drp_track3Audio_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -966,17 +927,12 @@ namespace Handbrake
                 drp_audbit_3.Text = "";\r
                 drp_audenc_3.Text = "";\r
                 drp_audsr_3.Text = "";\r
-                drp_audmix_3.Text = "";\r
+                drp_audmix_3.Text = "Automatic";\r
                 trackBar3.Value = 0;\r
 \r
                 // Disable the 4th Track.\r
-                drp_track4Audio.Visible = false;\r
-                drp_audbit_4.Visible = false;\r
-                drp_audenc_4.Visible = false;\r
-                drp_audsr_4.Visible = false;\r
-                drp_audmix_4.Visible = false;\r
-                trackBar4.Visible = false;\r
-                lbl_drc4.Visible = false;\r
+                drp_track4Audio.Enabled = false;\r
+                drp_track4Audio.Text = "None";\r
                 drp_audbit_4.Text = "";\r
                 drp_audenc_4.Text = "";\r
                 drp_audsr_4.Text = "";\r
@@ -996,17 +952,11 @@ namespace Handbrake
                 drp_audmix_3.Text = "Automatic";\r
 \r
                 // Enable the 4th Track.\r
-                drp_track4Audio.Visible = true;\r
-                drp_audbit_4.Visible = true;\r
-                drp_audenc_4.Visible = true;\r
-                drp_audsr_4.Visible = true;\r
-                drp_audmix_4.Visible = true;\r
-                trackBar4.Visible = true;\r
-                lbl_drc4.Visible = true;\r
+                drp_track4Audio.Enabled = true;\r
                 drp_audbit_4.Text = "";\r
                 drp_audenc_4.Text = "";\r
                 drp_audsr_4.Text = "";\r
-                drp_audmix_4.Text = "";\r
+                drp_audmix_4.Text = "Automatic";\r
             }\r
             \r
         }\r
@@ -1022,7 +972,7 @@ namespace Handbrake
                 drp_audbit_4.Text = "";\r
                 drp_audenc_4.Text = "";\r
                 drp_audsr_4.Text = "";\r
-                drp_audmix_4.Text = "";\r
+                drp_audmix_4.Text = "Automatic";\r
                 trackBar4.Value = 0;\r
             }\r
             else\r
@@ -1042,37 +992,10 @@ namespace Handbrake
         private void drp_audioMixDown_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text == "6 Channel Discrete"))\r
-            {\r
-                drp_audbit_1.Items.Clear();\r
-                drp_audbit_1.Items.Add("32");\r
-                drp_audbit_1.Items.Add("40");\r
-                drp_audbit_1.Items.Add("48");\r
-                drp_audbit_1.Items.Add("56");\r
-                drp_audbit_1.Items.Add("64");\r
-                drp_audbit_1.Items.Add("80");\r
-                drp_audbit_1.Items.Add("86");\r
-                drp_audbit_1.Items.Add("112");\r
-                drp_audbit_1.Items.Add("128");\r
-                drp_audbit_1.Items.Add("160");\r
-                drp_audbit_1.Items.Add("192");\r
-                drp_audbit_1.Items.Add("224");\r
-                drp_audbit_1.Items.Add("256");\r
-                drp_audbit_1.Items.Add("320");\r
-                drp_audbit_1.Items.Add("384");\r
-            }\r
+                setBitrateSelections384(drp_audbit_1);\r
             else if ((drp_audenc_1.Text == "AAC") && (drp_audmix_1.Text != "6 Channel Discrete"))\r
             {\r
-                drp_audbit_1.Items.Clear();\r
-                drp_audbit_1.Items.Add("32");\r
-                drp_audbit_1.Items.Add("40");\r
-                drp_audbit_1.Items.Add("48");\r
-                drp_audbit_1.Items.Add("56");\r
-                drp_audbit_1.Items.Add("64");\r
-                drp_audbit_1.Items.Add("80");\r
-                drp_audbit_1.Items.Add("86");\r
-                drp_audbit_1.Items.Add("112");\r
-                drp_audbit_1.Items.Add("128");\r
-                drp_audbit_1.Items.Add("160");\r
+                setBitrateSelections160(drp_audbit_1);\r
                 drp_audbit_1.Text = "160";\r
             }\r
         }\r
@@ -1082,37 +1005,10 @@ namespace Handbrake
                 MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
 \r
             if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text == "6 Channel Discrete"))\r
-            {\r
-                drp_audbit_2.Items.Clear();\r
-                drp_audbit_2.Items.Add("32");\r
-                drp_audbit_2.Items.Add("40");\r
-                drp_audbit_2.Items.Add("48");\r
-                drp_audbit_2.Items.Add("56");\r
-                drp_audbit_2.Items.Add("64");\r
-                drp_audbit_2.Items.Add("80");\r
-                drp_audbit_2.Items.Add("86");\r
-                drp_audbit_2.Items.Add("112");\r
-                drp_audbit_2.Items.Add("128");\r
-                drp_audbit_2.Items.Add("160");\r
-                drp_audbit_2.Items.Add("192");\r
-                drp_audbit_2.Items.Add("224");\r
-                drp_audbit_2.Items.Add("256");\r
-                drp_audbit_2.Items.Add("320");\r
-                drp_audbit_2.Items.Add("384");\r
-            }\r
+                setBitrateSelections384(drp_audbit_2);\r
             else if ((drp_audenc_2.Text == "AAC") && (drp_audmix_2.Text != "6 Channel Discrete"))\r
             {\r
-                drp_audbit_2.Items.Clear();\r
-                drp_audbit_2.Items.Add("32");\r
-                drp_audbit_2.Items.Add("40");\r
-                drp_audbit_2.Items.Add("48");\r
-                drp_audbit_2.Items.Add("56");\r
-                drp_audbit_2.Items.Add("64");\r
-                drp_audbit_2.Items.Add("80");\r
-                drp_audbit_2.Items.Add("86");\r
-                drp_audbit_2.Items.Add("112");\r
-                drp_audbit_2.Items.Add("128");\r
-                drp_audbit_2.Items.Add("160");\r
+                setBitrateSelections160(drp_audbit_2);\r
                 drp_audbit_2.Text = "160";\r
             }\r
         }\r
@@ -1122,37 +1018,10 @@ namespace Handbrake
                 MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
 \r
             if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text == "6 Channel Discrete"))\r
-            {\r
-                drp_audbit_3.Items.Clear();\r
-                drp_audbit_3.Items.Add("32");\r
-                drp_audbit_3.Items.Add("40");\r
-                drp_audbit_3.Items.Add("48");\r
-                drp_audbit_3.Items.Add("56");\r
-                drp_audbit_3.Items.Add("64");\r
-                drp_audbit_3.Items.Add("80");\r
-                drp_audbit_3.Items.Add("86");\r
-                drp_audbit_3.Items.Add("112");\r
-                drp_audbit_3.Items.Add("128");\r
-                drp_audbit_3.Items.Add("160");\r
-                drp_audbit_3.Items.Add("192");\r
-                drp_audbit_3.Items.Add("224");\r
-                drp_audbit_3.Items.Add("256");\r
-                drp_audbit_3.Items.Add("320");\r
-                drp_audbit_3.Items.Add("384");\r
-            }\r
+                setBitrateSelections384(drp_audbit_3);\r
             else if ((drp_audenc_3.Text == "AAC") && (drp_audmix_3.Text != "6 Channel Discrete"))\r
             {\r
-                drp_audbit_3.Items.Clear();\r
-                drp_audbit_3.Items.Add("32");\r
-                drp_audbit_3.Items.Add("40");\r
-                drp_audbit_3.Items.Add("48");\r
-                drp_audbit_3.Items.Add("56");\r
-                drp_audbit_3.Items.Add("64");\r
-                drp_audbit_3.Items.Add("80");\r
-                drp_audbit_3.Items.Add("86");\r
-                drp_audbit_3.Items.Add("112");\r
-                drp_audbit_3.Items.Add("128");\r
-                drp_audbit_3.Items.Add("160");\r
+                setBitrateSelections160(drp_audbit_3);\r
                 drp_audbit_3.Text = "160";\r
             }\r
         }\r
@@ -1162,37 +1031,10 @@ namespace Handbrake
                 MessageBox.Show("Please select a mixdown for the previous track(s).", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
 \r
             if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text == "6 Channel Discrete"))\r
-            {\r
-                drp_audbit_4.Items.Clear();\r
-                drp_audbit_4.Items.Add("32");\r
-                drp_audbit_4.Items.Add("40");\r
-                drp_audbit_4.Items.Add("48");\r
-                drp_audbit_4.Items.Add("56");\r
-                drp_audbit_4.Items.Add("64");\r
-                drp_audbit_4.Items.Add("80");\r
-                drp_audbit_4.Items.Add("86");\r
-                drp_audbit_4.Items.Add("112");\r
-                drp_audbit_4.Items.Add("128");\r
-                drp_audbit_4.Items.Add("160");\r
-                drp_audbit_4.Items.Add("192");\r
-                drp_audbit_4.Items.Add("224");\r
-                drp_audbit_4.Items.Add("256");\r
-                drp_audbit_4.Items.Add("320");\r
-                drp_audbit_4.Items.Add("384");\r
-            }\r
+                setBitrateSelections384(drp_audbit_4);\r
             else if ((drp_audenc_4.Text == "AAC") && (drp_audmix_4.Text != "6 Channel Discrete"))\r
             {\r
-                drp_audbit_4.Items.Clear();\r
-                drp_audbit_4.Items.Add("32");\r
-                drp_audbit_4.Items.Add("40");\r
-                drp_audbit_4.Items.Add("48");\r
-                drp_audbit_4.Items.Add("56");\r
-                drp_audbit_4.Items.Add("64");\r
-                drp_audbit_4.Items.Add("80");\r
-                drp_audbit_4.Items.Add("86");\r
-                drp_audbit_4.Items.Add("112");\r
-                drp_audbit_4.Items.Add("128");\r
-                drp_audbit_4.Items.Add("160");\r
+                setBitrateSelections160(drp_audbit_4);\r
                 drp_audbit_4.Text = "160";\r
             }\r
         }\r
@@ -1226,18 +1068,7 @@ namespace Handbrake
                 drp_audmix_1.Items.Add("Dolby Pro Logic II");\r
                 drp_audmix_1.Items.Add("6 Channel Discrete");\r
 \r
-                drp_audbit_1.Items.Clear();\r
-                drp_audbit_1.Items.Add("32");\r
-                drp_audbit_1.Items.Add("40");\r
-                drp_audbit_1.Items.Add("48");\r
-                drp_audbit_1.Items.Add("56");\r
-                drp_audbit_1.Items.Add("64");\r
-                drp_audbit_1.Items.Add("80");\r
-                drp_audbit_1.Items.Add("86");\r
-                drp_audbit_1.Items.Add("112");\r
-                drp_audbit_1.Items.Add("128");\r
-                drp_audbit_1.Items.Add("160");\r
-\r
+                setBitrateSelections160(drp_audbit_1);\r
             }\r
             else\r
             {\r
@@ -1246,21 +1077,7 @@ namespace Handbrake
                 drp_audmix_1.Items.Add("Dolby Surround");\r
                 drp_audmix_1.Items.Add("Dolby Pro Logic II");\r
 \r
-                drp_audbit_1.Items.Clear();\r
-                drp_audbit_1.Items.Add("32");\r
-                drp_audbit_1.Items.Add("40");\r
-                drp_audbit_1.Items.Add("48");\r
-                drp_audbit_1.Items.Add("56");\r
-                drp_audbit_1.Items.Add("64");\r
-                drp_audbit_1.Items.Add("80");\r
-                drp_audbit_1.Items.Add("86");\r
-                drp_audbit_1.Items.Add("112");\r
-                drp_audbit_1.Items.Add("128");\r
-                drp_audbit_1.Items.Add("160");\r
-                drp_audbit_1.Items.Add("192");\r
-                drp_audbit_1.Items.Add("224");\r
-                drp_audbit_1.Items.Add("256");\r
-                drp_audbit_1.Items.Add("320");\r
+                setBitrateSelections320(drp_audbit_1);\r
             }\r
         }\r
         private void drp_audenc_2_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -1299,18 +1116,7 @@ namespace Handbrake
                 drp_audmix_2.Items.Add("Dolby Pro Logic II");\r
                 drp_audmix_2.Items.Add("6 Channel Discrete");\r
 \r
-                drp_audbit_2.Items.Clear();\r
-                drp_audbit_2.Items.Add("32");\r
-                drp_audbit_2.Items.Add("40");\r
-                drp_audbit_2.Items.Add("48");\r
-                drp_audbit_2.Items.Add("56");\r
-                drp_audbit_2.Items.Add("64");\r
-                drp_audbit_2.Items.Add("80");\r
-                drp_audbit_2.Items.Add("86");\r
-                drp_audbit_2.Items.Add("112");\r
-                drp_audbit_2.Items.Add("128");\r
-                drp_audbit_2.Items.Add("160");\r
-\r
+                setBitrateSelections160(drp_audbit_2);\r
             }\r
             else\r
             {\r
@@ -1319,21 +1125,7 @@ namespace Handbrake
                 drp_audmix_2.Items.Add("Dolby Surround");\r
                 drp_audmix_2.Items.Add("Dolby Pro Logic II");\r
 \r
-                drp_audbit_2.Items.Clear();\r
-                drp_audbit_2.Items.Add("32");\r
-                drp_audbit_2.Items.Add("40");\r
-                drp_audbit_2.Items.Add("48");\r
-                drp_audbit_2.Items.Add("56");\r
-                drp_audbit_2.Items.Add("64");\r
-                drp_audbit_2.Items.Add("80");\r
-                drp_audbit_2.Items.Add("86");\r
-                drp_audbit_2.Items.Add("112");\r
-                drp_audbit_2.Items.Add("128");\r
-                drp_audbit_2.Items.Add("160");\r
-                drp_audbit_2.Items.Add("192");\r
-                drp_audbit_2.Items.Add("224");\r
-                drp_audbit_2.Items.Add("256");\r
-                drp_audbit_2.Items.Add("320");\r
+                setBitrateSelections320(drp_audbit_2);\r
             }\r
         }\r
         private void drp_audenc_3_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -1373,18 +1165,7 @@ namespace Handbrake
                 drp_audmix_3.Items.Add("Dolby Pro Logic II");\r
                 drp_audmix_3.Items.Add("6 Channel Discrete");\r
 \r
-                drp_audbit_3.Items.Clear();\r
-                drp_audbit_3.Items.Add("32");\r
-                drp_audbit_3.Items.Add("40");\r
-                drp_audbit_3.Items.Add("48");\r
-                drp_audbit_3.Items.Add("56");\r
-                drp_audbit_3.Items.Add("64");\r
-                drp_audbit_3.Items.Add("80");\r
-                drp_audbit_3.Items.Add("86");\r
-                drp_audbit_3.Items.Add("112");\r
-                drp_audbit_3.Items.Add("128");\r
-                drp_audbit_3.Items.Add("160");\r
-\r
+                setBitrateSelections160(drp_audbit_3);\r
             }\r
             else\r
             {\r
@@ -1393,21 +1174,7 @@ namespace Handbrake
                 drp_audmix_3.Items.Add("Dolby Surround");\r
                 drp_audmix_3.Items.Add("Dolby Pro Logic II");\r
 \r
-                drp_audbit_3.Items.Clear();\r
-                drp_audbit_3.Items.Add("32");\r
-                drp_audbit_3.Items.Add("40");\r
-                drp_audbit_3.Items.Add("48");\r
-                drp_audbit_3.Items.Add("56");\r
-                drp_audbit_3.Items.Add("64");\r
-                drp_audbit_3.Items.Add("80");\r
-                drp_audbit_3.Items.Add("86");\r
-                drp_audbit_3.Items.Add("112");\r
-                drp_audbit_3.Items.Add("128");\r
-                drp_audbit_3.Items.Add("160");\r
-                drp_audbit_3.Items.Add("192");\r
-                drp_audbit_3.Items.Add("224");\r
-                drp_audbit_3.Items.Add("256");\r
-                drp_audbit_3.Items.Add("320");\r
+                setBitrateSelections320(drp_audbit_3);\r
             }\r
         }\r
         private void drp_audenc_4_SelectedIndexChanged(object sender, EventArgs e)\r
@@ -1447,18 +1214,7 @@ namespace Handbrake
                 drp_audmix_4.Items.Add("Dolby Pro Logic II");\r
                 drp_audmix_4.Items.Add("6 Channel Discrete");\r
 \r
-                drp_audbit_4.Items.Clear();\r
-                drp_audbit_4.Items.Add("32");\r
-                drp_audbit_4.Items.Add("40");\r
-                drp_audbit_4.Items.Add("48");\r
-                drp_audbit_4.Items.Add("56");\r
-                drp_audbit_4.Items.Add("64");\r
-                drp_audbit_4.Items.Add("80");\r
-                drp_audbit_4.Items.Add("86");\r
-                drp_audbit_4.Items.Add("112");\r
-                drp_audbit_4.Items.Add("128");\r
-                drp_audbit_4.Items.Add("160");\r
-\r
+                setBitrateSelections160(drp_audbit_4);\r
             }\r
             else\r
             {\r
@@ -1467,21 +1223,7 @@ namespace Handbrake
                 drp_audmix_4.Items.Add("Dolby Surround");\r
                 drp_audmix_4.Items.Add("Dolby Pro Logic II");\r
 \r
-                drp_audbit_4.Items.Clear();\r
-                drp_audbit_4.Items.Add("32");\r
-                drp_audbit_4.Items.Add("40");\r
-                drp_audbit_4.Items.Add("48");\r
-                drp_audbit_4.Items.Add("56");\r
-                drp_audbit_4.Items.Add("64");\r
-                drp_audbit_4.Items.Add("80");\r
-                drp_audbit_4.Items.Add("86");\r
-                drp_audbit_4.Items.Add("112");\r
-                drp_audbit_4.Items.Add("128");\r
-                drp_audbit_4.Items.Add("160");\r
-                drp_audbit_4.Items.Add("192");\r
-                drp_audbit_4.Items.Add("224");\r
-                drp_audbit_4.Items.Add("256");\r
-                drp_audbit_4.Items.Add("320");\r
+                setBitrateSelections320(drp_audbit_4);\r
             }\r
         }\r
 \r
@@ -1991,6 +1733,57 @@ namespace Handbrake
                 drp_videoEncoder.Text = oldval;\r
             }\r
         }\r
+        private void setBitrateSelections384(ComboBox dropDown)\r
+        {\r
+            dropDown.Items.Clear();\r
+            dropDown.Items.Add("32");\r
+            dropDown.Items.Add("40");\r
+            dropDown.Items.Add("48");\r
+            dropDown.Items.Add("56");\r
+            dropDown.Items.Add("64");\r
+            dropDown.Items.Add("80");\r
+            dropDown.Items.Add("86");\r
+            dropDown.Items.Add("112");\r
+            dropDown.Items.Add("128");\r
+            dropDown.Items.Add("160");\r
+            dropDown.Items.Add("192");\r
+            dropDown.Items.Add("224");\r
+            dropDown.Items.Add("256");\r
+            dropDown.Items.Add("320");\r
+            dropDown.Items.Add("384");\r
+        }\r
+        private void setBitrateSelections320(ComboBox dropDown)\r
+        {\r
+            dropDown.Items.Clear();\r
+            dropDown.Items.Add("32");\r
+            dropDown.Items.Add("40");\r
+            dropDown.Items.Add("48");\r
+            dropDown.Items.Add("56");\r
+            dropDown.Items.Add("64");\r
+            dropDown.Items.Add("80");\r
+            dropDown.Items.Add("86");\r
+            dropDown.Items.Add("112");\r
+            dropDown.Items.Add("128");\r
+            dropDown.Items.Add("160");\r
+            dropDown.Items.Add("192");\r
+            dropDown.Items.Add("224");\r
+            dropDown.Items.Add("256");\r
+            dropDown.Items.Add("320");\r
+        }\r
+        private void setBitrateSelections160(ComboBox dropDown)\r
+        {\r
+            dropDown.Items.Clear();\r
+            dropDown.Items.Add("32");\r
+            dropDown.Items.Add("40");\r
+            dropDown.Items.Add("48");\r
+            dropDown.Items.Add("56");\r
+            dropDown.Items.Add("64");\r
+            dropDown.Items.Add("80");\r
+            dropDown.Items.Add("86");\r
+            dropDown.Items.Add("112");\r
+            dropDown.Items.Add("128");\r
+            dropDown.Items.Add("160");\r
+        }\r
 \r
         // Preset system functions\r
         private void addPresetToList(ArrayList presetNameList)\r