WinGui: Part 1 - Restructuring the AppServices library in preparation for the new JSON API. Taking the opportunity to improve and simplify the API.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6568 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 9 insertions, 8 deletions

diff --git a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
index 0f2fa702c..7c679d033 100644
--- a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
+++ b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
@@ -12,19 +12,17 @@
 namespace HandBrakeWPF.Services

 {

     using System;

-    using System.Windows.Forms;

 

     using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Isolation;

     using HandBrake.ApplicationServices.Model;

-    using HandBrake.ApplicationServices.Services;

+    using HandBrake.ApplicationServices.Services.Encode;

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     using HandBrakeWPF.Services.Interfaces;

 

-    using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;

-    using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;

-

     /// <summary>

     /// We have multiple implementations of Iencode. This is a wrapper class for the GUI so that the 

     /// implementation used is controllable via user settings.

@@ -81,7 +79,7 @@ namespace HandBrakeWPF.Services
             }

             else

             {

-                this.encodeService = new Encode();

+                this.encodeService = new EncodeService();

             }

 

             this.encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;

diff --git a/win/CS/HandBrakeWPF/Services/NotificationService.cs b/win/CS/HandBrakeWPF/Services/NotificationService.cs
index e451460d8..ba3c0cf99 100644
--- a/win/CS/HandBrakeWPF/Services/NotificationService.cs
+++ b/win/CS/HandBrakeWPF/Services/NotificationService.cs
@@ -9,6 +9,8 @@
 

 namespace HandBrakeWPF.Services

 {

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.Interfaces;

     using HandBrake.ApplicationServices.Services.Interfaces;

 

     using HandBrakeWPF.Services.Interfaces;

@@ -68,7 +70,7 @@ namespace HandBrakeWPF.Services
         /// <param name="e">

         /// The EncodeCompletedEventArgs.

         /// </param>

-        private void EncodeServiceEncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)

+        private void EncodeServiceEncodeCompleted(object sender, EncodeCompletedEventArgs e)

         {

             if (userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlEncode))

             {

diff --git a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
index f6e4fc800..c57935239 100644
--- a/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
+++ b/win/CS/HandBrakeWPF/Services/PrePostActionService.cs
@@ -15,6 +15,7 @@ namespace HandBrakeWPF.Services
     using Caliburn.Micro;

 

     using HandBrake.ApplicationServices.EventArgs;

+    using HandBrake.ApplicationServices.Services.Encode.EventArgs;

     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.ApplicationServices.Utilities;

 

@@ -92,7 +93,7 @@ namespace HandBrakeWPF.Services
         /// <param name="e">

         /// The EncodeCompletedEventArgs.

         /// </param>

-        private void EncodeService_EncodeCompleted(object sender, HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs e)

+        private void EncodeService_EncodeCompleted(object sender, EncodeCompletedEventArgs e)

         {

             // Send the file to the users requested applicaiton

             if (e.Successful)