WinGui:

- (Scratch last checkin. Audio panel now has a sensible implementation.) Audio Tracks 3 now invisible until audio track 2 has a selected track and Track 4 is also invisible until track 3 has a selected track.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index d87e937..6a4effa 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -760,20 +760,14 @@ namespace Handbrake.Functions
             {\r
                 string[] tempSub;\r
                 tempSub = track3.Split(' ');\r
-                if (tracks == "")\r
-                    tracks = " -a none,none," + tempSub[0];\r
-                else\r
-                    tracks = tracks + "," + tempSub[0];\r
+                tracks = tracks + "," + tempSub[0];\r
             }\r
 \r
             if (track4 != "None")\r
             {\r
                 string[] tempSub;\r
                 tempSub = track4.Split(' ');\r
-                if (tracks == "")\r
-                    tracks = " -a none,none,none," + tempSub[0];\r
-                else\r
-                    tracks = tracks + "," + tempSub[0];\r
+                tracks = tracks + "," + tempSub[0];\r
             }\r
 \r
             //\r
@@ -792,18 +786,12 @@ namespace Handbrake.Functions
 \r
             if (aencoder3 != "")\r
             {\r
-                if (aencoder == "")\r
-                    aencoder = " -E faac,faac," + getAudioEncoder(aencoder3);\r
-                else\r
-                    aencoder = aencoder + "," + getAudioEncoder(aencoder3);\r
+                aencoder = aencoder + "," + getAudioEncoder(aencoder3);\r
             }\r
 \r
             if (aencoder4 != "")\r
             {\r
-                if (aencoder == "")\r
-                    aencoder = " -E faac,faac,faac," + getAudioEncoder(aencoder4);\r
-                else\r
-                    aencoder = aencoder + "," + getAudioEncoder(aencoder4);\r
+                aencoder = aencoder + "," + getAudioEncoder(aencoder4);\r
             }\r
 \r
             //\r
@@ -822,18 +810,12 @@ namespace Handbrake.Functions
 \r
             if (audioBitrate3 != "")\r
             {\r
-                if (audioBitrate == "")\r
-                    audioBitrate = " -B 160,160," + audioBitrate3;\r
-                else\r
-                    audioBitrate = audioBitrate + "," + audioBitrate3;\r
+                audioBitrate = audioBitrate + "," + audioBitrate3;\r
             }\r
 \r
             if (audioBitrate4 != "")\r
             {\r
-                if (audioBitrate == "")\r
-                    audioBitrate = " -B 160,160,160," + audioBitrate4;\r
-                else\r
-                    audioBitrate = audioBitrate + "," + audioBitrate4;\r
+                audioBitrate = audioBitrate + "," + audioBitrate4;\r
             }\r
 \r
             //Audio Sample Rate   - audioSampleRate\r
@@ -851,18 +833,12 @@ namespace Handbrake.Functions
 \r
             if (audioSampleRate3 != "")\r
             {\r
-                if (audioSampleRate == "")\r
-                    audioSampleRate = " -R 48,48," + audioSampleRate3;\r
-                else\r
-                    audioSampleRate = audioSampleRate + "," + audioSampleRate3;\r
+                audioSampleRate = audioSampleRate + "," + audioSampleRate3;\r
             }\r
 \r
             if (audioSampleRate4 != "")\r
             {\r
-                if (audioSampleRate == "")\r
-                    audioSampleRate = " -R 48,48,48," + audioSampleRate4;\r
-                else\r
-                    audioSampleRate = audioSampleRate + "," + audioSampleRate4;\r
+                audioSampleRate = audioSampleRate + "," + audioSampleRate4;\r
             }\r
 \r
             //\r
@@ -916,20 +892,14 @@ namespace Handbrake.Functions
             value++;\r
             if (drc3 != "0")\r
             {\r
-                if (drc == "")\r
-                    drc = " -D 1,1," + value;\r
-                else\r
-                    drc = drc + "," + value;\r
+                drc = drc + "," + value;\r
             }\r
 \r
             value = mainWindow.trackBar4.Value / 10.0;\r
             value++;\r
             if (drc4 != "0")\r
             {\r
-                if (drc == "")\r
-                    drc = " -D 1,1,1," + value;\r
-                else\r
-                    drc = drc + "," + value;\r
+                drc = drc + "," + value;\r
             }\r
 \r
 \r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 9ab878b..9376527 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = 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
@@ -623,9 +623,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle2.Format = "N0";\r
+            dataGridViewCellStyle2.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -737,7 +737,7 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_2.Location = new System.Drawing.Point(537, 91);\r
+            this.drp_audbit_2.Location = new System.Drawing.Point(537, 92);\r
             this.drp_audbit_2.Name = "drp_audbit_2";\r
             this.drp_audbit_2.Size = new System.Drawing.Size(80, 20);\r
             this.drp_audbit_2.TabIndex = 21;\r
