diff options
| author | sr55 <[email protected]> | 2012-01-21 14:14:29 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-01-21 14:14:29 +0000 |
| commit | 1269be58e47ef6a6eaf61ef79144e08ccdffeff2 (patch) | |
| tree | 490c7cbf236d0b53c60db871144d04d4fa01be97 /win/CS/Controls | |
| parent | 24bad0ff777bb16926706c5b3712d622cc0ed81b (diff) | |
WinGui: Another fix to AutoPassthru functionality so that built-in presets still get honoured correctly.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4416 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/Controls')
| -rw-r--r-- | win/CS/Controls/AudioPanel.cs | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs index fe7fab39f..7ce9c318b 100644 --- a/win/CS/Controls/AudioPanel.cs +++ b/win/CS/Controls/AudioPanel.cs @@ -321,7 +321,7 @@ namespace Handbrake.Controls // Correct bad passthru option
if (this.IsIncompatiblePassthru(track))
{
- AudioEncoder encoder = GetCompatiblePassthru(track);
+ AudioEncoder encoder = GetCompatiblePassthru(track, false);
drp_audioEncoder.SelectedItem = EnumHelper<AudioEncoder>.GetDisplay(encoder);
}
}
@@ -350,7 +350,7 @@ namespace Handbrake.Controls // Correct bad passthru option
if (this.IsIncompatiblePassthru(track))
{
- AudioEncoder encoder = GetCompatiblePassthru(track);
+ AudioEncoder encoder = GetCompatiblePassthru(track, false);
drp_audioEncoder.SelectedItem = EnumHelper<AudioEncoder>.GetDisplay(encoder);
}
break;
@@ -844,6 +844,12 @@ namespace Handbrake.Controls }
}
+ /// <summary>
+ /// Move to
+ /// </summary>
+ /// <param name="top">
+ /// The top.
+ /// </param>
private void MoveTo(bool top)
{
if (audioList.SelectedRows.Count == 0) return;
@@ -1081,13 +1087,15 @@ namespace Handbrake.Controls /// <param name="track">
/// The track.
/// </param>
+ /// <param name="useAutoPassthruOptions">
+ /// The use Auto Passthru Options.
+ /// </param>
/// <returns>
/// AN Audio encoder.
/// </returns>
- private AudioEncoder GetCompatiblePassthru(AudioTrack track)
+ private AudioEncoder GetCompatiblePassthru(AudioTrack track, bool useAutoPassthruOptions)
{
- //
- if (this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAdvancedAudioPassthruOpts))
+ if (useAutoPassthruOptions)
{
if (track.ScannedTrack.Format.Contains("AC3") && this.check_ac3.Checked)
{
@@ -1155,7 +1163,7 @@ namespace Handbrake.Controls {
if (this.IsIncompatiblePassthru(track))
{
- track.Encoder = GetCompatiblePassthru(track);
+ track.Encoder = GetCompatiblePassthru(track, true);
}
}
}
|