From bb3aae9dd06271ab7b18a2d55fec14c97b76e9b0 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 21 Sep 2013 16:25:39 +0000 Subject: WinGui: Remove the scan service wrapper as it's no longer needed. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5789 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../HandBrake.ApplicationServices.csproj | 1 - .../Services/Interfaces/IScanServiceWrapper.cs | 18 -- win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs | 4 +- win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 1 - .../HandBrakeWPF/Services/EncodeServiceWrapper.cs | 7 +- win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs | 195 --------------------- win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs | 3 +- win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs | 6 +- win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs | 4 +- win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 4 +- 10 files changed, 12 insertions(+), 231 deletions(-) delete mode 100644 win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScanServiceWrapper.cs delete mode 100644 win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index bb85a5071..477392a05 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -99,7 +99,6 @@ - diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScanServiceWrapper.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScanServiceWrapper.cs deleted file mode 100644 index febe4aa29..000000000 --- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScanServiceWrapper.cs +++ /dev/null @@ -1,18 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// -// -// ScanServiceWrapper Interface -// -// -------------------------------------------------------------------------------------------------------------------- - -namespace HandBrake.ApplicationServices.Services.Interfaces -{ - /// - /// ScanServiceWrapper Interface - /// - public interface IScanServiceWrapper : IScan - { - } -} diff --git a/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs b/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs index e9ec9966a..b00061068 100644 --- a/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs +++ b/win/CS/HandBrakeWPF/Commands/CancelScanCommand.cs @@ -22,7 +22,7 @@ namespace HandBrakeWPF.Commands /// /// The scan service wrapper. /// - private readonly IScanServiceWrapper scanServiceWrapper; + private readonly IScan scanServiceWrapper; /// /// Initializes a new instance of the class. @@ -30,7 +30,7 @@ namespace HandBrakeWPF.Commands /// /// The scan service wrapper. /// - public CancelScanCommand(IScanServiceWrapper ssw) + public CancelScanCommand(IScan ssw) { this.scanServiceWrapper = ssw; this.scanServiceWrapper.ScanStared += this.ScanServiceWrapperScanStared; diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index b0094ce23..66eb70257 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -179,7 +179,6 @@ - diff --git a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs index 2dd1814ee..7fc3c76ff 100644 --- a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs +++ b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs @@ -64,12 +64,7 @@ namespace HandBrakeWPF.Services } else { - if (ScanServiceWrapper.HandbrakeInstance == null) - { - ScanServiceWrapper.HandbrakeInstance = new HandBrakeInstance(); - } - - this.encodeService = new LibEncode(userSettingService, ScanServiceWrapper.HandbrakeInstance); + this.encodeService = new LibEncode(userSettingService, new HandBrakeInstance()); } } catch (Exception exc) diff --git a/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs deleted file mode 100644 index 8180ac070..000000000 --- a/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs +++ /dev/null @@ -1,195 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// -// -// We have multiple implementations of IScan. This is a wrapper class for the GUI so that the -// implementation used is controllable via user settings. -// Over time, this class will go away when the LibHB and process isolation code matures. -// -// -------------------------------------------------------------------------------------------------------------------- - -namespace HandBrakeWPF.Services -{ - using System; - - using HandBrake.ApplicationServices.Parsing; - using HandBrake.ApplicationServices.Services; - using HandBrake.ApplicationServices.Services.Interfaces; - using HandBrake.Interop.Interfaces; - - /// - /// We have multiple implementations of IScan. This is a wrapper class for the GUI so that the - /// implementation used is controllable via user settings. - /// Over time, this class will go away when the LibHB and process isolation code matures. - /// - public class ScanServiceWrapper : IScanServiceWrapper - { - #region Constants and Fields - - /// - /// The handbrake instance. - /// - public static IHandBrakeInstance HandbrakeInstance; - - /// - /// The scan service. - /// - private readonly IScan scanService; - - #endregion - - #region Constructors and Destructors - - /// - /// Initializes a new instance of the class. - /// - /// - /// The user Setting Service. - /// - public ScanServiceWrapper(IUserSettingService userSettingService) - { - this.scanService = new LibScan(userSettingService); - this.scanService.ScanCompleted += this.ScanServiceScanCompleted; - this.scanService.ScanStared += this.ScanServiceScanStared; - this.scanService.ScanStatusChanged += this.ScanServiceScanStatusChanged; - } - - /// - /// The scan service scan status changed event - /// - /// - /// The sender. - /// - /// - /// The ScanProgressEventArgs. - /// - private void ScanServiceScanStatusChanged(object sender, HandBrake.ApplicationServices.EventArgs.ScanProgressEventArgs e) - { - this.ScanStatusChanged(sender, e); - } - - /// - /// The scan service scan stared event - /// - /// - /// The sender. - /// - /// - /// The EventArgs - /// - private void ScanServiceScanStared(object sender, EventArgs e) - { - this.ScanStared(sender, e); - } - - /// - /// The scan service scan completed event - /// - /// - /// The sender. - /// - /// - /// The ScanCompletedEventArgs - /// - private void ScanServiceScanCompleted(object sender, HandBrake.ApplicationServices.EventArgs.ScanCompletedEventArgs e) - { - this.ScanCompleted(sender, e); - } - - #endregion - - #region Events - - /// - /// The scan completed. - /// - public event ScanCompletedStatus ScanCompleted; - - /// - /// The scan stared. - /// - public event EventHandler ScanStared; - - /// - /// The scan status changed. - /// - public event ScanProgessStatus ScanStatusChanged; - - #endregion - - #region Properties - - /// - /// Gets ActivityLog. - /// - public string ActivityLog - { - get - { - return this.scanService.ActivityLog; - } - } - - /// - /// Gets a value indicating whether IsScanning. - /// - public bool IsScanning - { - get - { - return this.scanService.IsScanning; - } - } - - /// - /// Gets the Souce Data. - /// - public Source SouceData - { - get - { - return this.scanService.SouceData; - } - } - - #endregion - - #region Implemented Interfaces - - #region IScan - - /// - /// Scan a Source Path. - /// Title 0: scan all - /// - /// - /// Path to the file to scan - /// - /// - /// int title number. 0 for scan all - /// - /// - /// The preview Count. - /// - /// - /// The post Action. - /// - public void Scan(string sourcePath, int title, int previewCount, Action postAction) - { - this.scanService.Scan(sourcePath, title, previewCount, postAction); - } - - /// - /// Kill the scan - /// - public void Stop() - { - this.scanService.Stop(); - } - - #endregion - - #endregion - } -} \ No newline at end of file diff --git a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs index 0debbbcce..34f58c862 100644 --- a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs +++ b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs @@ -21,6 +21,7 @@ namespace HandBrakeWPF.Startup using Castle.Windsor; using HandBrake.ApplicationServices; + using HandBrake.ApplicationServices.Services; using HandBrake.ApplicationServices.Services.Interfaces; using HandBrakeWPF.Commands; @@ -57,7 +58,7 @@ namespace HandBrakeWPF.Startup // Services this.windsorContainer.Register(Component.For().ImplementedBy().LifeStyle.Is(LifestyleType.Singleton)); - this.windsorContainer.Register(Component.For().ImplementedBy().LifeStyle.Is(LifestyleType.Singleton)); + this.windsorContainer.Register(Component.For().ImplementedBy().LifeStyle.Is(LifestyleType.Singleton)); this.windsorContainer.Register(Component.For().ImplementedBy().LifeStyle.Is(LifestyleType.Singleton)); this.windsorContainer.Register(Component.For().ImplementedBy().LifeStyle.Is(LifestyleType.Singleton)); this.windsorContainer.Register(Component.For().ImplementedBy().LifeStyle.Is(LifestyleType.Singleton)); diff --git a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs index 8edfb3a87..c99fb1c51 100644 --- a/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/InstantViewModel.cs @@ -69,7 +69,7 @@ namespace HandBrakeWPF.ViewModels /// /// The scan service. /// - private readonly IScanServiceWrapper scanService; + private readonly IScan scanService; /// /// The shell view model. @@ -181,8 +181,8 @@ namespace HandBrakeWPF.ViewModels /// The when done service. /// public InstantViewModel( - IUserSettingService userSettingService, - IScanServiceWrapper scanService, + IUserSettingService userSettingService, + IScan scanService, IEncodeServiceWrapper encodeService, IPresetService presetService, IErrorService errorService, diff --git a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs index ad5698b1b..8356b124b 100644 --- a/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs @@ -33,7 +33,7 @@ namespace HandBrakeWPF.ViewModels /// /// Backing field for the Scan Service /// - private readonly IScanServiceWrapper scanService; + private readonly IScan scanService; /// /// The selected tab. @@ -56,7 +56,7 @@ namespace HandBrakeWPF.ViewModels /// /// The scan service. /// - public LogViewModel(IEncodeServiceWrapper encodeService, IScanServiceWrapper scanService) + public LogViewModel(IEncodeServiceWrapper 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 b3be2b60e..de6d7c063 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -84,7 +84,7 @@ namespace HandBrakeWPF.ViewModels /// /// The Source Scan Service. /// - private readonly IScanServiceWrapper scanService; + private readonly IScan scanService; /// /// The Encode Service @@ -211,7 +211,7 @@ namespace HandBrakeWPF.ViewModels /// The when Done Service. /// *** Leave in Constructor. *** /// - public MainViewModel(IUserSettingService userSettingService, IScanServiceWrapper scanService, IEncodeServiceWrapper encodeService, IPresetService presetService, + public MainViewModel(IUserSettingService userSettingService, IScan scanService, IEncodeServiceWrapper encodeService, IPresetService presetService, IErrorService errorService, IShellViewModel shellViewModel, IUpdateService updateService, INotificationService notificationService, IPrePostActionService whenDoneService) { -- cgit v1.2.3