WinGui:

- Added new options:  preferred language,  "Dub Foreign language audio" and "Use Foreign language audio and Subtitles"
- Changed built-in language list to native spellings.
- Fixes to CLI Scan Parser AudioTrack.\

- Note: Subtitles panel is not hooked up for this yet.

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

2 files changed, 27 insertions, 1 deletions

diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs
index d086999a1..c846f5055 100644
--- a/win/C#/Controls/AudioPanel.cs
+++ b/win/C#/Controls/AudioPanel.cs
@@ -227,7 +227,29 @@ namespace Handbrake.Controls
             drp_audioTrack.Items.Add("Automatic");

             drp_audioTrack.Items.Add("None");

             drp_audioTrack.Items.AddRange(selectedTitle.AudioTracks.ToArray());

-            drp_audioTrack.SelectedIndex = 0;

+

+            // Handle Native Language and "Dub Foreign language audio" and "Use Foreign language audio and Subtitles" Options

+            if (Properties.Settings.Default.NativeLanguage == "Any")

+                drp_audioTrack.SelectedIndex = 0;

+            else

+            {

+                if (Properties.Settings.Default.DubAudio) // "Dub Foreign language audio" 

+                {

+                    int i = 0;

+                    foreach (object item in drp_audioTrack.Items)

+                    {

+                        if (item.ToString().Contains(Properties.Settings.Default.NativeLanguage))

+                            drp_audioTrack.SelectedIndex = i;

+

+                        i++;

+                    }

+

+                    foreach (ListViewItem item in lv_audioList.Items)

+                        item.SubItems[1].Text = drp_audioTrack.SelectedItem.ToString();     

+                }

+                else

+                    drp_audioTrack.SelectedIndex = 0; // "Use Foreign language audio and Subtitles"

+            }

             drp_audioMix.SelectedIndex = 0;

         }

         public ListView getAudioPanel()

diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs
index c785cdeb6..9036a6c72 100644
--- a/win/C#/Controls/Subtitles.cs
+++ b/win/C#/Controls/Subtitles.cs
@@ -22,6 +22,10 @@ namespace Handbrake.Controls
         }

 

         private int FileContainer;

+        public void setSubtitleTrackAuto()

+        {

+            //TODO

+        }

         public void setContainer(int value)

         {

             FileContainer = value;