WinGui: HandBrake.Interop further API tidyup. Namespace changes. Many "model" objects have moved to interfaces.models to avoid confusion. A number of filter/video enums have moved to HandBrakeWPF as they are not part of the API.

39 files changed, 33 insertions, 486 deletions

diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
index 597b1c207..acf30fad0 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs
@@ -15,8 +15,8 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
     using HandBrake.Interop.Utilities;
 
     public static class HandBrakeEncoderHelpers
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
index 92c792df0..9cc765770 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs
@@ -17,8 +17,8 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
     using HandBrake.Interop.Interop.Json.Filters;
-    using HandBrake.Interop.Interop.Model.Encoding;
     using HandBrake.Interop.Json;
 
     /// <summary>
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
index fd117162d..440983f14 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs
@@ -24,11 +24,12 @@ namespace HandBrake.Interop.Interop
     using HandBrake.Interop.Interop.Helpers;
     using HandBrake.Interop.Interop.Interfaces;
     using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+    using HandBrake.Interop.Interop.Interfaces.Model.Preview;
     using HandBrake.Interop.Interop.Json.Encode;
     using HandBrake.Interop.Interop.Json.Scan;
     using HandBrake.Interop.Interop.Json.State;
-    using HandBrake.Interop.Interop.Model.Encoding;
-    using HandBrake.Interop.Interop.Model.Preview;
     using HandBrake.Interop.Json;
 
     public class HandBrakeInstance : IHandBrakeInstance, IDisposable
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs
index 32970ecba..93e9037d5 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs
@@ -13,7 +13,7 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
-    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model;
 
     /// <summary>
     /// Contains utilities for converting language codes.
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs
index 96e9720ba..07d13d2ab 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs
@@ -11,7 +11,7 @@ namespace HandBrake.Interop.Interop
 {
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Interfaces.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     public class HandBrakePictureHelpers
     {
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs b/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
index ab928f723..2443a24b4 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs
@@ -17,8 +17,8 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
+    using HandBrake.Interop.Interop.Interfaces.Model.Presets;
     using HandBrake.Interop.Interop.Json.Presets;
-    using HandBrake.Interop.Interop.Model;
     using HandBrake.Interop.Json;
 
     /// <summary>
diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs
index 698bce11a..b42285938 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs
@@ -16,8 +16,8 @@ namespace HandBrake.Interop.Interop
 
     using HandBrake.Interop.Interop.HbLib;
     using HandBrake.Interop.Interop.Helpers;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
     /// <summary>
     /// Converters for various encoding values.
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs
index ea162ce5b..283dfe01f 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs
@@ -13,8 +13,9 @@ namespace HandBrake.Interop.Interop.Interfaces
 
     using HandBrake.Interop.Interop.EventArgs;
     using HandBrake.Interop.Interop.Interfaces.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+    using HandBrake.Interop.Interop.Interfaces.Model.Preview;
     using HandBrake.Interop.Interop.Json.Scan;
-    using HandBrake.Interop.Interop.Model.Preview;
 
     /// <summary>
     /// The Interface for HandBrakeInstance
diff --git a/win/CS/HandBrake.Interop/Interop/Model/BitrateLimits.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/BitrateLimits.cs
index 89e0aa960..dc2043aff 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/BitrateLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/BitrateLimits.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// Represents bitrate limits as a range.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBAudioEncoder.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBAudioEncoder.cs
index ae1d4b700..bb9d0fd72 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBAudioEncoder.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBAudioEncoder.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     using HandBrake.Interop.Interop.HbLib;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBMixdown.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBMixdown.cs
index 3130829f6..6ca487ec5 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBMixdown.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBMixdown.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// The hb mixdown.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBRate.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBRate.cs
index 8116cfe30..192c14aca 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBRate.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBRate.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// Represents a rate in HandBrake: audio sample rate or video framerate.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBVideoEncoder.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBVideoEncoder.cs
index da0c4ca73..79aae277c 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBVideoEncoder.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBVideoEncoder.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     using System.Collections.Generic;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Model/RangeLimits.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/RangeLimits.cs
index e8102eb42..e1c97c24c 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/RangeLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/RangeLimits.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// The range limits.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/VideoQualityLimits.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/VideoQualityLimits.cs
index 6387763da..2dcc64af4 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/VideoQualityLimits.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/VideoQualityLimits.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
 {
     /// <summary>
     /// Represents limits on video quality for a particular encoder.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBPresetTune.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Filters/HBPresetTune.cs
index 3fd59bcbf..6a964b019 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBPresetTune.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Filters/HBPresetTune.cs
@@ -3,11 +3,11 @@
 //   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
-//   An object represetning the key and name of a Filter Preset or Tune option.
+//   An object representing the key and name of a Filter Preset or Tune option.
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Filters
 {
     public class HBPresetTune
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBContainer.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/HBContainer.cs
index 3580cd726..3a71117d6 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBContainer.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/HBContainer.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model
 {
     /// <summary>
     /// The hb container.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Language.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Language.cs
index 5ca0ca0e6..0da6d4352 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Language.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Language.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model
 {
     /// <summary>
     /// Represents a language.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Anamorphic.cs
index e6b68fc1e..dbb14beb4 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Anamorphic.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Anamorphic.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Encoding
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
     using HandBrake.Interop.Attributes;
 
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/AnamorphicResult.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/AnamorphicResult.cs
index d949eb354..efb736f78 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/AnamorphicResult.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/AnamorphicResult.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Interfaces.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
     public class AnamorphicResult
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Cropping.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Cropping.cs
index bae0473c8..b3314a24c 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Cropping.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Cropping.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
     /// <summary>
     /// The Cropping Model
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PictureSettingsJob.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsJob.cs
index e090522cb..519070545 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PictureSettingsJob.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsJob.cs
@@ -4,11 +4,8 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Interfaces.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
-
     public class PictureSettingsJob
     {
         public Cropping Crop { get; set; }
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PictureSettingsTitle.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsTitle.cs
index e90ae709a..e0345fba9 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PictureSettingsTitle.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsTitle.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Interfaces.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
 {
     public class PictureSettingsTitle
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/PresetVersion.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Presets/PresetVersion.cs
index 4fe0225b3..8319b38d2 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/PresetVersion.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Presets/PresetVersion.cs
@@ -7,7 +7,7 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Presets
 {
     public class PresetVersion
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PreviewSettings.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/PreviewSettings.cs
index 5304610ff..a8b1a69bc 100644
--- a/win/CS/HandBrake.Interop/Interop/Interfaces/Model/PreviewSettings.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/PreviewSettings.cs
@@ -7,10 +7,9 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Interfaces.Model
+namespace HandBrake.Interop.Interop.Interfaces.Model.Preview
 {
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     /// <summary>
     /// The preview settings.
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Preview/RawPreviewData.cs b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/RawPreviewData.cs
index f833b7479..c552c2b1a 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Preview/RawPreviewData.cs
+++ b/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/RawPreviewData.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace HandBrake.Interop.Interop.Model.Preview
+namespace HandBrake.Interop.Interop.Interfaces.Model.Preview
 {
     public class RawPreviewData
     {
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/CombDetect.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/CombDetect.cs
deleted file mode 100644
index 595375a50..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/CombDetect.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CombDetect.cs" company="HandBrake Project (https://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 CombDetect type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    using HandBrake.Interop.Attributes;
-
-    /// <summary>
-    /// The CombDetect Type.
-    /// </summary>
-    public enum CombDetect
-    {
-        [ShortName("off")]
-        Off,
-
-        [ShortName("custom")]
-        Custom,
-
-        [ShortName("default")]
-        Default,
-
-        [ShortName("permissive")]
-        LessSensitive,
-
-        [ShortName("fast")]
-        Fast
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
deleted file mode 100644
index ce7c5c5c2..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Container.cs" company="HandBrake Project (https://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 Container type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    using System;
-
-    using HandBrake.Interop.Attributes;
-
-    /// <summary>
-    /// The container.
-    /// </summary>
-    [Flags]
-    public enum Container
-    {
-        None = 0x0,
-
-        [DisplayName("MP4")]
-        MP4,
-        [DisplayName("MKV")]
-        MKV,
-        [DisplayName("WebM")]
-        WebM
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/DeinterlaceFilter.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/DeinterlaceFilter.cs
deleted file mode 100644
index 4b6c60ceb..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/DeinterlaceFilter.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="DeinterlaceFilter.cs" company="HandBrake Project (https://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.Interop.Interop.Model.Encoding
-{
-    using HandBrake.Interop.Attributes;
-
-    /// <summary>
-    /// The deinterlace.
-    /// </summary>
-    public enum DeinterlaceFilter
-    {
-        [ShortName("off")]
-        Off = 0,
-
-        [ShortName("Yadif")]
-        Yadif = 1,
-
-        [ShortName("Decomb")]
-        Decomb = 2
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Denoise.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Denoise.cs
deleted file mode 100644
index 62592f0dc..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Denoise.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Denoise.cs" company="HandBrake Project (https://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 Denoise type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    using HandBrake.Interop.Attributes;
-
-    /// <summary>
-    /// The denoise.
-    /// </summary>
-    public enum Denoise
-    {
-        [ShortName("off")]
-        Off = 0,
-
-        [ShortName("hqdn3d")]
-        hqdn3d = 1,
-
-        [ShortName("nlmeans")]
-        NLMeans = 2,
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Detelecine.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Detelecine.cs
deleted file mode 100644
index 1f63d4ee1..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Detelecine.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Detelecine.cs" company="HandBrake Project (https://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 Detelecine type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    using HandBrake.Interop.Attributes;
-
-    /// <summary>
-    /// The detelecine.
-    /// </summary>
-    public enum Detelecine
-    {
-        [ShortName("off")]
-        Off = 0,
-        [ShortName("default")]
-        Default = 2,
-        [ShortName("custom")]
-        Custom = 1
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/PaddingFilter.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/PaddingFilter.cs
deleted file mode 100644
index 305773dae..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/PaddingFilter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PaddingFilter.cs" company="HandBrake Project (https://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 PaddingFilter type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    public class PaddingFilter
-    {
-        public bool Enabled { get; set; }
-
-        public string Color { get; set; }
-
-        public int X { get; set; }
-
-        public int Y { get; set; }
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs
deleted file mode 100644
index 566344fed..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PictureRotation.cs" company="HandBrake Project (https://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>
-//   Possible picture rotations.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    /// <summary>
-    /// Possible picture rotations.
-    /// </summary>
-    public enum PictureRotation
-    {
-        None = 0,
-        Clockwise90,
-        Clockwise180,
-        Clockwise270
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs
deleted file mode 100644
index 029ee7295..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ScaleMethod.cs" company="HandBrake Project (https://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>
-//   Scaling Method
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    /// <summary>
-    /// Enumeration of rescaling algorithms.
-    /// </summary>
-    public enum ScaleMethod
-    {
-        /// <summary>
-        /// Standard software scaling. Highest quality.
-        /// </summary>
-        Lanczos = 0,
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Sharpen.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Sharpen.cs
deleted file mode 100644
index 1f2b93ce4..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Sharpen.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Sharpen.cs" company="HandBrake Project (https://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 Sharpen type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    using HandBrake.Interop.Attributes;
-
-    /// <summary>
-    /// The Sharpen.
-    /// </summary>
-    public enum Sharpen
-    {
-        [ShortName("off")]
-        Off,
-
-        [ShortName("unsharp")]
-        UnSharp,
-
-        [ShortName("lapsharp")]
-        LapSharp
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncodeRateType.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncodeRateType.cs
deleted file mode 100644
index 2ccec4bca..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncodeRateType.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VideoEncodeRateType.cs" company="HandBrake Project (https://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 VideoEncodeRateType type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    /// <summary>
-    /// The video encode rate type.
-    /// </summary>
-    public enum VideoEncodeRateType
-    {
-        TargetSize = 0,
-        AverageBitrate = 1,
-        ConstantQuality = 2
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncoder.cs
deleted file mode 100644
index 07da99a20..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncoder.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VideoEncoder.cs" company="HandBrake Project (https://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>
-//   The video encoder.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
-    using HandBrake.Interop.Attributes;
-
-    /// <summary>
-    /// The video encoder.
-    /// </summary>
-    public enum VideoEncoder
-    {
-        [DisplayName("H.264 (x264)")]
-        [ShortName("x264")]
-        X264 = 0,
-
-        [DisplayName("H.264 10-bit (x264)")]
-        [ShortName("x264_10bit")]
-        X264_10,
-
-        [DisplayName("H.264 (Intel QSV)")]
-        [ShortName("qsv_h264")]
-        QuickSync,
-
-        [DisplayName("H.264 (AMD VCE)")]
-        [ShortName("vce_h264")]
-        VceH264,
-
-        [DisplayName("H.264 (Nvidia NVEnc)")]
-        [ShortName("nvenc_h264")]
-        NvencH264,
-        
-        [DisplayName("MPEG-4")]
-        [ShortName("mpeg4")]
-        FFMpeg,
-
-        [DisplayName("MPEG-2")]
-        [ShortName("mpeg2")]
-        FFMpeg2,
-
-        [DisplayName("Theora")]
-        [ShortName("theora")]
-        Theora,
-
-        [DisplayName("H.265 (x265)")]
-        [ShortName("x265")]
-        X265,
-
-        [DisplayName("H.265 12-bit (x265)")]
-        [ShortName("x265_12bit")]
-        X265_12,
-
-        [DisplayName("H.265 10-bit (x265)")]
-        [ShortName("x265_10bit")]
-        X265_10,
-
-        [DisplayName("H.265 (Intel QSV)")]
-        [ShortName("qsv_h265")]
-        QuickSyncH265,
-
-        [DisplayName("H.265 10-bit (Intel QSV)")]
-        [ShortName("qsv_h265_10bit")]
-        QuickSyncH26510b,
-
-        [DisplayName("H.265 (AMD VCE)")]
-        [ShortName("vce_h265")]
-        VceH265,
-
-        [DisplayName("H.265 (Nvidia NVEnc)")]
-        [ShortName("nvenc_h265")]
-        NvencH265,
-
-        [DisplayName("VP8")]
-        [ShortName("VP8")]
-        VP8,
-
-        [DisplayName("VP9")]
-        [ShortName("VP9")]
-        VP9
-    }
-}
diff --git a/win/CS/HandBrake.Interop/Interop/Model/Size.cs b/win/CS/HandBrake.Interop/Interop/Model/Size.cs
deleted file mode 100644
index e8f4d28bc..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/Size.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Size.cs" company="HandBrake Project (https://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 Size type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
-    /// <summary>
-    /// The size.
-    /// </summary>
-    public class Size
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Size"/> class.
-        /// </summary>
-        /// <param name="width">
-        /// The width.
-        /// </param>
-        /// <param name="height">
-        /// The height.
-        /// </param>
-        public Size(int width, int height)
-        {
-            this.Width = width;
-            this.Height = height;
-        }
-
-        /// <summary>
-        /// Gets the height.
-        /// </summary>
-        public int Height { get; private set; }
-
-        /// <summary>
-        /// Gets the width.
-        /// </summary>
-        public int Width { get; private set; }
-
-        /// <summary>
-        /// Gets a value indicating whether is empty.
-        /// </summary>
-        public bool IsEmpty 
-        {
-            get
-            {
-                if (this.Width <= 0 && this.Height <= 0)
-                {
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs b/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs
deleted file mode 100644
index 5b5972015..000000000
--- a/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceVideoInfo.cs" company="HandBrake Project (https://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>
-//   The source framerate info.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
-    /// <summary>
-    /// The source framerate info.
-    /// </summary>
-    public class SourceVideoInfo
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SourceVideoInfo"/> class.
-        /// </summary>
-        /// <param name="resolution">
-        /// The resolution.
-        /// </param>
-        /// <param name="parVal">
-        /// The par val.
-        /// </param>
-        public SourceVideoInfo(Size resolution, Size parVal)
-        {
-            this.Resolution = resolution;
-            this.ParVal = parVal;
-        }
-
-        /// <summary>
-        /// Gets the resolution (width/height) of this Title
-        /// </summary>
-        public Size Resolution { get; private set; }
-
-        /// <summary>
-        /// Gets the pixel aspect ratio.
-        /// </summary>
-        public Size ParVal { get; private set; }
-    }
-}