WinGui:

- Setup Auto for Audio Sample Rate.  (Passes 0 to CLI when set to Auto.)

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 61bd8e5..0e772cf 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -855,14 +855,14 @@ namespace Handbrake.Functions
             //Audio Sample Rate   - audioSampleRate\r
 \r
             if (audioSampleRate1 != "")\r
-                audioSampleRate = " -R " + audioSampleRate1;\r
+                audioSampleRate = " -R " + audioSampleRate1.Replace("Auto", "0");\r
 \r
             if (audioSampleRate2 != "")\r
             {\r
                 if (audioSampleRate == "")\r
-                    audioSampleRate = " -R 48," + audioSampleRate2;\r
+                    audioSampleRate = " -R 0," + audioSampleRate2.Replace("Auto", "0");\r
                 else\r
-                    audioSampleRate = audioSampleRate + "," + audioSampleRate2;\r
+                    audioSampleRate = audioSampleRate + "," + audioSampleRate2.Replace("Auto", "0");\r
             }\r
             else\r
             {\r
@@ -872,21 +872,21 @@ namespace Handbrake.Functions
                 if ((track2 != "") && (track2 != "None"))\r
                 {\r
                     if (audioSampleRate == "")\r
-                        audioSampleRate = " -R 48,48";\r
+                        audioSampleRate = " -R 0,0";\r
                     else\r
-                        audioSampleRate = audioSampleRate + ",48";\r
+                        audioSampleRate = audioSampleRate + ",0";\r
                 }\r
 \r
             }\r
 \r
             if (audioSampleRate3 != "")\r
             {\r
-                audioSampleRate = audioSampleRate + "," + audioSampleRate3;\r
+                audioSampleRate = audioSampleRate + "," + audioSampleRate3.Replace("Auto", "0");\r
             }\r
 \r
             if (audioSampleRate4 != "")\r
             {\r
-                audioSampleRate = audioSampleRate + "," + audioSampleRate4;\r
+                audioSampleRate = audioSampleRate + "," + audioSampleRate4.Replace("Auto", "0");\r
             }\r
 \r
             //\r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 87c1def..ae5d39c 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -1133,24 +1133,37 @@ namespace Handbrake.Functions
 \r
 \r
                 // Audio Sample Rate\r
+                // Make sure to change 0 to Auto\r
                 if (audioSampleRate1.Success != false)\r
+                {\r
                     thisQuery.q_audioSamplerate1 = audioSampleRate1.ToString().Replace("-R ", "").Trim();\r
+                    if (thisQuery.q_audioSamplerate1 == "0")\r
+                        thisQuery.q_audioSamplerate1 = "Auto";\r
+                }\r
+                else\r
+                    thisQuery.q_audioSamplerate1 = "Auto";\r
 \r
                 if (audioSampleRate2.Success != false)\r
                 {\r
                     string[] audioSRSelect = audioSampleRate2.ToString().Split(',');\r
+                    if (audioSRSelect[1] == "0")\r
+                        audioSRSelect[1] = "Auto";\r
                     thisQuery.q_audioSamplerate2 = audioSRSelect[1].Trim();\r
                 }\r
 \r
                 if (audioSampleRate3.Success != false)\r
                 {\r
                     string[] audioSRSelect = audioSampleRate3.ToString().Split(',');\r
+                    if (audioSRSelect[1] == "0")\r
+                        audioSRSelect[1] = "Auto";\r
                     thisQuery.q_audioSamplerate3 = audioSRSelect[2].Trim();\r
                 }\r
 \r
                 if (audioSampleRate4.Success != false)\r
                 {\r
                     string[] audioSRSelect = audioSampleRate4.ToString().Split(',');\r
+                    if (audioSRSelect[1] == "0")\r
+                        audioSRSelect[1] = "Auto";\r
                     thisQuery.q_audioSamplerate4 = audioSRSelect[3].Trim();\r
                 }\r
 \r

