diff options
author | sr55 <[email protected]> | 2012-10-06 19:39:22 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2012-10-06 19:39:22 +0000 |
commit | b64dfc0aae97cb64efd89bfb31889cdd762376bd (patch) | |
tree | c5f8a6554ed806a456629902510aef9d43146912 /win/CS/HandBrakeWPF/Services | |
parent | 49d2ade305998515d9391bf4e82f4c95313fb05f (diff) |
WinGui: Remove Castle references from HandBrake.Interop
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5003 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Services')
-rw-r--r-- | win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs | 6 | ||||
-rw-r--r-- | win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs index 79d79164f..a3506a60d 100644 --- a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs +++ b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs @@ -13,14 +13,11 @@ namespace HandBrakeWPF.Services {
using System;
- using Caliburn.Micro;
-
using HandBrake.ApplicationServices.Exceptions;
using HandBrake.ApplicationServices.Isolation;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Services;
using HandBrake.ApplicationServices.Services.Interfaces;
- using HandBrake.Interop.Interfaces;
using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;
using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;
@@ -66,8 +63,7 @@ namespace HandBrakeWPF.Services }
else
{
- IHandBrakeInstance handBrakeInstance = IoC.Get<IHandBrakeInstance>();
- this.encodeService = new LibEncode(userSettingService, handBrakeInstance);
+ this.encodeService = new LibEncode(userSettingService, ScanServiceWrapper.HandbrakeInstance);
}
}
catch (Exception exc)
diff --git a/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs index a25213a6b..ffbbae5c0 100644 --- a/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs +++ b/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs @@ -13,13 +13,12 @@ namespace HandBrakeWPF.Services {
using System;
- using Caliburn.Micro;
-
using HandBrake.ApplicationServices.Exceptions;
using HandBrake.ApplicationServices.Isolation;
using HandBrake.ApplicationServices.Parsing;
using HandBrake.ApplicationServices.Services;
using HandBrake.ApplicationServices.Services.Interfaces;
+ using HandBrake.Interop;
using HandBrake.Interop.Interfaces;
/// <summary>
@@ -32,6 +31,11 @@ namespace HandBrakeWPF.Services #region Constants and Fields
/// <summary>
+ /// The handbrake instance.
+ /// </summary>
+ public static readonly IHandBrakeInstance HandbrakeInstance = new HandBrakeInstance();
+
+ /// <summary>
/// The scan service.
/// </summary>
private readonly IScan scanService;
@@ -63,8 +67,7 @@ namespace HandBrakeWPF.Services }
else
{
- IHandBrakeInstance handBrakeInstance = IoC.Get<IHandBrakeInstance>();
- this.scanService = new LibScan(userSettingService, handBrakeInstance);
+ this.scanService = new LibScan(userSettingService, HandbrakeInstance);
}
}
catch(Exception exc)
|