WinGui:

- Fixed issue where Audio encoder would be changed if chapter markers was enabled/disabled.
This was an issue with the function that populates the audio encoder drop downs based on the file extension

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

3 files changed, 74 insertions, 26 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 735acb822..5814bda4a 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = 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);

@@ -398,7 +398,7 @@ namespace Handbrake
             "112",

             "128",

             "160"});

-            this.drp_audbit_1.Location = new System.Drawing.Point(538, 53);

+            this.drp_audbit_1.Location = new System.Drawing.Point(537, 53);

             this.drp_audbit_1.Name = "drp_audbit_1";

             this.drp_audbit_1.Size = new System.Drawing.Size(79, 20);

             this.drp_audbit_1.TabIndex = 11;

@@ -415,7 +415,7 @@ namespace Handbrake
             "32",

             "24",

             "22.05"});

-            this.drp_audsr_1.Location = new System.Drawing.Point(488, 52);

+            this.drp_audsr_1.Location = new System.Drawing.Point(488, 53);

             this.drp_audsr_1.Name = "drp_audsr_1";

             this.drp_audsr_1.Size = new System.Drawing.Size(43, 20);

             this.drp_audsr_1.TabIndex = 9;

@@ -623,9 +623,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle1.Format = "N0";

-            dataGridViewCellStyle1.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle1;

+            dataGridViewCellStyle3.Format = "N0";

+            dataGridViewCellStyle3.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle3;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

@@ -737,7 +737,7 @@ namespace Handbrake
             "112",

             "128",

             "160"});

-            this.drp_audbit_2.Location = new System.Drawing.Point(537, 92);

+            this.drp_audbit_2.Location = new System.Drawing.Point(537, 93);

             this.drp_audbit_2.Name = "drp_audbit_2";

             this.drp_audbit_2.Size = new System.Drawing.Size(80, 20);

             this.drp_audbit_2.TabIndex = 21;

@@ -754,7 +754,7 @@ namespace Handbrake
             "32",

             "24",

             "22.05"});

-            this.drp_audsr_2.Location = new System.Drawing.Point(488, 92);

+            this.drp_audsr_2.Location = new System.Drawing.Point(488, 93);

             this.drp_audsr_2.Name = "drp_audsr_2";

             this.drp_audsr_2.Size = new System.Drawing.Size(43, 20);

             this.drp_audsr_2.TabIndex = 20;

@@ -786,7 +786,7 @@ namespace Handbrake
             "32",

             "24",

             "22.05"});

-            this.drp_audsr_3.Location = new System.Drawing.Point(488, 128);

+            this.drp_audsr_3.Location = new System.Drawing.Point(488, 129);

             this.drp_audsr_3.Name = "drp_audsr_3";

             this.drp_audsr_3.Size = new System.Drawing.Size(43, 20);

             this.drp_audsr_3.TabIndex = 28;

@@ -1342,7 +1342,7 @@ namespace Handbrake
             this.lbl_drc4.AutoSize = true;

             this.lbl_drc4.BackColor = System.Drawing.Color.Transparent;

             this.lbl_drc4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_drc4.Location = new System.Drawing.Point(665, 165);

+            this.lbl_drc4.Location = new System.Drawing.Point(670, 165);

             this.lbl_drc4.Name = "lbl_drc4";

             this.lbl_drc4.Size = new System.Drawing.Size(19, 13);

             this.lbl_drc4.TabIndex = 39;

@@ -1354,7 +1354,7 @@ namespace Handbrake
             this.lbl_drc3.AutoSize = true;

             this.lbl_drc3.BackColor = System.Drawing.Color.Transparent;

             this.lbl_drc3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_drc3.Location = new System.Drawing.Point(665, 131);

+            this.lbl_drc3.Location = new System.Drawing.Point(670, 131);

             this.lbl_drc3.Name = "lbl_drc3";

             this.lbl_drc3.Size = new System.Drawing.Size(19, 13);

             this.lbl_drc3.TabIndex = 31;

@@ -1366,7 +1366,7 @@ namespace Handbrake
             this.lbl_drc2.AutoSize = true;

             this.lbl_drc2.BackColor = System.Drawing.Color.Transparent;

             this.lbl_drc2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_drc2.Location = new System.Drawing.Point(665, 91);

+            this.lbl_drc2.Location = new System.Drawing.Point(670, 91);

             this.lbl_drc2.Name = "lbl_drc2";

             this.lbl_drc2.Size = new System.Drawing.Size(19, 13);

             this.lbl_drc2.TabIndex = 23;

@@ -1377,7 +1377,7 @@ namespace Handbrake
             this.lbl_drc1.AutoSize = true;

             this.lbl_drc1.BackColor = System.Drawing.Color.Transparent;

             this.lbl_drc1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_drc1.Location = new System.Drawing.Point(665, 53);

+            this.lbl_drc1.Location = new System.Drawing.Point(670, 53);

             this.lbl_drc1.Name = "lbl_drc1";

             this.lbl_drc1.Size = new System.Drawing.Size(19, 13);

             this.lbl_drc1.TabIndex = 15;

@@ -1491,7 +1491,7 @@ namespace Handbrake
             this.trackBar1.Margin = new System.Windows.Forms.Padding(0);

             this.trackBar1.Maximum = 30;

             this.trackBar1.Name = "trackBar1";

-            this.trackBar1.Size = new System.Drawing.Size(49, 42);

