WinGui: Move some stuff around in the services library and refactor out some legacy code.

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

1 files changed, 5 insertions, 1 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs b/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs
index 5eb1f0a37..7edbdb320 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs
@@ -16,12 +16,16 @@ namespace HandBrake.ApplicationServices.Services
     using System.Threading;

     using System.Windows.Forms;

 

+    using Caliburn.Micro;

+

     using HandBrake.ApplicationServices.EventArgs;

     using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Parsing;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Utilities;

 

+    using Parser = HandBrake.ApplicationServices.Parsing.Parser;

+

     /// <summary>

     /// Scan a Source

     /// </summary>

@@ -52,7 +56,7 @@ namespace HandBrake.ApplicationServices.Services
         /// <summary>

         /// The User Setting Service

         /// </summary>

-        private IUserSettingService userSettingService = ServiceManager.UserSettingService;

+        private IUserSettingService userSettingService = IoC.Get<IUserSettingService>();

 

         #endregion