diff --git a/win/C#/Functions/RssReader.cs b/win/C#/Functions/RssReader.cs
index ec461a4..bf9a1f5 100644 (file)
--- a/win/C#/Functions/RssReader.cs
+++ b/win/C#/Functions/RssReader.cs
@@ -24,7 +24,6 @@ namespace Handbrake.Functions
         XmlNode nodeRss;\r
         XmlNode nodeChannel;\r
         XmlNode nodeItem;\r
-        string t;\r
 \r
         private void readRss()\r
         {\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 2cb7f6a..b03fec2 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 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
@@ -399,9 +399,9 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_1.Location = new System.Drawing.Point(537, 53);\r
+            this.drp_audbit_1.Location = new System.Drawing.Point(546, 53);\r
             this.drp_audbit_1.Name = "drp_audbit_1";\r
-            this.drp_audbit_1.Size = new System.Drawing.Size(79, 20);\r
+            this.drp_audbit_1.Size = new System.Drawing.Size(70, 20);\r
             this.drp_audbit_1.TabIndex = 11;\r
             this.drp_audbit_1.Text = "160";\r
             this.ToolTip.SetToolTip(this.drp_audbit_1, "Set the Audio Bit-Rate");\r
@@ -411,6 +411,7 @@ namespace Handbrake
             this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_1.FormattingEnabled = true;\r
             this.drp_audsr_1.Items.AddRange(new object[] {\r
+            "Auto",\r
             "48",\r
             "44.1",\r
             "32",\r
@@ -418,9 +419,9 @@ namespace Handbrake
             "22.05"});\r
             this.drp_audsr_1.Location = new System.Drawing.Point(488, 53);\r
             this.drp_audsr_1.Name = "drp_audsr_1";\r
-            this.drp_audsr_1.Size = new System.Drawing.Size(43, 20);\r
+            this.drp_audsr_1.Size = new System.Drawing.Size(55, 20);\r
             this.drp_audsr_1.TabIndex = 9;\r
-            this.drp_audsr_1.Text = "48";\r
+            this.drp_audsr_1.Text = "Auto";\r
             this.ToolTip.SetToolTip(this.drp_audsr_1, "Set the Audio Sample Rate");\r
             // \r
             // check_largeFile\r
@@ -621,9 +622,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\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
@@ -678,7 +679,7 @@ namespace Handbrake
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audmix_2.Location = new System.Drawing.Point(353, 93);\r
+            this.drp_audmix_2.Location = new System.Drawing.Point(353, 92);\r
             this.drp_audmix_2.Name = "drp_audmix_2";\r
             this.drp_audmix_2.Size = new System.Drawing.Size(129, 20);\r
             this.drp_audmix_2.TabIndex = 19;\r
@@ -712,7 +713,7 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audenc_2.Location = new System.Drawing.Point(236, 93);\r
+            this.drp_audenc_2.Location = new System.Drawing.Point(236, 92);\r
             this.drp_audenc_2.Name = "drp_audenc_2";\r
             this.drp_audenc_2.Size = new System.Drawing.Size(111, 20);\r
             this.drp_audenc_2.TabIndex = 18;\r
@@ -735,9 +736,9 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_2.Location = new System.Drawing.Point(537, 93);\r
+            this.drp_audbit_2.Location = new System.Drawing.Point(546, 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.Size = new System.Drawing.Size(71, 20);\r
             this.drp_audbit_2.TabIndex = 21;\r
             this.drp_audbit_2.Text = "160";\r
             this.ToolTip.SetToolTip(this.drp_audbit_2, "Set the Audio Bit-Rate");\r
@@ -747,16 +748,17 @@ namespace Handbrake
             this.drp_audsr_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drp_audsr_2.FormattingEnabled = true;\r
             this.drp_audsr_2.Items.AddRange(new object[] {\r
+            "Auto",\r
             "48",\r
             "44.1",\r
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_2.Location = new System.Drawing.Point(488, 93);\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, 20);\r
+            this.drp_audsr_2.Size = new System.Drawing.Size(52, 20);\r
             this.drp_audsr_2.TabIndex = 20;\r
-            this.drp_audsr_2.Text = "48";\r
+            this.drp_audsr_2.Text = "Auto";\r
             this.ToolTip.SetToolTip(this.drp_audsr_2, "Set the Audio Sample Rate");\r
             // \r
             // check_fileMode\r
@@ -779,16 +781,17 @@ namespace Handbrake
             this.drp_audsr_3.Font = new System.Drawing.Font("Verdana", 6.75F, 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
+            "Auto",\r
             "48",\r
             "44.1",\r
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_3.Location = new System.Drawing.Point(488, 129);\r
+            this.drp_audsr_3.Location = new System.Drawing.Point(488, 133);\r
             this.drp_audsr_3.Name = "drp_audsr_3";\r
-            this.drp_audsr_3.Size = new System.Drawing.Size(43, 20);\r
+            this.drp_audsr_3.Size = new System.Drawing.Size(52, 20);\r
             this.drp_audsr_3.TabIndex = 28;\r
-            this.drp_audsr_3.Text = "48";\r
+            this.drp_audsr_3.Text = "Auto";\r
             this.ToolTip.SetToolTip(this.drp_audsr_3, "Set the Audio Sample Rate");\r
             // \r
             // drp_audbit_3\r
@@ -807,9 +810,9 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_3.Location = new System.Drawing.Point(537, 129);\r
+            this.drp_audbit_3.Location = new System.Drawing.Point(546, 133);\r
             this.drp_audbit_3.Name = "drp_audbit_3";\r
-            this.drp_audbit_3.Size = new System.Drawing.Size(80, 20);\r
+            this.drp_audbit_3.Size = new System.Drawing.Size(71, 20);\r
             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
@@ -824,7 +827,7 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audenc_3.Location = new System.Drawing.Point(236, 129);\r
+            this.drp_audenc_3.Location = new System.Drawing.Point(236, 133);\r
             this.drp_audenc_3.Name = "drp_audenc_3";\r
             this.drp_audenc_3.Size = new System.Drawing.Size(111, 20);\r
             this.drp_audenc_3.TabIndex = 26;\r
@@ -844,7 +847,7 @@ namespace Handbrake
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audmix_3.Location = new System.Drawing.Point(353, 129);\r
+            this.drp_audmix_3.Location = new System.Drawing.Point(353, 133);\r
             this.drp_audmix_3.Name = "drp_audmix_3";\r
             this.drp_audmix_3.Size = new System.Drawing.Size(129, 20);\r
             this.drp_audmix_3.TabIndex = 27;\r
@@ -858,16 +861,17 @@ namespace Handbrake
             this.drp_audsr_4.Font = new System.Drawing.Font("Verdana", 6.75F, 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
+            "Auto",\r
             "48",\r
             "44.1",\r
             "32",\r
             "24",\r
             "22.05"});\r
-            this.drp_audsr_4.Location = new System.Drawing.Point(488, 167);\r
+            this.drp_audsr_4.Location = new System.Drawing.Point(488, 175);\r
             this.drp_audsr_4.Name = "drp_audsr_4";\r
-            this.drp_audsr_4.Size = new System.Drawing.Size(43, 20);\r
+            this.drp_audsr_4.Size = new System.Drawing.Size(52, 20);\r
             this.drp_audsr_4.TabIndex = 36;\r
-            this.drp_audsr_4.Text = "48";\r
+            this.drp_audsr_4.Text = "Auto";\r
             this.ToolTip.SetToolTip(this.drp_audsr_4, "Set the Audio Sample Rate");\r
             // \r
             // drp_audbit_4\r
@@ -886,9 +890,9 @@ namespace Handbrake
             "112",\r
             "128",\r
             "160"});\r
-            this.drp_audbit_4.Location = new System.Drawing.Point(537, 167);\r
+            this.drp_audbit_4.Location = new System.Drawing.Point(546, 175);\r
             this.drp_audbit_4.Name = "drp_audbit_4";\r
-            this.drp_audbit_4.Size = new System.Drawing.Size(80, 20);\r
+            this.drp_audbit_4.Size = new System.Drawing.Size(70, 20);\r
             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
@@ -903,7 +907,7 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audenc_4.Location = new System.Drawing.Point(236, 167);\r
+            this.drp_audenc_4.Location = new System.Drawing.Point(236, 175);\r
             this.drp_audenc_4.Name = "drp_audenc_4";\r
             this.drp_audenc_4.Size = new System.Drawing.Size(111, 20);\r
             this.drp_audenc_4.TabIndex = 34;\r
@@ -923,7 +927,7 @@ namespace Handbrake
             "Dolby Surround",\r
             "Dolby Pro Logic II",\r
             "6 Channel Discrete"});\r
