WinGui:

- Select the first audio track instead of "Automatic" in the Audio Track Dropdown Menu.
- Cleaned up some subtitle code.

git-svn-id: svn://localhost/HandBrake/trunk@3046 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs
index 2c2028b..867dbba 100644 (file)
--- a/win/C#/Controls/AudioPanel.cs
+++ b/win/C#/Controls/AudioPanel.cs
@@ -265,7 +265,7 @@ namespace Handbrake.Controls
 \r
             // Handle Native Language and "Dub Foreign language audio" and "Use Foreign language audio and Subtitles" Options\r
             if (Properties.Settings.Default.NativeLanguage == "Any")\r
-                drp_audioTrack.SelectedIndex = 0;\r
+                drp_audioTrack.SelectedIndex = drp_audioTrack.Items.Count >= 3 ? 2 : 0;\r
             else\r
             {\r
                 if (Properties.Settings.Default.DubAudio) // "Dub Foreign language audio" \r
@@ -294,7 +294,7 @@ namespace Handbrake.Controls
                     }\r
                 }\r
                 else\r
-                    drp_audioTrack.SelectedIndex = 0; // "Use Foreign language audio and Subtitles"\r
+                    drp_audioTrack.SelectedIndex = drp_audioTrack.Items.Count >= 3 ? 2 : 0; // "Use Foreign language audio and Subtitles"\r
             }\r
             drp_audioMix.SelectedIndex = 0;\r
         }\r

diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs
index 80c7edb..44159db 100644 (file)
--- a/win/C#/Controls/Subtitles.cs
+++ b/win/C#/Controls/Subtitles.cs
@@ -383,8 +383,14 @@ namespace Handbrake.Controls
             }\r
             return false;\r
         }\r
-        public void SetSubtitleTrackAuto()\r
+        public void SetSubtitleTrackAuto(object[] subs)\r
         {\r
+            drp_subtitleTracks.Items.Clear();\r
+            drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");\r
+            drp_subtitleTracks.Items.AddRange(subs);\r
+            drp_subtitleTracks.SelectedIndex = 0;\r
+            Clear();\r
+\r
             // Handle Native Language and "Dub Foreign language audio" and "Use Foreign language audio and Subtitles" Options\r
             if (Properties.Settings.Default.NativeLanguage != "Any")\r
             {\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 87ea63e..2f8690e 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -932,12 +932,7 @@ namespace Handbrake
                 AudioSettings.SetTrackList(selectedTitle);\r
 \r
                 // Populate the Subtitles dropdown\r
-                Subtitles.drp_subtitleTracks.Items.Clear();\r
-                Subtitles.drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");\r
-                Subtitles.drp_subtitleTracks.Items.AddRange(selectedTitle.Subtitles.ToArray());\r
-                Subtitles.drp_subtitleTracks.SelectedIndex = 0;\r
-                Subtitles.Clear();\r
-                Subtitles.SetSubtitleTrackAuto();\r
+                Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray());\r
             }\r
             // Update the source label if we have multiple streams\r
             if (selectedTitle != null)\r