WinGui: A few hundred fixes to the Audio Tab, Preset Loader and Query Generator.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 2772762da9bc1a452ea223ae563562d51cefa81e..825e614f1acd0243f7d13ff4550d7cdb323e88a0 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -289,12 +289,13 @@ namespace Handbrake.Functions
             // Audio Settings Tab\r
             #region Audio\r
 \r
+            // Handle Track 1\r
             if (presetQuery.AudioTrack1 == "")\r
                 mainWindow.drp_track1Audio.Text = "Automatic";\r
             else\r
                 mainWindow.drp_track1Audio.Text = presetQuery.AudioTrack1;\r
 \r
-            \r
+            // Handle Track 2\r
             if (presetQuery.AudioEncoder2 != null)  // Fix for loading in built in presets. Where 2 encoders but no tracks in the preset.\r
             {\r
                 mainWindow.drp_track2Audio.Enabled = true;\r
@@ -303,7 +304,10 @@ namespace Handbrake.Functions
                 mainWindow.drp_audenc_2.Enabled = true;\r
                 mainWindow.drp_audbit_2.Enabled = true;\r
                 mainWindow.drp_audsr_2.Text = "48";\r
-                mainWindow.drp_track2Audio.Text = "Automatic";\r
+                if ((presetQuery.AudioTrack2 != null) && (presetQuery.AudioTrack2 != "None"))\r
+                    mainWindow.drp_track2Audio.Text = presetQuery.AudioTrack2;\r
+                else \r
+                    mainWindow.drp_track2Audio.Text = "Automatic";\r
             }\r
             else if (presetQuery.AudioTrack2 == "None")\r
             {\r
@@ -322,6 +326,7 @@ namespace Handbrake.Functions
                 mainWindow.drp_audbit_2.Enabled = true;\r
             }\r
 \r
+            // Handle Track 3\r
             if (presetQuery.AudioTrack3 == "None")\r
             {\r
                 mainWindow.drp_track3Audio.SelectedIndex = 0;\r
@@ -329,6 +334,23 @@ namespace Handbrake.Functions
                 mainWindow.drp_audmix_3.Enabled = false;\r
                 mainWindow.drp_audenc_3.Enabled = false;\r
                 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
+                mainWindow.drp_audenc_3.Text = "";\r
+                mainWindow.drp_audbit_3.Text = "";\r
+                mainWindow.trackBar3.Value = 0;\r
 \r
             }\r
             else\r
@@ -338,8 +360,19 @@ namespace Handbrake.Functions
                 mainWindow.drp_audmix_3.Enabled = true;\r
                 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
             if (presetQuery.AudioTrack4 == "None")\r
             {\r
                 mainWindow.drp_track4Audio.SelectedIndex = 0;\r
@@ -347,6 +380,23 @@ namespace Handbrake.Functions
                 mainWindow.drp_audmix_4.Enabled = false;\r
                 mainWindow.drp_audenc_4.Enabled = false;\r
                 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
+                mainWindow.drp_audenc_4.Text = "";\r
+                mainWindow.drp_audbit_4.Text = "";\r
+                mainWindow.trackBar4.Value = 0;\r
             }\r
             else\r
             {\r
@@ -355,8 +405,19 @@ namespace Handbrake.Functions
                 mainWindow.drp_audmix_4.Enabled = true;\r
                 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
             if (presetQuery.AudioEncoder1 != null)\r
                 mainWindow.drp_audenc_1.Text = presetQuery.AudioEncoder1;\r
             mainWindow.drp_audenc_2.Text = presetQuery.AudioEncoder2;\r
@@ -841,6 +902,20 @@ namespace Handbrake.Functions
                 else\r
                     audioSampleRate = audioSampleRate + "," + audioSampleRate2;\r
             }\r
