diff options
| author | sr55 <[email protected]> | 2015-06-26 20:27:47 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-06-26 20:27:47 +0000 |
| commit | 52d3bbb87d58e826e41861623adeccc3e8d329d7 (patch) | |
| tree | ddcd071e1f6ce56ab13ecb07e6ecf3dc0bc0c47f | |
| parent | 93fd841dee02bb8b2fe6cd393a340c1c42201e66 (diff) | |
WinGui: Couple of workaround fixes for the preset service until refactoring is completed.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7320 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs | 5 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Services/Presets/PresetService.cs | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs index a95c9b1ea..acc63874f 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs @@ -242,9 +242,8 @@ namespace HandBrakeWPF.Services.Presets.Factories preset.Task.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(importedPreset.AudioEncoderFallback);
preset.AudioTrackBehaviours.SelectedBehaviour = importedPreset.AudioTrackSelectionBehavior == "all"
? AudioBehaviourModes.AllMatching
- : importedPreset.AudioTrackSelectionBehavior == "first"
- ? AudioBehaviourModes.FirstMatch
- : AudioBehaviourModes.None;
+ : AudioBehaviourModes.FirstMatch;
+ preset.AudioTrackBehaviours.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.None;
if (importedPreset.AudioCopyMask != null)
{
diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs index c6e3c3e4b..e3aee79bf 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs @@ -192,8 +192,6 @@ namespace HandBrakeWPF.Services.Presets {
preset = JsonPresetFactory.ImportPreset(hbPreset);
preset.Category = UserPresetCatgoryName;
- preset.AudioTrackBehaviours = new AudioBehaviours();
- preset.SubtitleTrackBehaviours = new SubtitleBehaviours();
// Handle the PictureDecombDeinterlace key
if (preset.UseDeinterlace)
@@ -273,6 +271,8 @@ namespace HandBrakeWPF.Services.Presets preset.PictureSettingsMode = update.PictureSettingsMode;
preset.Category = update.Category;
preset.Description = update.Description;
+ preset.AudioTrackBehaviours = update.AudioTrackBehaviours;
+ preset.SubtitleTrackBehaviours = update.SubtitleTrackBehaviours;
// Update the presets file
this.UpdatePresetFiles();
|