WinGui:

- Audio Panel fixes and Usability improvements.
- Disabled DRC control which shouldn't have been active when AC3/DTS was selected
- Greyed out text labels for Mixdown, Samplerate, bitrate and DRC to help make it clearer the controls are disabled when AC3/DTS is selected.
- Changed the values which those controls are reset to when AC3/DTS are selected so they are not showing the first value in the dropdown. (e.g 32 for the bitrate. This was a little mis-leading)
- Changed Mixdown from Automatic to "AC3 Passthru" to match the MacGui when AC3 is selected. Same for DTS

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

diff --git a/win/C#/Controls/AudioPanel.Designer.cs b/win/C#/Controls/AudioPanel.Designer.cs
index d0647a3..d31b4f2 100644 (file)
--- a/win/C#/Controls/AudioPanel.Designer.cs
+++ b/win/C#/Controls/AudioPanel.Designer.cs
@@ -51,13 +51,13 @@ namespace Handbrake.Controls
             this.btn_RemoveAudioTrack = new System.Windows.Forms.Button();\r
             this.btn_addAudioTrack = new System.Windows.Forms.Button();\r
             this.lbl_drc = new System.Windows.Forms.Label();\r
-            this.label16 = new System.Windows.Forms.Label();\r
+            this.lbl_drcHeader = new System.Windows.Forms.Label();\r
             this.tb_drc = new System.Windows.Forms.TrackBar();\r
             this.label68 = new System.Windows.Forms.Label();\r
-            this.label67 = new System.Windows.Forms.Label();\r
-            this.label66 = new System.Windows.Forms.Label();\r
+            this.lbl_sampleRate = new System.Windows.Forms.Label();\r
+            this.lbl_bitrate = new System.Windows.Forms.Label();\r
             this.label65 = new System.Windows.Forms.Label();\r
-            this.label14 = new System.Windows.Forms.Label();\r
+            this.lbl_mixdown = new System.Windows.Forms.Label();\r
             this.drp_audioEncoder = new System.Windows.Forms.ComboBox();\r
             this.label27 = new System.Windows.Forms.Label();\r
             this.drp_audioMix = new System.Windows.Forms.ComboBox();\r
@@ -202,15 +202,15 @@ namespace Handbrake.Controls
             this.lbl_drc.TabIndex = 62;\r
             this.lbl_drc.Text = "0";\r
             // \r
-            // label16\r
+            // lbl_drcHeader\r
             // \r
-            this.label16.AutoSize = true;\r
-            this.label16.BackColor = System.Drawing.Color.Transparent;\r
-            this.label16.Location = new System.Drawing.Point(607, 17);\r
-            this.label16.Name = "label16";\r
-            this.label16.Size = new System.Drawing.Size(28, 13);\r
-            this.label16.TabIndex = 61;\r
-            this.label16.Text = "DRC";\r
+            this.lbl_drcHeader.AutoSize = true;\r
+            this.lbl_drcHeader.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_drcHeader.Location = new System.Drawing.Point(607, 17);\r
+            this.lbl_drcHeader.Name = "lbl_drcHeader";\r
+            this.lbl_drcHeader.Size = new System.Drawing.Size(28, 13);\r
+            this.lbl_drcHeader.TabIndex = 61;\r
+            this.lbl_drcHeader.Text = "DRC";\r
             // \r
             // tb_drc\r
             // \r
@@ -236,25 +236,25 @@ namespace Handbrake.Controls
             this.label68.TabIndex = 49;\r
             this.label68.Text = "Audio Tracks";\r
             // \r
-            // label67\r
+            // lbl_sampleRate\r
             // \r
-            this.label67.AutoSize = true;\r
-            this.label67.BackColor = System.Drawing.Color.Transparent;\r
-            this.label67.Location = new System.Drawing.Point(463, 17);\r
-            this.label67.Name = "label67";\r
-            this.label67.Size = new System.Drawing.Size(61, 13);\r
-            this.label67.TabIndex = 57;\r
-            this.label67.Text = "Samplerate";\r
+            this.lbl_sampleRate.AutoSize = true;\r
+            this.lbl_sampleRate.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_sampleRate.Location = new System.Drawing.Point(463, 17);\r
+            this.lbl_sampleRate.Name = "lbl_sampleRate";\r
+            this.lbl_sampleRate.Size = new System.Drawing.Size(61, 13);\r
+            this.lbl_sampleRate.TabIndex = 57;\r
+            this.lbl_sampleRate.Text = "Samplerate";\r
             // \r
