WinGui: Remove a duplicate model object.

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

8 files changed, 1 insertions, 50 deletions

diff --git a/win/CS/Functions/PresetLoader.cs b/win/CS/Functions/PresetLoader.cs
index 980e4e4d3..98ac0a0c5 100644
--- a/win/CS/Functions/PresetLoader.cs
+++ b/win/CS/Functions/PresetLoader.cs
@@ -15,7 +15,6 @@ namespace Handbrake.Functions
     using HandBrake.ApplicationServices.Services.Interfaces;

     using HandBrake.Interop.Model.Encoding;

 

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

     using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;

 

     /// <summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs
index 8475c9bd2..da7303c01 100644
--- a/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs
@@ -48,24 +48,8 @@ namespace HandBrake.ApplicationServices.Functions
             EncodeJob job = new EncodeJob();

             EncodingProfile profile = new EncodingProfile();

             job.EncodingProfile = profile;

-           

-

-            switch (work.Anamorphic)

-            {

-                case Model.Encoding.Anamorphic.Custom:

-                    profile.Anamorphic = Interop.Model.Encoding.Anamorphic.Custom;

-                    break;

-                case Model.Encoding.Anamorphic.Strict:

-                    profile.Anamorphic = Interop.Model.Encoding.Anamorphic.Strict;

-                    break;

-                case Model.Encoding.Anamorphic.Loose:

-                    profile.Anamorphic = Interop.Model.Encoding.Anamorphic.Loose;

-                    break;

-                case Model.Encoding.Anamorphic.None:

-                    profile.Anamorphic = Interop.Model.Encoding.Anamorphic.None;

-                    break;

-            }

 

+            profile.Anamorphic = work.Anamorphic;

 

             profile.AudioEncodings = new List<AudioEncoding>();

             foreach (AudioTrack track in work.AudioTracks)

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 52906af73..4a6b13b34 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -95,7 +95,6 @@
     <Compile Include="Functions\Win7.cs" />

     <Compile Include="Model\DriveInformation.cs" />

     <Compile Include="Model\Encoding\AudioTrack.cs" />

-    <Compile Include="Model\Encoding\Anamorphic.cs" />

     <Compile Include="Model\Encoding\AudioEncoder.cs" />

     <Compile Include="Model\Encoding\FramerateMode.cs" />

     <Compile Include="Model\Encoding\Mixdown.cs" />

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 2113c8605..1d7c61913 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -11,7 +11,6 @@ namespace HandBrake.ApplicationServices.Model
     using HandBrake.Interop.Model;

     using HandBrake.Interop.Model.Encoding;

 

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

     using OutputFormat = HandBrake.ApplicationServices.Model.Encoding.OutputFormat;

 

     /// <summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/Anamorphic.cs
deleted file mode 100644
index c958b777c..000000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/Anamorphic.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  Anamorphic.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

-

-namespace HandBrake.ApplicationServices.Model.Encoding

-{

-    using System.ComponentModel;

-

-    /// <summary>

-    /// Anamorphic Mode

-    /// </summary>

-    public enum Anamorphic

-    {

-        [Description("None")]

-        None = 0,

-        [Description("Strict")]

-        Strict,

-        [Description("Loose")]

-        Loose,

-        [Description("Custom")]

-        Custom

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index caa40d9b6..3b514b198 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -17,8 +17,6 @@ namespace HandBrake.ApplicationServices.Utilities
     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.Interop.Model.Encoding;

 

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

-

     /// <summary>

     /// Plist Preset Converter

     /// </summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 1567d4d16..bd923ff67 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -15,7 +15,6 @@ namespace HandBrake.ApplicationServices.Utilities
     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;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index b52d72f56..a4d8d9787 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -16,14 +16,11 @@ namespace HandBrake.ApplicationServices.Utilities
     using HandBrake.Interop.Model;

     using HandBrake.Interop.Model.Encoding;

 

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

-

     /// <summary>

     /// Parse a CLI Query

     /// </summary>

     public class QueryParserUtility

     {

-

         /**

          * TODO

          * - Add support for PointToPointMode = Seconds or Frames