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

2 files changed, 4 insertions, 2 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs
index 20deeae1b..34a919908 100644
--- a/win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs
+++ b/win/CS/HandBrake.ApplicationServices/Parsing/Subtitle.cs
@@ -14,8 +14,8 @@ namespace HandBrake.ApplicationServices.Parsing
     using System.IO;

     using System.Text.RegularExpressions;

 

-    using HandBrake.ApplicationServices.Functions;

     using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Utilities;

 

     /// <summary>

     /// An object that represents a subtitle associated with a Title, in a DVD

diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
index 8b3667271..454627fa9 100644
--- a/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
+++ b/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
@@ -16,6 +16,8 @@ namespace HandBrake.ApplicationServices.Parsing
     using System.Linq;

     using System.Text.RegularExpressions;

 

+    using Caliburn.Micro;

+

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.Interop.Model;

 

@@ -29,7 +31,7 @@ namespace HandBrake.ApplicationServices.Parsing
         /// <summary>

         /// The User Setting Service

         /// </summary>

-        private static IUserSettingService userSettingService = ServiceManager.UserSettingService;

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

 

         /// <summary>

         /// Initializes a new instance of the <see cref="Title"/> class.