WinGui: Fix another instance of the Caliburn vs Json.net sillyness where objects...

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7413 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
index 4194dda1e1409e62e2608629f1b5075ec30d71f6..8d49f5ab72c9f9b4b57b8e7ef64ab8c6d9fd6102 100644 (file)
--- a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
@@ -11,25 +11,16 @@ namespace HandBrakeWPF.Model.Audio
 {\r
     using System.ComponentModel;\r
     using System.Linq;\r
-    using System.Windows.Media.Animation;\r
 \r
-    using Caliburn.Micro;\r
+    using HandBrake.ApplicationServices.Utilities;\r
 \r
     /// <summary>\r
     /// Audio Behaviours\r
     /// </summary>\r
     public class AudioBehaviours : PropertyChangedBase\r
     {\r
-        /// <summary>\r
-        /// The selected behaviour.\r
-        /// </summary>\r
         private AudioBehaviourModes selectedBehaviour;\r
-\r
-        /// <summary>\r
-        /// The selected langauges.\r
-        /// </summary>\r
         private BindingList<string> selectedLangauges;\r
-\r
         private AudioTrackDefaultsMode trackDefaultBehaviour;\r
 \r
         /// <summary>\r
@@ -126,8 +117,8 @@ namespace HandBrakeWPF.Model.Audio
         {\r
             AudioBehaviours cloned = new AudioBehaviours\r
                        {\r
-                           SelectedBehaviour = this.selectedBehaviour,\r
-                           SelectedLangauges = new BindingList<string>(),\r
+                           SelectedBehaviour = this.selectedBehaviour, \r
+                           SelectedLangauges = new BindingList<string>(), \r
                            SelectedTrackDefaultBehaviour = this.SelectedTrackDefaultBehaviour\r
                        };\r
 \r

diff --git a/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs
index db5b7eb3969592d42b6260f9b4ac91b9f87a1188..e31ad2042f9417c32e777f2fcd094060275355b3 100644 (file)
--- 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;\r
     using System.Linq;\r
 \r
-    using Caliburn.Micro;\r
+    using HandBrake.ApplicationServices.Utilities;\r
 \r
     /// <summary>\r
     ///  A class to track the behaviours of audio track selection\r
@@ -158,11 +158,11 @@ namespace HandBrakeWPF.Model.Subtitles
         {\r
             SubtitleBehaviours cloned = new SubtitleBehaviours\r
             {\r
-                SelectedBehaviour = this.selectedBehaviour,\r
-                SelectedBurnInBehaviour = this.selectedBurnInBehaviour,\r
-                SelectedLangauges = new BindingList<string>(),\r
-                AddClosedCaptions = this.addClosedCaptions,\r
-                AddForeignAudioScanTrack = this.addForeignAudioScanTrack,\r
+                SelectedBehaviour = this.selectedBehaviour, \r
+                SelectedBurnInBehaviour = this.selectedBurnInBehaviour, \r
+                SelectedLangauges = new BindingList<string>(), \r
+                AddClosedCaptions = this.addClosedCaptions, \r
+                AddForeignAudioScanTrack = this.addForeignAudioScanTrack, \r
             };\r
 \r
             foreach (var item in this.SelectedLangauges)\r