-            this.drp_audmix_4.Location = new System.Drawing.Point(353, 167);\r
+            this.drp_audmix_4.Location = new System.Drawing.Point(353, 175);\r
             this.drp_audmix_4.Name = "drp_audmix_4";\r
             this.drp_audmix_4.Size = new System.Drawing.Size(129, 20);\r
             this.drp_audmix_4.TabIndex = 35;\r
@@ -1356,7 +1360,7 @@ namespace Handbrake
             this.lbl_drc4.AutoSize = true;\r
             this.lbl_drc4.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_drc4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc4.Location = new System.Drawing.Point(670, 165);\r
+            this.lbl_drc4.Location = new System.Drawing.Point(670, 176);\r
             this.lbl_drc4.Name = "lbl_drc4";\r
             this.lbl_drc4.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_drc4.TabIndex = 39;\r
@@ -1367,7 +1371,7 @@ namespace Handbrake
             this.lbl_drc3.AutoSize = true;\r
             this.lbl_drc3.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_drc3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc3.Location = new System.Drawing.Point(670, 131);\r
+            this.lbl_drc3.Location = new System.Drawing.Point(670, 135);\r
             this.lbl_drc3.Name = "lbl_drc3";\r
             this.lbl_drc3.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_drc3.TabIndex = 31;\r