@@ -754,7 +754,7 @@ namespace Handbrake
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_2.Location = new System.Drawing.Point(488, 91);\r
+            this.drp_audsr_2.Location = new System.Drawing.Point(488, 92);\r
             this.drp_audsr_2.Name = "drp_audsr_2";\r
             this.drp_audsr_2.Size = new System.Drawing.Size(43, 21);\r
             this.drp_audsr_2.TabIndex = 20;\r
@@ -777,6 +777,7 @@ namespace Handbrake
             // \r
             // drp_audsr_3\r
             // \r
+            this.drp_audsr_3.Enabled = false;\r
             this.drp_audsr_3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_3.FormattingEnabled = true;\r
             this.drp_audsr_3.Items.AddRange(new object[] {\r
@@ -791,9 +792,11 @@ 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
+            this.drp_audbit_3.Enabled = false;\r
             this.drp_audbit_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audbit_3.FormattingEnabled = true;\r
             this.drp_audbit_3.Items.AddRange(new object[] {\r
@@ -813,9 +816,11 @@ 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
+            this.drp_audenc_3.Enabled = false;\r
             this.drp_audenc_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audenc_3.FormattingEnabled = true;\r
             this.drp_audenc_3.Items.AddRange(new object[] {\r
@@ -829,10 +834,12 @@ 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
             // \r
+            this.drp_audmix_3.Enabled = false;\r
             this.drp_audmix_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audmix_3.FormattingEnabled = true;\r
             this.drp_audmix_3.Items.AddRange(new object[] {\r
@@ -848,10 +855,12 @@ 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
             // \r
+            this.drp_audsr_4.Enabled = false;\r
             this.drp_audsr_4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_4.FormattingEnabled = true;\r
             this.drp_audsr_4.Items.AddRange(new object[] {\r
@@ -866,9 +875,11 @@ 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
+            this.drp_audbit_4.Enabled = false;\r
             this.drp_audbit_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audbit_4.FormattingEnabled = true;\r
             this.drp_audbit_4.Items.AddRange(new object[] {\r
@@ -888,9 +899,11 @@ 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
+            this.drp_audenc_4.Enabled = false;\r
             this.drp_audenc_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audenc_4.FormattingEnabled = true;\r
             this.drp_audenc_4.Items.AddRange(new object[] {\r
@@ -904,10 +917,12 @@ 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
             // \r
+            this.drp_audmix_4.Enabled = false;\r
             this.drp_audmix_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audmix_4.FormattingEnabled = true;\r
             this.drp_audmix_4.Items.AddRange(new object[] {\r
@@ -923,6 +938,7 @@ 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
             // DVD_Open\r
@@ -1331,6 +1347,7 @@ 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
@@ -1342,6 +1359,7 @@ 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
@@ -1367,6 +1385,7 @@ namespace Handbrake
             // \r
             // trackBar4\r
             // \r
+            this.trackBar4.Enabled = false;\r
             this.trackBar4.LargeChange = 0;\r
             this.trackBar4.Location = new System.Drawing.Point(620, 161);\r
             this.trackBar4.Margin = new System.Windows.Forms.Padding(0);\r
@@ -1375,6 +1394,7 @@ 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
@@ -1387,6 +1407,7 @@ 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
             // label21\r
@@ -1399,9 +1420,11 @@ namespace Handbrake
             this.label21.Size = new System.Drawing.Size(19, 13);\r
             this.label21.TabIndex = 32;\r
             this.label21.Text = "4:";\r
+            this.label21.Visible = false;\r
             // \r
             // trackBar3\r
             // \r
+            this.trackBar3.Enabled = false;\r
             this.trackBar3.LargeChange = 0;\r
             this.trackBar3.Location = new System.Drawing.Point(620, 123);\r
             this.trackBar3.Margin = new System.Windows.Forms.Padding(0);\r
@@ -1410,6 +1433,7 @@ 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
@@ -1422,6 +1446,7 @@ 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
             // label18\r
@@ -1434,6 +1459,7 @@ namespace Handbrake
             this.label18.Size = new System.Drawing.Size(19, 13);\r
             this.label18.TabIndex = 24;\r
             this.label18.Text = "3:";\r
+            this.label18.Visible = false;\r
             // \r
             // trackBar2\r
             // \r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 2c0df36..b2bd1e4 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -539,26 +539,22 @@ namespace Handbrake
                 drp_track1Audio.Items.Add("Automatic");\r
                 drp_track1Audio.Items.Add("None");\r
                 drp_track1Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                if (drp_track1Audio.Items.Count > 0)\r
-                    drp_track1Audio.Text = drp_track1Audio.Items[0].ToString();\r
+                drp_track1Audio.SelectedItem = 0;\r
 \r
                 drp_track2Audio.Items.Clear();\r
                 drp_track2Audio.Items.Add("None");\r
                 drp_track2Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                if (drp_track2Audio.Items.Count > 0)\r
-                    drp_track2Audio.Text = drp_track2Audio.Items[0].ToString();\r
+                drp_track1Audio.SelectedItem = 0;\r
 \r
                 drp_track3Audio.Items.Clear();\r
                 drp_track3Audio.Items.Add("None");\r
                 drp_track3Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                if (drp_track3Audio.Items.Count > 0)\r
-                    drp_track3Audio.Text = drp_track3Audio.Items[0].ToString();\r
+                drp_track1Audio.SelectedItem = 0;\r
 \r
                 drp_track4Audio.Items.Clear();\r
                 drp_track4Audio.Items.Add("None");\r
                 drp_track4Audio.Items.AddRange(selectedTitle.AudioTracks.ToArray());\r
-                if (drp_track4Audio.Items.Count > 0)\r
-                    drp_track4Audio.Text = drp_track4Audio.Items[0].ToString();\r
+                drp_track1Audio.SelectedItem = 0;\r
 \r
                 // Populate the Subtitles dropdown\r
                 drp_subtitle.Items.Clear();\r
@@ -888,10 +884,12 @@ namespace Handbrake
                 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
@@ -899,12 +897,12 @@ namespace Handbrake
                 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
-            trackBar1.Value = 0;\r
         }\r
         private void drp_track2Audio_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -914,10 +912,26 @@ namespace Handbrake
                 drp_audenc_2.Enabled = false;\r
                 drp_audsr_2.Enabled = false;\r
                 drp_audmix_2.Enabled = false;\r
+                trackBar2.Enabled = false;\r
                 drp_audbit_2.Text = "";\r
                 drp_audenc_2.Text = "";\r
                 drp_audsr_2.Text = "";\r
-                drp_audmix_2.Text = "";                \r
+                drp_audmix_2.Text = "";\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_audbit_3.Text = "";\r
+                drp_audenc_3.Text = "";\r
+                drp_audsr_3.Text = "";\r
+                drp_audmix_3.Text = "Automatic";\r
+                trackBar3.Value = 0;\r
             }\r
             else\r
             {\r
@@ -925,12 +939,25 @@ namespace Handbrake
                 drp_audenc_2.Enabled = true;\r
                 drp_audsr_2.Enabled = true;\r
                 drp_audmix_2.Enabled = true;\r
+                trackBar2.Enabled = true;\r
                 drp_audbit_2.Text = "160";\r
                 drp_audenc_2.Text = "AAC";\r
                 drp_audsr_2.Text = "48";\r
                 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_audbit_3.Text = "";\r
+                drp_audenc_3.Text = "";\r
+                drp_audsr_3.Text = "";\r
+                drp_audmix_3.Text = "";\r
             }\r
-            trackBar2.Value = 0;\r
         }\r
         private void drp_track3Audio_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -940,10 +967,26 @@ namespace Handbrake
                 drp_audenc_3.Enabled = false;\r
                 drp_audsr_3.Enabled = false;\r
                 drp_audmix_3.Enabled = false;\r
+                trackBar3.Enabled = false;\r
                 drp_audbit_3.Text = "";\r
                 drp_audenc_3.Text = "";\r
                 drp_audsr_3.Text = "";\r
                 drp_audmix_3.Text = "";\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_audbit_4.Text = "";\r
+                drp_audenc_4.Text = "";\r
+                drp_audsr_4.Text = "";\r
+                drp_audmix_4.Text = "Automatic";\r
+                \r
             }\r
             else\r
             {\r
@@ -951,12 +994,26 @@ namespace Handbrake
                 drp_audenc_3.Enabled = true;\r
                 drp_audsr_3.Enabled = true;\r
                 drp_audmix_3.Enabled = true;\r
+                trackBar3.Enabled = true;\r
                 drp_audbit_3.Text = "160";\r
                 drp_audenc_3.Text = "AAC";\r
                 drp_audsr_3.Text = "48";\r
                 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_audbit_4.Text = "";\r
+                drp_audenc_4.Text = "";\r
+                drp_audsr_4.Text = "";\r
+                drp_audmix_4.Text = "";\r
             }\r
-            trackBar3.Value = 0;\r
+            \r
         }\r
         private void drp_track4Audio_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
@@ -966,10 +1023,12 @@ namespace Handbrake
                 drp_audenc_4.Enabled = false;\r
                 drp_audsr_4.Enabled = false;\r
                 drp_audmix_4.Enabled = false;\r
+                trackBar4.Enabled = false;\r
                 drp_audbit_4.Text = "";\r
                 drp_audenc_4.Text = "";\r
                 drp_audsr_4.Text = "";\r
                 drp_audmix_4.Text = "";\r
+                trackBar4.Value = 0;\r
             }\r
             else\r
             {\r
@@ -977,12 +1036,12 @@ namespace Handbrake
                 drp_audenc_4.Enabled = true;\r
                 drp_audsr_4.Enabled = true;\r
                 drp_audmix_4.Enabled = true;\r
+                trackBar4.Enabled = true;\r
                 drp_audbit_4.Text = "160";\r
                 drp_audenc_4.Text = "AAC";\r
                 drp_audsr_4.Text = "48";\r
                 drp_audmix_4.Text = "Automatic";\r
             }\r
-            trackBar4.Value = 0;\r
         }\r
 \r
         private void drp_audioMixDown_SelectedIndexChanged(object sender, EventArgs e)\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e91100b..e9b8e49 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -149,6 +149,12 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
+  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>223, 15</value>\r
   </metadata>\r