Improving the Deinterlace / Decomb Filters Tab UI. Now uses the same "presets / custom" format that the other UI's do.

4 files changed, 38 insertions, 15 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 1a99efd1d..16afa531b 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -135,6 +135,7 @@
     <Compile Include="Interop\Json\Encode\SubtitleTrack.cs" />

     <Compile Include="Interop\Json\Encode\Video.cs" />

     <Compile Include="Interop\Factories\AnamorphicFactory.cs" />

+    <Compile Include="Interop\Model\Encoding\DeinterlaceFilter.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

     <Compile Include="Interop\Json\Scan\SourceAudioTrack.cs" />

     <Compile Include="Interop\Json\Scan\SourceChapter.cs" />

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs
index 58e1003e3..eab94ef2a 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Decomb.cs
@@ -16,19 +16,16 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
     /// </summary>

     public enum Decomb

     {

-        [ShortName("off")]

-        Off = 0,

-

         [ShortName("default")]

-        Default = 2,

+        Default,

 

         [ShortName("fast")]

-        Fast = 3,

+        Fast,

 

         [ShortName("bob")]

-        Bob = 4,

+        Bob,

 

         [ShortName("custom")]

-        Custom = 1

+        Custom 

     }

 }

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Deinterlace.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Deinterlace.cs
index f7b8f0a42..e8da93043 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Deinterlace.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/Deinterlace.cs
@@ -16,22 +16,19 @@ namespace HandBrake.ApplicationServices.Interop.Model.Encoding
     /// </summary>

     public enum Deinterlace

     {

-        [ShortName("off")]

-        Off = 0,

-

         [ShortName("fast")]

-        Fast = 2,

+        Fast,

 

         [ShortName("slow")]

-        Slow = 3,

+        Slow,

 

         [ShortName("slower")]

-        Slower = 4,

+        Slower,

 

         [ShortName("bob")]

-        Bob = 5,

+        Bob,

 

         [ShortName("custom")]

-        Custom = 1

+        Custom

     }

 }

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/DeinterlaceFilter.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/DeinterlaceFilter.cs
new file mode 100644
index 000000000..27e8f4435
--- /dev/null
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Encoding/DeinterlaceFilter.cs
@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Deinterlace.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the Deinterlace type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.ApplicationServices.Interop.Model.Encoding
+{
+    using HandBrake.ApplicationServices.Attributes;
+
+    /// <summary>
+    /// The deinterlace.
+    /// </summary>
+    public enum DeinterlaceFilter
+    {
+        [ShortName("off")]
+        Off = 0,
+
+        [ShortName("Deinterlace")]
+        Deinterlace = 1,
+
+        [ShortName("Decomb")]
+        Decomb = 2
+    }
+}