-            // label66\r
+            // lbl_bitrate\r
             // \r
-            this.label66.AutoSize = true;\r
-            this.label66.BackColor = System.Drawing.Color.Transparent;\r
-            this.label66.Location = new System.Drawing.Point(538, 17);\r
-            this.label66.Name = "label66";\r
-            this.label66.Size = new System.Drawing.Size(39, 13);\r
-            this.label66.TabIndex = 59;\r
-            this.label66.Text = "Bitrate";\r
+            this.lbl_bitrate.AutoSize = true;\r
+            this.lbl_bitrate.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_bitrate.Location = new System.Drawing.Point(538, 17);\r
+            this.lbl_bitrate.Name = "lbl_bitrate";\r
+            this.lbl_bitrate.Size = new System.Drawing.Size(39, 13);\r
+            this.lbl_bitrate.TabIndex = 59;\r
+            this.lbl_bitrate.Text = "Bitrate";\r
             // \r
             // label65\r
             // \r
@@ -266,15 +266,15 @@ namespace Handbrake.Controls
             this.label65.TabIndex = 53;\r
             this.label65.Text = "Audio Codec";\r
             // \r
-            // label14\r
+            // lbl_mixdown\r
             // \r
-            this.label14.AutoSize = true;\r
-            this.label14.BackColor = System.Drawing.Color.Transparent;\r
-            this.label14.Location = new System.Drawing.Point(368, 17);\r
-            this.label14.Name = "label14";\r
-            this.label14.Size = new System.Drawing.Size(49, 13);\r
-            this.label14.TabIndex = 55;\r
-            this.label14.Text = "Mixdown";\r
+            this.lbl_mixdown.AutoSize = true;\r
+            this.lbl_mixdown.BackColor = System.Drawing.Color.Transparent;\r
+            this.lbl_mixdown.Location = new System.Drawing.Point(368, 17);\r
+            this.lbl_mixdown.Name = "lbl_mixdown";\r
+            this.lbl_mixdown.Size = new System.Drawing.Size(49, 13);\r
+            this.lbl_mixdown.TabIndex = 55;\r
+            this.lbl_mixdown.Text = "Mixdown";\r
             // \r
             // drp_audioEncoder\r
             // \r
@@ -377,13 +377,13 @@ namespace Handbrake.Controls
             this.AudioTrackGroup.Controls.Add(this.drp_audioMix);\r
             this.AudioTrackGroup.Controls.Add(this.lbl_drc);\r
             this.AudioTrackGroup.Controls.Add(this.label27);\r
-            this.AudioTrackGroup.Controls.Add(this.label16);\r
+            this.AudioTrackGroup.Controls.Add(this.lbl_drcHeader);\r
             this.AudioTrackGroup.Controls.Add(this.drp_audioEncoder);\r
             this.AudioTrackGroup.Controls.Add(this.tb_drc);\r
-            this.AudioTrackGroup.Controls.Add(this.label14);\r
+            this.AudioTrackGroup.Controls.Add(this.lbl_mixdown);\r
             this.AudioTrackGroup.Controls.Add(this.label65);\r
-            this.AudioTrackGroup.Controls.Add(this.label67);\r
-            this.AudioTrackGroup.Controls.Add(this.label66);\r
+            this.AudioTrackGroup.Controls.Add(this.lbl_sampleRate);\r
+            this.AudioTrackGroup.Controls.Add(this.lbl_bitrate);\r
             this.AudioTrackGroup.Location = new System.Drawing.Point(16, 67);\r
             this.AudioTrackGroup.Name = "AudioTrackGroup";\r
             this.AudioTrackGroup.Size = new System.Drawing.Size(689, 77);\r
@@ -430,13 +430,13 @@ namespace Handbrake.Controls
         private System.Windows.Forms.Button btn_RemoveAudioTrack;\r
         private System.Windows.Forms.Button btn_addAudioTrack;\r
         internal System.Windows.Forms.Label lbl_drc;\r
-        internal System.Windows.Forms.Label label16;\r
+        internal System.Windows.Forms.Label lbl_drcHeader;\r
         internal System.Windows.Forms.TrackBar tb_drc;\r
         internal System.Windows.Forms.Label label68;\r