+            this.trackBar1.Size = new System.Drawing.Size(50, 42);

             this.trackBar1.TabIndex = 13;

             this.trackBar1.TickFrequency = 10;

             this.trackBar1.ValueChanged += new System.EventHandler(this.trackBar1_Scroll);

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b3c131d6b..7930f5036 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1797,55 +1797,86 @@ namespace Handbrake
         // Audio system functions

         private void setAudioByContainer(String path)

         {

+            string oldval = "";

+

             if ((path.EndsWith(".mp4")) || (path.EndsWith(".mp4")))

             {

+                oldval = drp_audenc_1.Text;

                 drp_audenc_1.Items.Clear();

                 drp_audenc_1.Items.Add("AAC");

                 drp_audenc_1.Items.Add("AC3");

-                drp_audenc_1.SelectedIndex = 0;

+                if ((oldval != "AAC") && (oldval != "AC3"))

+                    drp_audenc_1.SelectedIndex = 0;

 

+                oldval = drp_audenc_2.Text;

                 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;

+                {

+                    if ((oldval != "AAC") && (oldval != "AC3"))

+                        drp_audenc_2.SelectedIndex = 0;

+                }

 

+                oldval = drp_audenc_3.Text;

                 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;

+                {

+                    if ((oldval != "AAC") && (oldval != "AC3"))

+                        drp_audenc_3.SelectedIndex = 0;

+                }

 

+                oldval = drp_audenc_4.Text;

                 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;

+                {

+                    if ((oldval != "AAC") && (oldval != "AC3"))

+                        drp_audenc_4.SelectedIndex = 0;

+                }

             }

             else if (path.EndsWith(".avi"))

             {

+                oldval = drp_audenc_1.Text;

                 drp_audenc_1.Items.Clear();

                 drp_audenc_1.Items.Add("MP3");

                 drp_audenc_1.Items.Add("AC3");

-                drp_audenc_1.SelectedIndex = 0;

+                if ((oldval != "MP3") && (oldval != "AC3"))

+                    drp_audenc_1.SelectedIndex = 0;

 

+                oldval = drp_audenc_2.Text;

                 drp_audenc_2.Items.Clear();

                 drp_audenc_2.Items.Add("MP3");

                 drp_audenc_2.Items.Add("AC3");

                 if (drp_audenc_2.Enabled)

-                    drp_audenc_2.SelectedIndex = 0;

+                {

+                    if ((oldval != "MP3") && (oldval != "AC3"))

+                        drp_audenc_2.SelectedIndex = 0;

+                }

 

+

+                oldval = drp_audenc_3.Text;

                 drp_audenc_3.Items.Clear();

                 drp_audenc_3.Items.Add("MP3");

                 drp_audenc_3.Items.Add("AC3");

                 if (drp_audenc_3.Enabled)

-                    drp_audenc_3.SelectedIndex = 0;

+                {

+                    if ((oldval != "MP3") && (oldval != "AC3"))

+                        drp_audenc_3.SelectedIndex = 0;

+                }

 

+                oldval = drp_audenc_4.Text;

                 drp_audenc_4.Items.Clear();

                 drp_audenc_4.Items.Add("MP3");

                 drp_audenc_4.Items.Add("AC3");

                 if (drp_audenc_4.Enabled)

-                    drp_audenc_4.SelectedIndex = 0;

+                {

+                    if ((oldval != "MP3") && (oldval != "AC3"))

+                        drp_audenc_4.SelectedIndex = 0;

+                }

             }

             else if (path.EndsWith(".ogm"))

             {

@@ -1875,7 +1906,9 @@ namespace Handbrake
                 drp_audenc_1.Items.Add("MP3");

                 drp_audenc_1.Items.Add("AC3");

                 drp_audenc_1.Items.Add("Vorbis");

-                drp_audenc_1.SelectedIndex = 0;

+                if (drp_audenc_1.Text == "")

+                    drp_audenc_1.SelectedIndex = 0;

+

 

                 drp_audenc_2.Items.Clear();

                 drp_audenc_2.Items.Add("AAC");

@@ -1883,7 +1916,10 @@ namespace Handbrake
                 drp_audenc_2.Items.Add("AC3");

                 drp_audenc_2.Items.Add("Vorbis");

                 if (drp_audenc_2.Enabled)

-                    drp_audenc_2.SelectedIndex = 0;

+                {

+                    if (drp_audenc_2.Text == "")

+                        drp_audenc_2.SelectedIndex = 0;

+                }

 

                 drp_audenc_3.Items.Clear();

                 drp_audenc_3.Items.Add("AAC");

@@ -1891,7 +1927,10 @@ namespace Handbrake
                 drp_audenc_3.Items.Add("AC3");

                 drp_audenc_3.Items.Add("Vorbis");

                 if (drp_audenc_3.Enabled)

-                    drp_audenc_3.SelectedIndex = 0;

+                {

+                    if (drp_audenc_3.Text == "")

+                        drp_audenc_3.SelectedIndex = 0;

+                }

 

                 drp_audenc_4.Items.Clear();

                 drp_audenc_4.Items.Add("AAC");

@@ -1899,7 +1938,10 @@ namespace Handbrake
                 drp_audenc_4.Items.Add("AC3");

                 drp_audenc_4.Items.Add("Vorbis");

                 if (drp_audenc_4.Enabled)

-                    drp_audenc_4.SelectedIndex = 0;

+                {

+                    if (drp_audenc_4.Text == "")

+                        drp_audenc_4.SelectedIndex = 0;

+                }

             }

         }

 

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e91100bb4..e9b8e49f4 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -149,6 +149,12 @@ 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>