diff options
| author | sr55 <[email protected]> | 2009-12-26 22:47:50 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2009-12-26 22:47:50 +0000 |
| commit | 3d294a01c523f1172e5dbd2a2923ea176e542729 (patch) | |
| tree | 88fab80a4ba0730c93fd92840b9b0c370049fc97 /win | |
| parent | 4a02ac01cd52134c1c613bd73d404db8dc3c237b (diff) | |
WinGui:
- Select the first audio track instead of "Automatic" in the Audio Track Dropdown Menu.
- Cleaned up some subtitle code.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3046 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/C#/Controls/AudioPanel.cs | 4 | ||||
| -rw-r--r-- | win/C#/Controls/Subtitles.cs | 8 | ||||
| -rw-r--r-- | win/C#/frmMain.cs | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/win/C#/Controls/AudioPanel.cs b/win/C#/Controls/AudioPanel.cs index 2c2028b97..867dbbabf 100644 --- a/win/C#/Controls/AudioPanel.cs +++ b/win/C#/Controls/AudioPanel.cs @@ -265,7 +265,7 @@ namespace Handbrake.Controls // 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;
+ drp_audioTrack.SelectedIndex = drp_audioTrack.Items.Count >= 3 ? 2 : 0;
else
{
if (Properties.Settings.Default.DubAudio) // "Dub Foreign language audio"
@@ -294,7 +294,7 @@ namespace Handbrake.Controls }
}
else
- drp_audioTrack.SelectedIndex = 0; // "Use Foreign language audio and Subtitles"
+ drp_audioTrack.SelectedIndex = drp_audioTrack.Items.Count >= 3 ? 2 : 0; // "Use Foreign language audio and Subtitles"
}
drp_audioMix.SelectedIndex = 0;
}
diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs index 80c7edb66..44159db55 100644 --- a/win/C#/Controls/Subtitles.cs +++ b/win/C#/Controls/Subtitles.cs @@ -383,8 +383,14 @@ namespace Handbrake.Controls }
return false;
}
- public void SetSubtitleTrackAuto()
+ public void SetSubtitleTrackAuto(object[] subs)
{
+ drp_subtitleTracks.Items.Clear();
+ drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");
+ drp_subtitleTracks.Items.AddRange(subs);
+ drp_subtitleTracks.SelectedIndex = 0;
+ Clear();
+
// Handle Native Language and "Dub Foreign language audio" and "Use Foreign language audio and Subtitles" Options
if (Properties.Settings.Default.NativeLanguage != "Any")
{
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 87ea63e92..2f8690e78 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -932,12 +932,7 @@ namespace Handbrake AudioSettings.SetTrackList(selectedTitle);
// Populate the Subtitles dropdown
- Subtitles.drp_subtitleTracks.Items.Clear();
- Subtitles.drp_subtitleTracks.Items.Add("Foreign Audio Search (Bitmap)");
- Subtitles.drp_subtitleTracks.Items.AddRange(selectedTitle.Subtitles.ToArray());
- Subtitles.drp_subtitleTracks.SelectedIndex = 0;
- Subtitles.Clear();
- Subtitles.SetSubtitleTrackAuto();
+ Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray());
}
// Update the source label if we have multiple streams
if (selectedTitle != null)
|