-        internal System.Windows.Forms.Label label67;\r
-        internal System.Windows.Forms.Label label66;\r
+        internal System.Windows.Forms.Label lbl_sampleRate;\r
+        internal System.Windows.Forms.Label lbl_bitrate;\r
         internal System.Windows.Forms.Label label65;\r
-        internal System.Windows.Forms.Label label14;\r
+        internal System.Windows.Forms.Label lbl_mixdown;\r
         internal System.Windows.Forms.ComboBox drp_audioEncoder;\r
         internal System.Windows.Forms.Label label27;\r
         internal System.Windows.Forms.ComboBox drp_audioMix;\r

diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs
index b394e3c..2c2028b 100644 (file)
--- a/win/C#/Controls/AudioPanel.cs
+++ b/win/C#/Controls/AudioPanel.cs
@@ -48,16 +48,44 @@ namespace Handbrake.Controls
                 drp_audioMix.Enabled = false;\r
                 drp_audioBitrate.Enabled = false;\r
                 drp_audioSample.Enabled = false;\r
+                tb_drc.Enabled = false;\r
+\r
+                lbl_bitrate.Enabled = false;\r
+                lbl_drc.Enabled = false;\r
+                lbl_drcHeader.Enabled = false;\r
+                lbl_mixdown.Enabled = false;\r
+                lbl_sampleRate.Enabled = false;\r
 \r
-                drp_audioMix.SelectedIndex = 0;\r
                 drp_audioBitrate.SelectedIndex = 0;\r
                 drp_audioSample.SelectedIndex = 0;\r
+                drp_audioMix.Items.Add("AC3 Passthru");\r
+                drp_audioMix.Items.Add("DTS Passthru");\r
+\r
+                if (drp_audioEncoder.Text.Contains("AC3"))\r
+                    drp_audioMix.SelectedItem = "AC3 Passthru";\r
+                else\r
+                    drp_audioMix.SelectedItem = "DTS Passthru";\r
+\r
+                drp_audioBitrate.Items.Add("Auto");\r
+                drp_audioBitrate.SelectedItem = "Auto";\r
+                tb_drc.Value = 0;\r
             }\r
             else\r
             {\r
                 drp_audioMix.Enabled = true;\r
                 drp_audioBitrate.Enabled = true;\r
                 drp_audioSample.Enabled = true;\r
+                tb_drc.Enabled = true;\r
+\r
+                lbl_bitrate.Enabled = true;\r
+                lbl_drc.Enabled = true;\r
+                lbl_drcHeader.Enabled = true;\r
+                lbl_mixdown.Enabled = true;\r
+                lbl_sampleRate.Enabled = true;\r
+\r
+                drp_audioMix.Items.Remove("AC3 Passthru");\r
+                drp_audioMix.Items.Remove("DTS Passthru");\r
+                drp_audioBitrate.Items.Remove("Auto");\r
 \r
                 drp_audioMix.SelectedIndex = 0;\r
                 drp_audioBitrate.SelectedIndex = 9;\r
@@ -68,6 +96,13 @@ namespace Handbrake.Controls
             if (lv_audioList.Items.Count != 0 && lv_audioList.SelectedIndices.Count != 0)\r
             {\r
                 lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[2].Text = drp_audioEncoder.Text;\r
+                if (drp_audioEncoder.Text.Contains("AC3"))\r
+                {\r
+                    lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[3].Text = "AC3 Passthru";\r
+                    lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[4].Text = "Auto";\r
+                    lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[5].Text = "Auto";\r
+                    lv_audioList.Items[lv_audioList.SelectedIndices[0]].SubItems[6].Text = "0.0";\r
+                }\r
                 lv_audioList.Select();\r
             }\r
         }\r
@@ -398,6 +433,5 @@ namespace Handbrake.Controls
             else\r
                 AudioTrackGroup.Text = "Selected Track: None (Click \"Add Track\" to add)";\r
         }\r
-\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index ac4170a..2ac1585 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -266,7 +266,7 @@ namespace Handbrake.Functions
 \r
                 // Sample Rate (-R)\r
                 if (row.SubItems[4].Text != String.Empty)\r
-                    samplerates.Add(row.SubItems[4].Text.Replace("Auto", "Auto"));\r
+                    samplerates.Add(row.SubItems[4].Text);\r
 \r
                 // Audio Bitrate (-B)\r
                 if (row.SubItems[5].Text != String.Empty)\r