WinGui:

- Added aac+ac3 option to the audio codec dropdown. Mixdown gets disabled when this is selected.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 7778fcb1637459b3f4d6b1007791ebc0d30f8ad3..1f938a0f933a152a10f89af15aeba01587719bdd 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -386,6 +386,9 @@ namespace Handbrake.Functions
                 case "AC3":\r
                     audioEncoder = " -E ac3";\r
                     break;\r
+                case "AAC + AC3":\r
+                    audioEncoder = " -E aac+ac3";\r
+                    break;\r
                 default:\r
                     audioEncoder = " -E faac";\r
                     break;\r

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index 9418aaf77e737ea8906e5a2020488abfd3fd66d1..bc01a53fa950e1d80b34bb63c5051f356776080a 100644 (file)
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -584,7 +584,7 @@ namespace Handbrake.Functions
             Match width = Regex.Match(input, @"-w ([0-9]*)");\r
             Match height = Regex.Match(input, @"-l ([0-9]*)");\r
             Match videoEncoder = Regex.Match(input, @"-e ([a-zA-Z0-9]*)");\r
-            Match audioEncoder = Regex.Match(input, @"-E ([a-zA-Z0-9]*)");\r
+            Match audioEncoder = Regex.Match(input, @"-E ([a-zA-Z0-9+]*)");\r
 \r
             //Picture Settings Tab\r
             Match deinterlace = Regex.Match(input, @"--deinterlace=([a-z]*)");\r
@@ -705,6 +705,9 @@ namespace Handbrake.Functions
                     case "ac3":\r
                         audioEncoderConvertion = "AC3";\r
                         break;\r
+                    case "aac+ac3":\r
+                        audioEncoderConvertion = "AAC + AC3";\r
+                        break;\r
                     default:\r
                         audioEncoderConvertion = "AAC";\r
                         break;\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 09faabe084341a2401dd90a574eecce00d58e95b..3ac59d1c382f1e5867c4c1b218ea058141f0a489 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 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
@@ -66,6 +66,7 @@ namespace Handbrake
             this.text_width = new System.Windows.Forms.TextBox();\r
             this.slider_drc = new System.Windows.Forms.TrackBar();\r
             this.rtf_h264advanced = new System.Windows.Forms.RichTextBox();\r
+            this.RadioDVD = new System.Windows.Forms.RadioButton();\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
@@ -99,7 +100,6 @@ namespace Handbrake
             this.frmMainMenu = new System.Windows.Forms.MenuStrip();\r
             this.GroupBox1 = new System.Windows.Forms.GroupBox();\r
             this.Label13 = new System.Windows.Forms.Label();\r
-            this.RadioDVD = new System.Windows.Forms.RadioButton();\r
             this.Label17 = new System.Windows.Forms.Label();\r
             this.Label9 = new System.Windows.Forms.Label();\r
             this.Label10 = new System.Windows.Forms.Label();\r
@@ -201,6 +201,7 @@ namespace Handbrake
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();\r
             this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton();\r
             this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();\r
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_drc)).BeginInit();\r
@@ -382,7 +383,8 @@ namespace Handbrake
             "AAC",\r
             "MP3",\r
             "Vorbis",\r
-            "AC3"});\r
+            "AC3",\r
+            "AAC + AC3"});\r
             this.drp_audioCodec.Location = new System.Drawing.Point(370, 19);\r
             this.drp_audioCodec.Name = "drp_audioCodec";\r
             this.drp_audioCodec.Size = new System.Drawing.Size(111, 21);\r
@@ -614,6 +616,20 @@ namespace Handbrake
             this.rtf_h264advanced.Text = "";\r
             this.ToolTip.SetToolTip(this.rtf_h264advanced, "H.264 advanced options can be added here. See link below for details.");\r
             // \r
+            // RadioDVD\r
+            // \r
+            this.RadioDVD.AutoSize = true;\r
+            this.RadioDVD.Checked = true;\r
+            this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.RadioDVD.Location = new System.Drawing.Point(540, 46);\r
+            this.RadioDVD.Name = "RadioDVD";\r
+            this.RadioDVD.Size = new System.Drawing.Size(60, 17);\r
+            this.RadioDVD.TabIndex = 3;\r
+            this.RadioDVD.TabStop = true;\r
+            this.RadioDVD.Text = "Folder";\r
+            this.ToolTip.SetToolTip(this.RadioDVD, "For Selecting a \"Video_TS\" folder on your hard drive or DVD");\r
+            this.RadioDVD.UseVisualStyleBackColor = true;\r
+            // \r
             // DVD_Open\r
             // \r
             this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drvie.";\r
@@ -892,20 +908,6 @@ namespace Handbrake
             this.Label13.TabIndex = 10;\r
             this.Label13.Text = "To";\r
             // \r
-            // RadioDVD\r
-            // \r
-            this.RadioDVD.AutoSize = true;\r
-            this.RadioDVD.Checked = true;\r
-            this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioDVD.Location = new System.Drawing.Point(540, 46);\r
-            this.RadioDVD.Name = "RadioDVD";\r
-            this.RadioDVD.Size = new System.Drawing.Size(60, 17);\r
-            this.RadioDVD.TabIndex = 3;\r
-            this.RadioDVD.TabStop = true;\r
-            this.RadioDVD.Text = "Folder";\r
-            this.ToolTip.SetToolTip(this.RadioDVD, "For Selecting a \"Video_TS\" folder on your hard drive or DVD");\r
-            this.RadioDVD.UseVisualStyleBackColor = true;\r
-            // \r
             // Label17\r
             // \r
             this.Label17.AutoSize = true;\r
@@ -1853,9 +1855,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle2.Format = "N0";\r
-            dataGridViewCellStyle2.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle2;\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
@@ -2380,6 +2382,7 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;\r
         private System.Windows.Forms.ToolStripButton btn_ActivityWindow;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;\r
+        private System.Windows.Forms.ToolTip toolTip1;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 5ed59a0e6e6c1a30cab98bd5895c88f3d338a75c..45d1b287f0979e7f415558792b516f3f128ffebf 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -782,6 +782,16 @@ namespace Handbrake
 \r
         private void drp_audioCodec_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
+            if (drp_audioCodec.Text == "AAC + AC3")\r
+            {\r
+                drp_audioMixDown.Enabled = false;\r
+                drp_audioMixDown.Text = "Automatic";\r
+            }\r
+            else\r
+            {\r
+                drp_audioMixDown.Enabled = true;\r
+            }\r
+\r
             if (drp_audioCodec.Text == "AC3")\r
             {\r
                 drp_audioBitrate.Enabled = false;\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 7964e91b4a6dffab6ff58220917ce7b9cca8a376..4d4ebc0ac428dbeec5b2842f085dac661249c263 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -189,15 +189,12 @@ Best used in conjunction with forced subtitles.</value>
   <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="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="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>731, 18</value>\r
   </metadata>\r
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>830, 18</value>\r
+  </metadata>\r
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>56</value>\r
   </metadata>\r