@@ -1378,7 +1382,7 @@ namespace Handbrake
             this.lbl_drc2.AutoSize = true;\r
             this.lbl_drc2.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_drc2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_drc2.Location = new System.Drawing.Point(670, 91);\r
+            this.lbl_drc2.Location = new System.Drawing.Point(670, 90);\r
             this.lbl_drc2.Name = "lbl_drc2";\r
             this.lbl_drc2.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_drc2.TabIndex = 23;\r
@@ -1399,7 +1403,7 @@ namespace Handbrake
             // \r
             this.trackBar4.Enabled = false;\r
             this.trackBar4.LargeChange = 0;\r
-            this.trackBar4.Location = new System.Drawing.Point(620, 161);\r
+            this.trackBar4.Location = new System.Drawing.Point(620, 169);\r
             this.trackBar4.Margin = new System.Windows.Forms.Padding(0);\r
             this.trackBar4.Maximum = 30;\r
             this.trackBar4.Name = "trackBar4";\r
@@ -1414,7 +1418,7 @@ namespace Handbrake
             this.drp_track4Audio.FormattingEnabled = true;\r
             this.drp_track4Audio.Items.AddRange(new object[] {\r
             "None"});\r
-            this.drp_track4Audio.Location = new System.Drawing.Point(36, 166);\r
+            this.drp_track4Audio.Location = new System.Drawing.Point(36, 174);\r
             this.drp_track4Audio.Name = "drp_track4Audio";\r
             this.drp_track4Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track4Audio.TabIndex = 33;\r
@@ -1425,7 +1429,7 @@ namespace Handbrake
             this.lbl_t4.AutoSize = true;\r
             this.lbl_t4.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_t4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_t4.Location = new System.Drawing.Point(13, 169);\r
