From a53a05ae0921b38cc1c9d3dd3dd5bab09a6c7f5f Mon Sep 17 00:00:00 2001 From: sr55 Date: Thu, 14 Jun 2012 19:08:34 +0000 Subject: WinGui: Code Cleanup - New file headers for App Services - Update Interop to include an IWindsorInstaller implementation - Update Interop Converter (new framerates and fflac) - Many stylecop warnings fixed. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4734 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Services/Base/EncodeBase.cs | 12 ++++++++---- win/CS/HandBrake.ApplicationServices/Services/Encode.cs | 12 ++++++++---- .../Services/Interfaces/IEncode.cs | 12 ++++++++---- .../Services/Interfaces/IPresetService.cs | 12 ++++++++---- .../Services/Interfaces/IQueueManager.cs | 12 ++++++++---- .../Services/Interfaces/IQueueProcessor.cs | 12 ++++++++---- .../Services/Interfaces/IScan.cs | 12 ++++++++---- .../Services/Interfaces/IUserSettingService.cs | 13 ++++++++----- .../HandBrake.ApplicationServices/Services/LibEncode.cs | 14 +++++++++----- .../HandBrake.ApplicationServices/Services/LibScan.cs | 12 ++++++++---- .../Services/PresetService.cs | 12 ++++++++---- .../Services/QueueManager.cs | 13 +++++++++---- .../Services/QueueProcessor.cs | 17 +++++++++++------ .../Services/ScanService.cs | 12 ++++++++---- .../Services/UpdateService.cs | 12 ++++++++---- .../Services/UserSettingService.cs | 12 ++++++++---- 16 files changed, 133 insertions(+), 68 deletions(-) (limited to 'win/CS/HandBrake.ApplicationServices/Services') diff --git a/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs b/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs index d57f3a51f..537a97d71 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Base/EncodeBase.cs @@ -1,7 +1,11 @@ -/* EncodeBase.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// A Base Class for the Encode Services. +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services.Base { diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode.cs index cb920a862..8c04d5a3b 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Encode.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Encode.cs @@ -1,7 +1,11 @@ -/* Encode.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// Class which handles the CLI +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs index 7ba739617..426cad897 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IEncode.cs @@ -1,7 +1,11 @@ -/* IEncode.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// Encode Progess Status +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services.Interfaces { diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs index 81eaa6849..63fe25158 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs @@ -1,7 +1,11 @@ -/* IPresetService.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The Preset Service Interface +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services.Interfaces { diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueManager.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueManager.cs index b8b162d4f..e86b5fe7c 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueManager.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueManager.cs @@ -1,7 +1,11 @@ -/* IQueueManager.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The Queue Manager Interface +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services.Interfaces { diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs index ad2635556..22cf365b0 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs @@ -1,7 +1,11 @@ -/* IQueueProcessor.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The Queue Processor +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services.Interfaces { diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScan.cs index b992dc8eb..3ad25c583 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScan.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IScan.cs @@ -1,7 +1,11 @@ -/* IScan.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// Encode Progess Status +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services.Interfaces { diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IUserSettingService.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IUserSettingService.cs index c3290f64f..d7bba9550 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IUserSettingService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IUserSettingService.cs @@ -1,8 +1,11 @@ -/* IUserSettingService.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ - +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The User Setting Service Interace. +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services.Interfaces { diff --git a/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs b/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs index d99bdbec8..1fe1845ad 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/LibEncode.cs @@ -1,7 +1,11 @@ -/* LibEncode.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// LibHB Implementation of IEncode +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { @@ -19,7 +23,7 @@ namespace HandBrake.ApplicationServices.Services using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs; /// - /// TODO: Update summary. + /// LibHB Implementation of IEncode /// public class LibEncode : EncodeBase, IEncode { diff --git a/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs index 70a44ca56..8fe7affc6 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/LibScan.cs @@ -1,7 +1,11 @@ -/* LibScan.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// Scan a Source +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs index 11df7ccb2..a4946278a 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs @@ -1,7 +1,11 @@ -/* PresetService.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The preset service manages HandBrake's presets +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { diff --git a/win/CS/HandBrake.ApplicationServices/Services/QueueManager.cs b/win/CS/HandBrake.ApplicationServices/Services/QueueManager.cs index d80ee0660..0d3a40e7f 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/QueueManager.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/QueueManager.cs @@ -1,7 +1,12 @@ -/* QueueManager.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The Queue Manager. +// Thread Safe. +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { diff --git a/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs b/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs index 7e67368e3..fe0675f96 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/QueueProcessor.cs @@ -1,7 +1,11 @@ -/* Queue.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The HandBrake Queue +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { @@ -10,8 +14,9 @@ namespace HandBrake.ApplicationServices.Services using System.IO; using System.Windows.Forms; + using Caliburn.Micro; + using HandBrake.ApplicationServices.EventArgs; - using HandBrake.ApplicationServices.Exceptions; using HandBrake.ApplicationServices.Functions; using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Services.Interfaces; @@ -24,7 +29,7 @@ namespace HandBrake.ApplicationServices.Services /// /// The User Setting Service /// - private static IUserSettingService userSettingService = ServiceManager.UserSettingService; + private static IUserSettingService userSettingService = IoC.Get(); /// /// Initializes a new instance of the class. diff --git a/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs b/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs index a7dffd5fe..0d5118aee 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs @@ -1,7 +1,11 @@ -/* Scan.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// Scan a Source +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { diff --git a/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs b/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs index 02ed05a9d..899a953c4 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/UpdateService.cs @@ -1,7 +1,11 @@ -/* UpdateService.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The Update Service +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { diff --git a/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs b/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs index 7fe50cd04..042c2487c 100644 --- a/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs +++ b/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs @@ -1,7 +1,11 @@ -/* UserSettingService.cs $ - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ +// -------------------------------------------------------------------------------------------------------------------- +// +// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. +// +// +// The User Setting Serivce +// +// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.ApplicationServices.Services { -- cgit v1.2.3