WinGui: Starting to remove model objects from the Application Services module that are duplicated in the Interop Library

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

3 files changed, 13 insertions, 7 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 7e17614f2..91d474ab1 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -15,6 +15,9 @@ namespace HandBrake.ApplicationServices.Utilities
     using HandBrake.ApplicationServices.Functions;

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.Interop.Model.Encoding;

+

+    using Anamorphic = HandBrake.ApplicationServices.Model.Encoding.Anamorphic;

 

     /// <summary>

     /// Plist Preset Converter

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 87496dfbc..7631da7de 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -7,15 +7,18 @@ namespace HandBrake.ApplicationServices.Utilities
 {

     using System;

     using System.Collections.Generic;

-    using System.Data;

     using System.Globalization;

     using System.IO;

-    using System.Linq;

-    using System.Windows.Forms;

 

     using HandBrake.ApplicationServices.Functions;

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.Interop.Model.Encoding;

+

+    using Anamorphic = HandBrake.ApplicationServices.Model.Encoding.Anamorphic;

+    using AudioEncoder = HandBrake.ApplicationServices.Model.Encoding.AudioEncoder;

+    using Mixdown = HandBrake.ApplicationServices.Model.Encoding.Mixdown;

+    using VideoEncoder = HandBrake.ApplicationServices.Model.Encoding.VideoEncoder;

 

     /*

      * TODO:

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index ce558107e..8b6394453 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -6,7 +6,6 @@
 namespace HandBrake.ApplicationServices.Utilities

 {

     using System;

-    using System.Collections;

     using System.Collections.Generic;

     using System.Globalization;

     using System.Text.RegularExpressions;

@@ -14,6 +13,10 @@ namespace HandBrake.ApplicationServices.Utilities
     using HandBrake.ApplicationServices.Functions;

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.Interop.Model;

+    using HandBrake.Interop.Model.Encoding;

+

+    using Anamorphic = HandBrake.ApplicationServices.Model.Encoding.Anamorphic;

 

     /// <summary>

     /// Parse a CLI Query

@@ -234,9 +237,6 @@ namespace HandBrake.ApplicationServices.Utilities
                         case "slower":

                             parsed.Deinterlace = Deinterlace.Slower;

                             break;

-                        case "slowest":

-                            parsed.Deinterlace = Deinterlace.Slowest;

-                            break;

                         default:

                             parsed.Deinterlace = Deinterlace.Custom;

                             parsed.CustomDeinterlace = deinterlace.ToString().Replace("--deinterlace=", string.Empty).Replace("\"", string.Empty).ToLower();