summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--win/C#/Functions/Common.cs13
-rw-r--r--win/C#/frmMain.Designer.cs26
-rw-r--r--win/C#/frmMain.cs4
-rw-r--r--win/C#/frmMain.resx6
4 files changed, 29 insertions, 20 deletions
diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 6a4effaa7..2772762da 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -294,7 +294,18 @@ namespace Handbrake.Functions
else
mainWindow.drp_track1Audio.Text = presetQuery.AudioTrack1;
- if (presetQuery.AudioTrack2 == "None")
+
+ if (presetQuery.AudioEncoder2 != null) // Fix for loading in built in presets. Where 2 encoders but no tracks in the preset.
+ {
+ mainWindow.drp_track2Audio.Enabled = true;
+ mainWindow.drp_audsr_2.Enabled = true;
+ mainWindow.drp_audmix_2.Enabled = true;
+ mainWindow.drp_audenc_2.Enabled = true;
+ mainWindow.drp_audbit_2.Enabled = true;
+ mainWindow.drp_audsr_2.Text = "48";
+ mainWindow.drp_track2Audio.Text = "Automatic";
+ }
+ else if (presetQuery.AudioTrack2 == "None")
{
mainWindow.drp_track2Audio.SelectedIndex = 0;
mainWindow.drp_audsr_2.Enabled = false;
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 9376527af..735acb822 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);
@@ -407,7 +407,7 @@ namespace Handbrake
//
// drp_audsr_1
//
- this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audsr_1.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.drp_audsr_1.FormattingEnabled = true;
this.drp_audsr_1.Items.AddRange(new object[] {
"48",
@@ -417,7 +417,7 @@ namespace Handbrake
"22.05"});
this.drp_audsr_1.Location = new System.Drawing.Point(488, 52);
this.drp_audsr_1.Name = "drp_audsr_1";
- this.drp_audsr_1.Size = new System.Drawing.Size(43, 21);
+ this.drp_audsr_1.Size = new System.Drawing.Size(43, 20);
this.drp_audsr_1.TabIndex = 9;
this.drp_audsr_1.Text = "48";
this.ToolTip.SetToolTip(this.drp_audsr_1, "Set the Audio Sample Rate");
@@ -623,9 +623,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";
@@ -746,7 +746,7 @@ namespace Handbrake
//
// drp_audsr_2
//
- this.drp_audsr_2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audsr_2.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.drp_audsr_2.FormattingEnabled = true;
this.drp_audsr_2.Items.AddRange(new object[] {
"48",
@@ -756,7 +756,7 @@ namespace Handbrake
"22.05"});
this.drp_audsr_2.Location = new System.Drawing.Point(488, 92);
this.drp_audsr_2.Name = "drp_audsr_2";
- this.drp_audsr_2.Size = new System.Drawing.Size(43, 21);
+ this.drp_audsr_2.Size = new System.Drawing.Size(43, 20);
this.drp_audsr_2.TabIndex = 20;
this.drp_audsr_2.Text = "48";
this.ToolTip.SetToolTip(this.drp_audsr_2, "Set the Audio Sample Rate");
@@ -778,7 +778,7 @@ namespace Handbrake
// drp_audsr_3
//
this.drp_audsr_3.Enabled = false;
- this.drp_audsr_3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audsr_3.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.drp_audsr_3.FormattingEnabled = true;
this.drp_audsr_3.Items.AddRange(new object[] {
"48",
@@ -788,7 +788,7 @@ namespace Handbrake
"22.05"});
this.drp_audsr_3.Location = new System.Drawing.Point(488, 128);
this.drp_audsr_3.Name = "drp_audsr_3";
- this.drp_audsr_3.Size = new System.Drawing.Size(43, 21);
+ this.drp_audsr_3.Size = new System.Drawing.Size(43, 20);
this.drp_audsr_3.TabIndex = 28;
this.drp_audsr_3.Text = "48";
this.ToolTip.SetToolTip(this.drp_audsr_3, "Set the Audio Sample Rate");
@@ -861,7 +861,7 @@ namespace Handbrake
// drp_audsr_4
//
this.drp_audsr_4.Enabled = false;
- this.drp_audsr_4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.drp_audsr_4.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.drp_audsr_4.FormattingEnabled = true;
this.drp_audsr_4.Items.AddRange(new object[] {
"48",
@@ -869,9 +869,9 @@ namespace Handbrake
"32",
"24",
"22.05"});
- this.drp_audsr_4.Location = new System.Drawing.Point(488, 166);
+ this.drp_audsr_4.Location = new System.Drawing.Point(488, 167);
this.drp_audsr_4.Name = "drp_audsr_4";
- this.drp_audsr_4.Size = new System.Drawing.Size(43, 21);
+ this.drp_audsr_4.Size = new System.Drawing.Size(43, 20);
this.drp_audsr_4.TabIndex = 36;
this.drp_audsr_4.Text = "48";
this.ToolTip.SetToolTip(this.drp_audsr_4, "Set the Audio Sample Rate");
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b2bd1e472..b3c131d6b 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1801,20 +1801,24 @@ namespace Handbrake
{
drp_audenc_1.Items.Clear();
drp_audenc_1.Items.Add("AAC");
+ drp_audenc_1.Items.Add("AC3");
drp_audenc_1.SelectedIndex = 0;
drp_audenc_2.Items.Clear();
drp_audenc_2.Items.Add("AAC");
+ drp_audenc_2.Items.Add("AC3");
if (drp_audenc_2.Enabled)
drp_audenc_2.SelectedIndex = 0;
drp_audenc_3.Items.Clear();
drp_audenc_3.Items.Add("AAC");
+ drp_audenc_3.Items.Add("AC3");
if (drp_audenc_3.Enabled)
drp_audenc_3.SelectedIndex = 0;
drp_audenc_4.Items.Clear();
drp_audenc_4.Items.Add("AAC");
+ drp_audenc_4.Items.Add("AC3");
if (drp_audenc_4.Enabled)
drp_audenc_4.SelectedIndex = 0;
}
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e9b8e49f4..e91100bb4 100644
--- 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.
Note: Do not change any of the chapter numbers!</value>
</data>
- <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>223, 15</value>
</metadata>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 05:13:08 +0000