diff options
| author | sr55 <[email protected]> | 2011-07-31 21:16:26 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-07-31 21:16:26 +0000 |
| commit | 1074fcda1a9bc39939c9a2bd3eb346b621b4da19 (patch) | |
| tree | 1488b9a523d1d4e36061e17fefa01ebb7fe4a656 /win | |
| parent | 7f0a86bd7811b82cb5b086ea960ef7ccc054d3bd (diff) | |
WinGui: Temporary fix for the audio panel not accepting preset audio tracks due to the Automatic audio options overriding it. This is going to require a bit of thought for a full fix but should restore previous functionality.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4146 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/Controls/AudioPanel.cs | 16 | ||||
| -rw-r--r-- | win/CS/frmMain.cs | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs index 338cbb550..a3fb2889c 100644 --- a/win/CS/Controls/AudioPanel.cs +++ b/win/CS/Controls/AudioPanel.cs @@ -182,7 +182,7 @@ namespace Handbrake.Controls /// </summary>
/// <param name="selectedTitle">The selected title</param>
/// <param name="preset">A preset</param>
- public void SetTrackListFromPreset(Title selectedTitle, Preset preset)
+ public void SetTrackListAfterTitleChange(Title selectedTitle, Preset preset)
{
if (selectedTitle.AudioTracks.Count == 0)
{
@@ -575,6 +575,20 @@ namespace Handbrake.Controls return;
}
+ // If the Native Language is not set. Just set Track information in each output track.
+ if (Properties.Settings.Default.NativeLanguage == "Any")
+ {
+ drp_audioTrack.SelectedIndex = 0;
+ foreach (AudioTrack track in this.audioTracks)
+ {
+ if (this.drp_audioTrack.SelectedItem != null)
+ {
+ track.ScannedTrack = this.drp_audioTrack.SelectedItem as Audio;
+ }
+ }
+ return;
+ }
+
// Remove all old Audiotracks before adding new ones.
this.AudioTracks.Clear();
diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs index 031a632b5..bcdd6aaec 100644 --- a/win/CS/frmMain.cs +++ b/win/CS/frmMain.cs @@ -384,6 +384,7 @@ namespace Handbrake }
#endregion
+
#region Tools Menu
/// <summary>
@@ -1471,7 +1472,7 @@ namespace Handbrake drop_chapterFinish.Text = drop_chapterFinish.Items[drop_chapterFinish.Items.Count - 1].ToString();
// Populate the Audio Channels Dropdown
- AudioSettings.SetTrackListFromPreset(selectedTitle, this.currentlySelectedPreset);
+ AudioSettings.SetTrackListAfterTitleChange(selectedTitle, this.currentlySelectedPreset);
// Populate the Subtitles dropdown
Subtitles.SetSubtitleTrackAuto(selectedTitle.Subtitles.ToArray());
|