From 7f7055ee54f9dfb0cdad5c73841452fd8491f51e Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Fri, 20 Jul 2012 17:06:08 +0000
Subject: 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
---
 win/CS/HandBrake.ApplicationServices/Services/LibScan.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'win/CS/HandBrake.ApplicationServices/Services/LibScan.cs')

diff --git a/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
index 4957a62bb..a25f3a2a6 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs
@@ -14,12 +14,15 @@ namespace HandBrake.ApplicationServices.Services
     using System.Text;
     using System.Threading;
 
+    using Caliburn.Micro;
+
     using HandBrake.ApplicationServices.EventArgs;
     using HandBrake.ApplicationServices.Model.Encoding;
     using HandBrake.ApplicationServices.Parsing;
     using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
     using HandBrake.Interop;
+    using HandBrake.Interop.Interfaces;
 
     using AudioTrack = HandBrake.ApplicationServices.Parsing.Audio;
     using ScanProgressEventArgs = HandBrake.Interop.ScanProgressEventArgs;
@@ -47,7 +50,7 @@ namespace HandBrake.ApplicationServices.Services
         /// <summary>
         /// LibHB Instance
         /// </summary>
-        private readonly HandBrakeInstance instance;
+        private readonly IHandBrakeInstance instance;
 
         /// <summary>
         /// Log data from HandBrakeInstance
@@ -68,7 +71,7 @@ namespace HandBrake.ApplicationServices.Services
         {
             logging = new StringBuilder();
 
-            instance = ServiceManager.HandBrakeInstance;
+            instance = IoC.Get<IHandBrakeInstance>();
             instance.Initialize(1);
             instance.ScanProgress += this.InstanceScanProgress;
             instance.ScanCompleted += this.InstanceScanCompleted;
-- 
cgit v1.2.3