From 0427e21b2d4cc0790c95b7bc2ecc96ec8459f922 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 16 Feb 2008 23:09:40 +0000 Subject: 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 --- win/C#/Functions/Common.cs | 3 +++ win/C#/Functions/QueryParser.cs | 5 ++++- win/C#/frmMain.Designer.cs | 43 ++++++++++++++++++++++------------------- win/C#/frmMain.cs | 10 ++++++++++ win/C#/frmMain.resx | 9 +++------ 5 files changed, 43 insertions(+), 27 deletions(-) diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs index 7778fcb16..1f938a0f9 100644 --- a/win/C#/Functions/Common.cs +++ b/win/C#/Functions/Common.cs @@ -386,6 +386,9 @@ namespace Handbrake.Functions case "AC3": audioEncoder = " -E ac3"; break; + case "AAC + AC3": + audioEncoder = " -E aac+ac3"; + break; default: audioEncoder = " -E faac"; break; diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs index 9418aaf77..bc01a53fa 100644 --- 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]*)"); Match height = Regex.Match(input, @"-l ([0-9]*)"); Match videoEncoder = Regex.Match(input, @"-e ([a-zA-Z0-9]*)"); - Match audioEncoder = Regex.Match(input, @"-E ([a-zA-Z0-9]*)"); + Match audioEncoder = Regex.Match(input, @"-E ([a-zA-Z0-9+]*)"); //Picture Settings Tab Match deinterlace = Regex.Match(input, @"--deinterlace=([a-z]*)"); @@ -705,6 +705,9 @@ namespace Handbrake.Functions case "ac3": audioEncoderConvertion = "AC3"; break; + case "aac+ac3": + audioEncoderConvertion = "AAC + AC3"; + break; default: audioEncoderConvertion = "AAC"; break; diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 09faabe08..3ac59d1c3 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -37,7 +37,7 @@ namespace Handbrake this.components = new System.ComponentModel.Container(); System.Windows.Forms.Label Label38; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.DVD_Save = new System.Windows.Forms.SaveFileDialog(); this.File_Save = new System.Windows.Forms.SaveFileDialog(); this.ToolTip = new System.Windows.Forms.ToolTip(this.components); @@ -66,6 +66,7 @@ namespace Handbrake this.text_width = new System.Windows.Forms.TextBox(); this.slider_drc = new System.Windows.Forms.TrackBar(); this.rtf_h264advanced = new System.Windows.Forms.RichTextBox(); + this.RadioDVD = new System.Windows.Forms.RadioButton(); this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog(); this.File_Open = new System.Windows.Forms.OpenFileDialog(); this.ISO_Open = new System.Windows.Forms.OpenFileDialog(); @@ -99,7 +100,6 @@ namespace Handbrake this.frmMainMenu = new System.Windows.Forms.MenuStrip(); this.GroupBox1 = new System.Windows.Forms.GroupBox(); this.Label13 = new System.Windows.Forms.Label(); - this.RadioDVD = new System.Windows.Forms.RadioButton(); this.Label17 = new System.Windows.Forms.Label(); this.Label9 = new System.Windows.Forms.Label(); this.Label10 = new System.Windows.Forms.Label(); @@ -201,6 +201,7 @@ namespace Handbrake this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.btn_ActivityWindow = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); Label38 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.slider_drc)).BeginInit(); @@ -382,7 +383,8 @@ namespace Handbrake "AAC", "MP3", "Vorbis", - "AC3"}); + "AC3", + "AAC + AC3"}); this.drp_audioCodec.Location = new System.Drawing.Point(370, 19); this.drp_audioCodec.Name = "drp_audioCodec"; this.drp_audioCodec.Size = new System.Drawing.Size(111, 21); @@ -614,6 +616,20 @@ namespace Handbrake this.rtf_h264advanced.Text = ""; this.ToolTip.SetToolTip(this.rtf_h264advanced, "H.264 advanced options can be added here. See link below for details."); // + // RadioDVD + // + this.RadioDVD.AutoSize = true; + this.RadioDVD.Checked = true; + this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.RadioDVD.Location = new System.Drawing.Point(540, 46); + this.RadioDVD.Name = "RadioDVD"; + this.RadioDVD.Size = new System.Drawing.Size(60, 17); + this.RadioDVD.TabIndex = 3; + this.RadioDVD.TabStop = true; + this.RadioDVD.Text = "Folder"; + this.ToolTip.SetToolTip(this.RadioDVD, "For Selecting a \"Video_TS\" folder on your hard drive or DVD"); + this.RadioDVD.UseVisualStyleBackColor = true; + // // DVD_Open // this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drvie."; @@ -892,20 +908,6 @@ namespace Handbrake this.Label13.TabIndex = 10; this.Label13.Text = "To"; // - // RadioDVD - // - this.RadioDVD.AutoSize = true; - this.RadioDVD.Checked = true; - this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.RadioDVD.Location = new System.Drawing.Point(540, 46); - this.RadioDVD.Name = "RadioDVD"; - this.RadioDVD.Size = new System.Drawing.Size(60, 17); - this.RadioDVD.TabIndex = 3; - this.RadioDVD.TabStop = true; - this.RadioDVD.Text = "Folder"; - this.ToolTip.SetToolTip(this.RadioDVD, "For Selecting a \"Video_TS\" folder on your hard drive or DVD"); - this.RadioDVD.UseVisualStyleBackColor = true; - // // Label17 // this.Label17.AutoSize = true; @@ -1853,9 +1855,9 @@ namespace Handbrake // // number // - dataGridViewCellStyle2.Format = "N0"; - dataGridViewCellStyle2.NullValue = null; - this.number.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Format = "N0"; + dataGridViewCellStyle1.NullValue = null; + this.number.DefaultCellStyle = dataGridViewCellStyle1; this.number.HeaderText = "Chapter Number"; this.number.MaxInputLength = 3; this.number.Name = "number"; @@ -2380,6 +2382,7 @@ namespace Handbrake private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripButton btn_ActivityWindow; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; + private System.Windows.Forms.ToolTip toolTip1; } } \ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 5ed59a0e6..45d1b287f 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -782,6 +782,16 @@ namespace Handbrake private void drp_audioCodec_SelectedIndexChanged(object sender, EventArgs e) { + if (drp_audioCodec.Text == "AAC + AC3") + { + drp_audioMixDown.Enabled = false; + drp_audioMixDown.Text = "Automatic"; + } + else + { + drp_audioMixDown.Enabled = true; + } + if (drp_audioCodec.Text == "AC3") { drp_audioBitrate.Enabled = false; diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx index 7964e91b4..4d4ebc0ac 100644 --- a/win/C#/frmMain.resx +++ b/win/C#/frmMain.resx @@ -189,15 +189,12 @@ Best used in conjunction with forced subtitles. True - - True - - - True - 731, 18 + + 830, 18 + 56 -- cgit v1.2.3