diff options
| author | sr55 <[email protected]> | 2015-08-25 13:18:35 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-08-25 13:18:35 +0000 |
| commit | ff73c0ecf1e69b80fe1b10132ebc0c4957a5f03d (patch) | |
| tree | 04e77ba263d4101eee8bac8733fb920b6326f651 /win | |
| parent | d078868681a1892e1e67050ebafa1066efc45f73 (diff) | |
WinGui: Fix another instance of the Caliburn vs Json.net sillyness where objects are not serialised correctly. This is causing presets not to save to disk correctly.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7413 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs | 15 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs | 12 |
2 files changed, 9 insertions, 18 deletions
diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs index 4194dda1e..8d49f5ab7 100644 --- a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs +++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs @@ -11,25 +11,16 @@ namespace HandBrakeWPF.Model.Audio {
using System.ComponentModel;
using System.Linq;
- using System.Windows.Media.Animation;
- using Caliburn.Micro;
+ using HandBrake.ApplicationServices.Utilities;
/// <summary>
/// Audio Behaviours
/// </summary>
public class AudioBehaviours : PropertyChangedBase
{
- /// <summary>
- /// The selected behaviour.
- /// </summary>
private AudioBehaviourModes selectedBehaviour;
-
- /// <summary>
- /// The selected langauges.
- /// </summary>
private BindingList<string> selectedLangauges;
-
private AudioTrackDefaultsMode trackDefaultBehaviour;
/// <summary>
@@ -126,8 +117,8 @@ namespace HandBrakeWPF.Model.Audio {
AudioBehaviours cloned = new AudioBehaviours
{
- SelectedBehaviour = this.selectedBehaviour,
- SelectedLangauges = new BindingList<string>(),
+ SelectedBehaviour = this.selectedBehaviour,
+ SelectedLangauges = new BindingList<string>(),
SelectedTrackDefaultBehaviour = this.SelectedTrackDefaultBehaviour
};
diff --git a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs index db5b7eb39..e31ad2042 100644 --- a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs +++ b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs @@ -12,7 +12,7 @@ namespace HandBrakeWPF.Model.Subtitles using System.ComponentModel;
using System.Linq;
- using Caliburn.Micro;
+ using HandBrake.ApplicationServices.Utilities;
/// <summary>
/// A class to track the behaviours of audio track selection
@@ -158,11 +158,11 @@ namespace HandBrakeWPF.Model.Subtitles {
SubtitleBehaviours cloned = new SubtitleBehaviours
{
- SelectedBehaviour = this.selectedBehaviour,
- SelectedBurnInBehaviour = this.selectedBurnInBehaviour,
- SelectedLangauges = new BindingList<string>(),
- AddClosedCaptions = this.addClosedCaptions,
- AddForeignAudioScanTrack = this.addForeignAudioScanTrack,
+ SelectedBehaviour = this.selectedBehaviour,
+ SelectedBurnInBehaviour = this.selectedBurnInBehaviour,
+ SelectedLangauges = new BindingList<string>(),
+ AddClosedCaptions = this.addClosedCaptions,
+ AddForeignAudioScanTrack = this.addForeignAudioScanTrack,
};
foreach (var item in this.SelectedLangauges)
|