diff options
| author | sr55 <[email protected]> | 2017-05-24 21:47:12 +0100 |
|---|---|---|
| committer | sr55 <[email protected]> | 2017-05-24 21:47:22 +0100 |
| commit | 615db8abfd8864a7fc61cc3d25895912ef6c5dd4 (patch) | |
| tree | ff1b4ae6818ab4068eb8db35eb166aa7a8f22db0 /win/CS/HandBrakeWPF/Services | |
| parent | e22fbb1a0faa3513dfdfbdd796f31c03df6e86bb (diff) | |
WinGui: Change the "For Additional Tracks" dropdown. Remove the "None" option. It doesn't make sense. This fixes an issue where we couldn't load "all" due to the preset key for it being a 2 state bollean rather than a 3 state option.
Diffstat (limited to 'win/CS/HandBrakeWPF/Services')
| -rw-r--r-- | win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs index 59307e5ed..a1b2b30a5 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs @@ -339,15 +339,7 @@ namespace HandBrakeWPF.Services.Presets.Factories ? AudioBehaviourModes.AllMatching
: AudioBehaviourModes.FirstMatch;
- // TODO - The other GUI's don't support All Tracks yet. So for now we can only load / Save first track.
- if (importedPreset.AudioSecondaryEncoderMode)
- {
- preset.AudioTrackBehaviours.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.FirstTrack;
- }
- else
- {
- preset.AudioTrackBehaviours.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.None;
- }
+ preset.AudioTrackBehaviours.SelectedTrackDefaultBehaviour = importedPreset.AudioSecondaryEncoderMode ? AudioTrackDefaultsMode.FirstTrack : AudioTrackDefaultsMode.AllTracks;
if (importedPreset.AudioCopyMask != null)
{
@@ -537,7 +529,7 @@ namespace HandBrakeWPF.Services.Presets.Factories preset.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetShortName(export.Task.AllowedPassthruOptions.AudioEncoderFallback);
preset.AudioLanguageList = LanguageUtilities.GetLanguageCodes(export.AudioTrackBehaviours.SelectedLangauges);
preset.AudioTrackSelectionBehavior = EnumHelper<AudioBehaviourModes>.GetShortName(export.AudioTrackBehaviours.SelectedBehaviour);
- preset.AudioSecondaryEncoderMode = export.AudioTrackBehaviours.SelectedTrackDefaultBehaviour == AudioTrackDefaultsMode.FirstTrack; // TODO -> We don't support AllTracks yet in other GUIs.
+ preset.AudioSecondaryEncoderMode = export.AudioTrackBehaviours.SelectedTrackDefaultBehaviour == AudioTrackDefaultsMode.FirstTrack; // 1 = First Track, 0 = All
preset.AudioList = new List<AudioList>();
foreach (var item in export.AudioTrackBehaviours.BehaviourTracks)
{
|