+            else\r
+            {\r
+                // All this is a hack, because when AppleTV is selected, there is no sample rate selected. so just add a 48\r
+                // It should probably be setup later so the GUI widget has the value 48 in it.\r
+               \r
+                if ((track2 != "") && (track2 != "None"))\r
+                {\r
+                    if (audioSampleRate == "")\r
+                        audioSampleRate = " -R 48,48";\r
+                    else\r
+                        audioSampleRate = audioSampleRate + ",48";\r
+                }\r
+\r
+            }\r
 \r
             if (audioSampleRate3 != "")\r
             {\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 5814bda4ad16b5ecd467b760c3e52c0a63ffcd7d..211a0897a246c4df5420cbbf4ba1069e8caf005e 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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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
@@ -126,10 +126,10 @@ namespace Handbrake
             this.lbl_drc1 = new System.Windows.Forms.Label();\r
             this.trackBar4 = new System.Windows.Forms.TrackBar();\r
             this.drp_track4Audio = new System.Windows.Forms.ComboBox();\r
-            this.label21 = new System.Windows.Forms.Label();\r
+            this.lbl_t4 = new System.Windows.Forms.Label();\r
             this.trackBar3 = new System.Windows.Forms.TrackBar();\r
             this.drp_track3Audio = new System.Windows.Forms.ComboBox();\r
-            this.label18 = new System.Windows.Forms.Label();\r
+            this.lbl_t3 = new System.Windows.Forms.Label();\r
             this.trackBar2 = new System.Windows.Forms.TrackBar();\r
             this.label16 = new System.Windows.Forms.Label();\r
             this.trackBar1 = new System.Windows.Forms.TrackBar();\r
@@ -623,9 +623,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle3.Format = "N0";\r
-            dataGridViewCellStyle3.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -1295,14 +1295,14 @@ namespace Handbrake
             this.TabPage2.Controls.Add(this.drp_audenc_4);\r
             this.TabPage2.Controls.Add(this.drp_audmix_4);\r
             this.TabPage2.Controls.Add(this.drp_track4Audio);\r
-            this.TabPage2.Controls.Add(this.label21);\r
+            this.TabPage2.Controls.Add(this.lbl_t4);\r
             this.TabPage2.Controls.Add(this.trackBar3);\r
             this.TabPage2.Controls.Add(this.drp_audsr_3);\r
             this.TabPage2.Controls.Add(this.drp_audbit_3);\r
             this.TabPage2.Controls.Add(this.drp_audenc_3);\r
             this.TabPage2.Controls.Add(this.drp_audmix_3);\r
             this.TabPage2.Controls.Add(this.drp_track3Audio);\r
-            this.TabPage2.Controls.Add(this.label18);\r
+            this.TabPage2.Controls.Add(this.lbl_t3);\r
             this.TabPage2.Controls.Add(this.trackBar2);\r
             this.TabPage2.Controls.Add(this.label16);\r
             this.TabPage2.Controls.Add(this.trackBar1);\r
@@ -1410,17 +1410,17 @@ namespace Handbrake
             this.drp_track4Audio.Visible = false;\r
             this.drp_track4Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track4Audio_SelectedIndexChanged);\r
             // \r
-            // label21\r
+            // lbl_t4\r
             // \r
-            this.label21.AutoSize = true;\r
-            this.label21.BackColor = System.Drawing.Color.Transparent;\r
-            this.label21.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label21.Location = new System.Drawing.Point(13, 169);\r
-            this.label21.Name = "label21";\r
-            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
+            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.Name = "lbl_t4";\r
+            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
@@ -1449,17 +1449,17 @@ namespace Handbrake
             this.drp_track3Audio.Visible = false;\r
             this.drp_track3Audio.SelectedIndexChanged += new System.EventHandler(this.drp_track3Audio_SelectedIndexChanged);\r
             // \r
-            // label18\r
+            // lbl_t3\r
             // \r
-            this.label18.AutoSize = true;\r
-            this.label18.BackColor = System.Drawing.Color.Transparent;\r
-            this.label18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label18.Location = new System.Drawing.Point(13, 131);\r
-            this.label18.Name = "label18";\r
-            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
+            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.Name = "lbl_t3";\r
+            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
@@ -3225,14 +3225,14 @@ namespace Handbrake
         internal System.Windows.Forms.ComboBox drp_audenc_4;\r
         internal System.Windows.Forms.ComboBox drp_audmix_4;\r
         internal System.Windows.Forms.ComboBox drp_track4Audio;\r
-        internal System.Windows.Forms.Label label21;\r
+        internal System.Windows.Forms.Label lbl_t4;\r
         internal System.Windows.Forms.TrackBar trackBar3;\r
         internal System.Windows.Forms.ComboBox drp_audsr_3;\r
         internal System.Windows.Forms.ComboBox drp_audbit_3;\r
         internal System.Windows.Forms.ComboBox drp_audenc_3;\r
         internal System.Windows.Forms.ComboBox drp_audmix_3;\r
         internal System.Windows.Forms.ComboBox drp_track3Audio;\r
-        internal System.Windows.Forms.Label label18;\r
+        internal System.Windows.Forms.Label lbl_t3;\r
         internal System.Windows.Forms.TrackBar trackBar2;\r
         internal System.Windows.Forms.Label label16;\r
         internal System.Windows.Forms.Label lbl_drc1;\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e9b8e49f460e588c6c1689b637ff8b42b38c32be..e91100bb4841d31ed7eeb5189bb170abf45d7335 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -149,12 +149,6 @@ 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