WinGui: Removing the Isolation code as it's not used, and planned for libhb instead.

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

4 files changed, 6 insertions, 55 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
index 21921b5d6..008d70dcb 100644
--- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs
@@ -30,7 +30,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// Backing field for the encodeService service

         /// </summary>

-        private readonly IEncodeServiceWrapper encodeService;

+        private readonly IEncode encodeService;

 

         /// <summary>

         /// Backing field for the Scan Service

@@ -58,7 +58,7 @@ namespace HandBrakeWPF.ViewModels
         /// <param name="scanService">

         /// The scan service.

         /// </param>

-        public LogViewModel(IEncodeServiceWrapper encodeService, IScan scanService)

+        public LogViewModel(IEncode encodeService, IScan scanService)

         {

             this.encodeService = encodeService;

             this.scanService = scanService;

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index d3fd9900c..f204b084d 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -97,7 +97,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// The Encode Service

         /// </summary>

-        private readonly IEncodeServiceWrapper encodeService;

+        private readonly IEncode encodeService;

 

         /// <summary>

         /// Windows 7 API Pack wrapper

@@ -229,7 +229,7 @@ namespace HandBrakeWPF.ViewModels
         /// The when Done Service.

         /// *** Leave in Constructor. *** 

         /// </param>

-        public MainViewModel(IUserSettingService userSettingService, IScan scanService, IEncodeServiceWrapper encodeService, IPresetService presetService,

+        public MainViewModel(IUserSettingService userSettingService, IScan scanService, IEncode encodeService, IPresetService presetService,

             IErrorService errorService, IShellViewModel shellViewModel, IUpdateService updateService, INotificationService notificationService,

             IPrePostActionService whenDoneService)

         {

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 77132cf11..31841a335 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -261,16 +261,6 @@ namespace HandBrakeWPF.ViewModels
         private UpdateCheckInformation updateInfo;

 

         /// <summary>

-        /// The enable process isolation.

-        /// </summary>

-        private bool enableProcessIsolation;

-

-        /// <summary>

-        /// The server port.

-        /// </summary>

-        private int serverPort;

-

-        /// <summary>

         /// The show advanced tab backing field.

         /// </summary>

         private bool showAdvancedTab;

@@ -1061,38 +1051,6 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

-        /// Gets or sets a value indicating whether ClearQueueOnEncodeCompleted.

-        /// </summary>

-        public bool EnableProcessIsolation

-        {

-            get

-            {

-                return this.enableProcessIsolation;

-            }

-            set

-            {

-                this.enableProcessIsolation = value;

-                this.NotifyOfPropertyChange(() => this.EnableProcessIsolation);

-            }

-        }

-

-        /// <summary>

-        /// Gets or sets the server port.

-        /// </summary>

-        public int ServerPort

-        {

-            get

-            {

-                return this.serverPort;

-            }

-            set

-            {

-                this.serverPort = value;

-                this.NotifyOfPropertyChange(() => this.ServerPort);

-            }

-        }

-

-        /// <summary>

         /// Gets or sets a value indicating whether enable lib hb.

         /// </summary>

         public bool ShowAdvancedTab

@@ -1541,11 +1499,6 @@ namespace HandBrakeWPF.ViewModels
 

             // Use dvdnav

             this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav);  

-

-            int port;

-            int.TryParse(userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort), out port);

-            this.ServerPort = port;

-            this.EnableProcessIsolation = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);

         }

 

         /// <summary>

@@ -1606,8 +1559,6 @@ namespace HandBrakeWPF.ViewModels
             }

 

             userSettingService.SetUserSetting(UserSettingConstants.DisableLibDvdNav, this.DisableLibdvdNav);

-            userSettingService.SetUserSetting(UserSettingConstants.EnableProcessIsolation, this.EnableProcessIsolation);

-            userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString(CultureInfo.InvariantCulture));

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index 5099a2d9a..ff1b1a0c9 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -55,7 +55,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// Backing field for the encode service.

         /// </summary>

-        private readonly IEncodeServiceWrapper encodeService;

+        private readonly IEncode encodeService;

 

         /// <summary>

         /// The error service

@@ -134,7 +134,7 @@ namespace HandBrakeWPF.ViewModels
 

             // Live Preview

             this.userSettingService = userSettingService;

-            this.encodeService = new EncodeServiceWrapper(userSettingService); // Preview needs a seperate instance rather than the shared singleton. This could maybe do with being refactored at some point

+            this.encodeService = new EncodeServiceWrapper(); // Preview needs a seperate instance rather than the shared singleton. This could maybe do with being refactored at some point

 

             this.Title = "Preview";

             this.Percentage = "0.00%";