WinGui:

- Multiple bug fixes to the Audio Panel. (Disable DRC for non AC3 sources, DPL2 getting swaped out for stereo when you click between tracks, Exception thrown due to the source track not getting pushed into the Audio model before it's used.)

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

5 files changed, 26 insertions, 11 deletions

diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index 5e6341641..e33cacbb6 100644
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -157,6 +157,16 @@ namespace Handbrake.Controls
 

             foreach (AudioTrack track in tracks)

             {

+                if (track.Encoder == AudioEncoder.Ac3Passthrough)

+                {

+                    track.MixDown = HandBrake.ApplicationServices.Model.Encoding.Mixdown.Ac3Passthrough;

+                }

+

+                if (track.Encoder == AudioEncoder.DtsPassthrough)

+                {

+                    track.MixDown = HandBrake.ApplicationServices.Model.Encoding.Mixdown.DtsPassthrough;

+                }

+

                 this.audioTracks.Add(track);

             }

 

@@ -185,12 +195,14 @@ namespace Handbrake.Controls
 

             // Setup the Audio track source dropdown with the new audio tracks.

             this.ScannedTracks.Clear();

+            this.drp_audioTrack.SelectedItem = null;

             foreach (var item in selectedTitle.AudioTracks)

             {

                 this.ScannedTracks.Add(item);

             }

+

+            drp_audioTrack.SelectedItem = this.ScannedTracks.FirstOrDefault();

             this.drp_audioTrack.Refresh();

-            drp_audioTrack.SelectedIndex = 0;

 

             // Add any tracks the preset has, if there is a preset and no audio tracks in the list currently

             if (audioList.Rows.Count == 0 && preset != null)

@@ -198,6 +210,7 @@ namespace Handbrake.Controls
                 EncodeTask parsed = QueryParserUtility.Parse(preset.Query);

                 foreach (AudioTrack audioTrack in parsed.AudioTracks)

                 {

+                    audioTrack.ScannedTrack = drp_audioTrack.SelectedItem as Audio;

                     this.audioTracks.Add(audioTrack);

                 }

             }

@@ -236,7 +249,7 @@ namespace Handbrake.Controls
             switch (ctl.Name)

             {

                 case "drp_audioTrack":

-                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0)

+                    if (audioList.Rows.Count != 0 && audioList.SelectedRows.Count != 0 && drp_audioTrack.SelectedItem != null)

                     {

                         track.ScannedTrack = drp_audioTrack.SelectedItem as Audio;

 

@@ -346,7 +359,7 @@ namespace Handbrake.Controls
             if (drp_audioTrack.Text == "None Found")

             {

                 MessageBox.Show(

-                    "Your source appears to have no audio tracks that HandBrake supports.",

+                    "Your source appears to have no audio tracks, or no tracks in a format that HandBrake supports.",

                     "Warning",

                     MessageBoxButtons.OK,

                     MessageBoxIcon.Warning);

@@ -487,7 +500,7 @@ namespace Handbrake.Controls
                 {

                     if (this.drp_audioTrack.SelectedItem != null)

                     {

-                        track.ScannedTrack = this.drp_audioTrack.SelectedItem as HandBrake.ApplicationServices.Parsing.Audio;

+                        track.ScannedTrack = this.drp_audioTrack.SelectedItem as Audio;

                     }

                 }

             }

@@ -515,13 +528,13 @@ namespace Handbrake.Controls
                         if (drp_audioTrack.SelectedItem != null)

                             foreach (AudioTrack track in this.audioTracks)

                                 track.ScannedTrack =

-                                    drp_audioTrack.SelectedItem as HandBrake.ApplicationServices.Parsing.Audio;

+                                    drp_audioTrack.SelectedItem as Audio;

                         else

                         {

                             drp_audioTrack.SelectedIndex = 0;

                             if (drp_audioTrack.SelectedItem != null)

                                 foreach (AudioTrack track in this.audioTracks)

-                                    track.ScannedTrack = drp_audioTrack.SelectedItem as HandBrake.ApplicationServices.Parsing.Audio;

+                                    track.ScannedTrack = drp_audioTrack.SelectedItem as Audio;

                         }

 

                         break;

@@ -532,7 +545,7 @@ namespace Handbrake.Controls
 

                         if (drp_audioTrack.SelectedItem != null)

                             foreach (AudioTrack track in this.audioTracks)

-                                track.ScannedTrack = drp_audioTrack.SelectedItem as HandBrake.ApplicationServices.Parsing.Audio;

+                                track.ScannedTrack = drp_audioTrack.SelectedItem as Audio;

                         break;

                 }

             }

@@ -719,8 +732,6 @@ namespace Handbrake.Controls
             drp_audioMix.Items.Add(AC3Passthru);

             drp_audioMix.Items.Add(DTSPassthru);

 

-            drp_audioMix.SelectedItem = "Dolby Pro Logic II";

-

             switch (drp_audioEncoder.Text)

             {

                 case "AAC (faac)":

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs b/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
index e267e45f4..61aeef1d7 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/GeneralUtilities.cs
@@ -123,6 +123,7 @@ namespace HandBrake.ApplicationServices.Utilities
                 logHeader.AppendLine(String.Format("CLI Query: {0}", encJob.Query));

                 logHeader.AppendLine(String.Format("User Query: {0}", encJob.CustomQuery));

             }

+

             logHeader.AppendLine("-------------------------------------------");

 

             return logHeader;

diff --git a/win/CS/HandBrake10.5.1.ReSharper b/win/CS/HandBrake10.5.1.ReSharper
index da45302cf..c7c8085d7 100644
--- a/win/CS/HandBrake10.5.1.ReSharper
+++ b/win/CS/HandBrake10.5.1.ReSharper
@@ -68,7 +68,7 @@
         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />

         <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />

         <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />

+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="Aa_bb" ElementKind="MethodPropertyEvent" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />

diff --git a/win/CS/ToolWindows/AdvancedAudio.cs b/win/CS/ToolWindows/AdvancedAudio.cs
index 5adc7c49e..fba1f7cb6 100644
--- a/win/CS/ToolWindows/AdvancedAudio.cs
+++ b/win/CS/ToolWindows/AdvancedAudio.cs
@@ -38,6 +38,7 @@ namespace Handbrake.ToolWindows
             {

                 return this.track;

             }

+

             set

             {

                 this.track = value;

@@ -71,6 +72,8 @@ namespace Handbrake.ToolWindows
                 int.TryParse(drcValue.ToString(Culture), out drcCalculated);

                 tb_drc.Value = drcCalculated;

                 lbl_drc.Text = track.DRC.ToString();

+                tb_drc.Enabled = track.TrackDisplay.Contains("(AC3)");

+

             }

         }

 

diff --git a/win/CS/frmOptions.Designer.cs b/win/CS/frmOptions.Designer.cs
index 83ad47d2a..3a5593864 100644
--- a/win/CS/frmOptions.Designer.cs
+++ b/win/CS/frmOptions.Designer.cs
@@ -424,7 +424,7 @@ namespace Handbrake
             this.check_autoNaming.AutoSize = true;

             this.check_autoNaming.Location = new System.Drawing.Point(111, 13);

             this.check_autoNaming.Name = "check_autoNaming";

-            this.check_autoNaming.Size = new System.Drawing.Size(176, 17);

+            this.check_autoNaming.Size = new System.Drawing.Size(171, 17);

             this.check_autoNaming.TabIndex = 72;

             this.check_autoNaming.Text = "Automatically name output files";

             this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");