+            this.lbl_t4.Location = new System.Drawing.Point(13, 177);\r
             this.lbl_t4.Name = "lbl_t4";\r
             this.lbl_t4.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_t4.TabIndex = 32;\r
@@ -1435,7 +1439,7 @@ namespace Handbrake
             // \r
             this.trackBar3.Enabled = false;\r
             this.trackBar3.LargeChange = 0;\r
-            this.trackBar3.Location = new System.Drawing.Point(620, 123);\r
+            this.trackBar3.Location = new System.Drawing.Point(620, 128);\r
             this.trackBar3.Margin = new System.Windows.Forms.Padding(0);\r
             this.trackBar3.Maximum = 30;\r
             this.trackBar3.Name = "trackBar3";\r
@@ -1450,7 +1454,7 @@ namespace Handbrake
             this.drp_track3Audio.FormattingEnabled = true;\r
             this.drp_track3Audio.Items.AddRange(new object[] {\r
             "None"});\r
-            this.drp_track3Audio.Location = new System.Drawing.Point(36, 128);\r
+            this.drp_track3Audio.Location = new System.Drawing.Point(36, 132);\r
             this.drp_track3Audio.Name = "drp_track3Audio";\r
             this.drp_track3Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track3Audio.TabIndex = 25;\r
@@ -1461,7 +1465,7 @@ namespace Handbrake
             this.lbl_t3.AutoSize = true;\r
             this.lbl_t3.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_t3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_t3.Location = new System.Drawing.Point(13, 131);\r
+            this.lbl_t3.Location = new System.Drawing.Point(13, 135);\r
             this.lbl_t3.Name = "lbl_t3";\r
             this.lbl_t3.Size = new System.Drawing.Size(19, 13);\r
             this.lbl_t3.TabIndex = 24;\r
@@ -1470,7 +1474,7 @@ namespace Handbrake
             // trackBar2\r
             // \r
             this.trackBar2.LargeChange = 0;\r
-            this.trackBar2.Location = new System.Drawing.Point(620, 87);\r
+            this.trackBar2.Location = new System.Drawing.Point(620, 86);\r
             this.trackBar2.Margin = new System.Windows.Forms.Padding(0);\r
             this.trackBar2.Maximum = 30;\r
             this.trackBar2.Name = "trackBar2";\r
@@ -1534,7 +1538,7 @@ namespace Handbrake
             this.label67.AutoSize = true;\r
             this.label67.BackColor = System.Drawing.Color.Transparent;\r
             this.label67.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label67.Location = new System.Drawing.Point(478, 24);\r
+            this.label67.Location = new System.Drawing.Point(479, 24);\r
             this.label67.Name = "label67";\r
             this.label67.Size = new System.Drawing.Size(65, 24);\r
             this.label67.TabIndex = 10;\r
@@ -1591,7 +1595,7 @@ namespace Handbrake
             this.drp_track2Audio.FormattingEnabled = true;\r
             this.drp_track2Audio.Items.AddRange(new object[] {\r
             "None"});\r
-            this.drp_track2Audio.Location = new System.Drawing.Point(36, 92);\r
+            this.drp_track2Audio.Location = new System.Drawing.Point(36, 91);\r
             this.drp_track2Audio.Name = "drp_track2Audio";\r
             this.drp_track2Audio.Size = new System.Drawing.Size(194, 20);\r
             this.drp_track2Audio.TabIndex = 17;\r
@@ -1602,7 +1606,7 @@ namespace Handbrake
             this.label28.AutoSize = true;\r
             this.label28.BackColor = System.Drawing.Color.Transparent;\r
             this.label28.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label28.Location = new System.Drawing.Point(13, 95);\r
+            this.label28.Location = new System.Drawing.Point(13, 94);\r
             this.label28.Name = "label28";\r
             this.label28.Size = new System.Drawing.Size(19, 13);\r
             this.label28.TabIndex = 16;\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