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.

50 files changed, 407 insertions, 58 deletions

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index bb1959379..e64008f90 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -17,7 +17,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Windows.Data;

 

     using HandBrake.Interop.Interop;

-    using HandBrake.Interop.Interop.Model.Encoding;

+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;

+

     using HandBrakeWPF.Services.Scan.Model;

     using HandBrakeWPF.Utilities;

 

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
index 8b7a0cd42..c6c177041 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs
@@ -13,7 +13,7 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Globalization;
     using System.Windows.Data;
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
     /// <summary>
     /// The audio mixdown converter.
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
index 1a085cd73..f65cd46d6 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs
@@ -14,7 +14,8 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Globalization;
     using System.Windows.Data;
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+
     using HandBrakeWPF.Services.Encode.Model.Models;
     using HandBrakeWPF.Utilities;
 
diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index aeaf153f2..e7e2dc3fb 100644
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -13,13 +13,15 @@ namespace HandBrakeWPF.Converters
     using System.Collections.Generic;

     using System.Globalization;

     using System.Windows.Data;

-    using HandBrake.Interop.Interop.Model.Encoding;

+

     using HandBrake.Interop.Model;

 

+    using HandBrakeWPF.Model.Filters;

     using HandBrakeWPF.Model.Options;

     using HandBrakeWPF.Services.Queue.Model;

     using HandBrakeWPF.Utilities;

     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;

+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;

 

     /// <summary>

     /// Enum Combo Converter

diff --git a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
index accd7bc3b..0372401cf 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs
@@ -15,7 +15,7 @@ namespace HandBrakeWPF.Converters.Filters
     using System.Linq;

     using System.Windows.Data;

 

-    using HandBrake.Interop.Interop.Model.Encoding;

+    using HandBrakeWPF.Model.Filters;

 

     using DenoisePreset = HandBrakeWPF.Services.Encode.Model.Models.DenoisePreset;

 

diff --git a/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs
index c794c5348..3b4d557cf 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.Converters.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs b/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
index e3190d831..9b63f625a 100644
--- a/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.Converters.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
 
diff --git a/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs b/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs
index 0707457f2..2cfd38b53 100644
--- a/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs
@@ -10,8 +10,8 @@ namespace HandBrakeWPF.Converters.Queue
     using System.Collections.Generic;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Properties;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Utilities;
diff --git a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
index f9dacd7c7..392bdd6a7 100644
--- a/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs
@@ -12,7 +12,9 @@ namespace HandBrakeWPF.Converters.Queue
     using System;
     using System.Globalization;
     using System.Windows.Data;
-    using HandBrake.Interop.Interop.Model.Encoding;
+
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+
     using HandBrakeWPF.Services.Encode.Model;
 
     /// <summary>
diff --git a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
index 3fcc3e384..ed303f479 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
@@ -14,9 +14,8 @@ namespace HandBrakeWPF.Converters.Video
     using System.Linq;

     using System.Windows.Data;

 

-    using HandBrake.Interop.Interop.Model.Encoding;

-

     using EncodeTask = Services.Encode.Model.EncodeTask;

+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;

     using VideoLevel = Services.Encode.Model.Models.Video.VideoLevel;

     using VideoPreset = Services.Encode.Model.Models.Video.VideoPreset;

     using VideoProfile = Services.Encode.Model.Models.Video.VideoProfile;

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 21db31b8a..69ebf9f8a 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -16,7 +16,6 @@ namespace HandBrakeWPF.Converters.Video
     using System.Windows.Data;

 

     using HandBrake.Interop.Interop;

-    using HandBrake.Interop.Interop.Model.Encoding;

 

     using HandBrakeWPF.Services.Interfaces;

     using HandBrakeWPF.Utilities;

@@ -24,6 +23,7 @@ namespace HandBrakeWPF.Converters.Video
     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;

     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;

     using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;

+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;

 

     /// <summary>

     /// Video Encoder Converter

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
index 1040b160f..c3bb59168 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs
@@ -13,11 +13,11 @@ namespace HandBrakeWPF.Converters.Video
     using System.Globalization;

     using System.Windows.Data;

 

-    using HandBrake.Interop.Interop.Model.Encoding;

-

     using HandBrakeWPF.Utilities;

 

     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;

+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;

+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;

 

     /// <summary>

     /// The x 264 queue tooltip converter.

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 6483e0fa5..de04afc1d 100644
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -17,8 +17,6 @@ namespace HandBrakeWPF.Helpers
 

     using Caliburn.Micro;

 

-    using HandBrake.Interop.Interop.Model.Encoding;

-

     using HandBrakeWPF.Converters;

     using HandBrakeWPF.Extensions;

     using HandBrakeWPF.Model.Options;

@@ -28,6 +26,7 @@ namespace HandBrakeWPF.Helpers
 

     using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;

     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;

+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;

 

     /// <summary>

     /// The Destination AutoName Helper

diff --git a/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs b/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs
index de53cf35c..bee2526c7 100644
--- a/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs
+++ b/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs
@@ -11,7 +11,7 @@ namespace HandBrakeWPF.Helpers
 {
     using System.Configuration;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
 
     public class VideoEncoderHelpers
     {
diff --git a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
index b6dd0fdd2..473dd49c6 100644
--- a/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs
@@ -18,8 +18,8 @@ namespace HandBrakeWPF.Model.Audio
     using Caliburn.Micro;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+
     using Services.Encode.Model.Models;
     using Utilities;
 
diff --git a/win/CS/HandBrakeWPF/Model/Filters/CombDetect.cs b/win/CS/HandBrakeWPF/Model/Filters/CombDetect.cs
new file mode 100644
index 000000000..c6226f2a1
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Filters/CombDetect.cs
@@ -0,0 +1,34 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Filters
+{
+    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/HandBrakeWPF/Model/Filters/DeinterlaceFilter.cs b/win/CS/HandBrakeWPF/Model/Filters/DeinterlaceFilter.cs
new file mode 100644
index 000000000..2dfb2f395
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Filters/DeinterlaceFilter.cs
@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Filters
+{
+    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/HandBrakeWPF/Model/Filters/Denoise.cs b/win/CS/HandBrakeWPF/Model/Filters/Denoise.cs
new file mode 100644
index 000000000..b35389ce0
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Filters/Denoise.cs
@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Filters
+{
+    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/HandBrakeWPF/Model/Filters/Detelecine.cs b/win/CS/HandBrakeWPF/Model/Filters/Detelecine.cs
new file mode 100644
index 000000000..3a7843e80
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Filters/Detelecine.cs
@@ -0,0 +1,26 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Filters
+{
+    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/HandBrakeWPF/Model/Filters/FilterPreset.cs b/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs
index a0ac286bb..9777da0a0 100644
--- a/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Filters
 {
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     public class FilterPreset
     {
diff --git a/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs b/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs
index a67edc183..09cf3e63a 100644
--- a/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs
+++ b/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs
@@ -9,7 +9,7 @@
 
 namespace HandBrakeWPF.Model.Filters
 {
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     public class FilterTune
     {
diff --git a/win/CS/HandBrakeWPF/Model/Filters/PaddingFilter.cs b/win/CS/HandBrakeWPF/Model/Filters/PaddingFilter.cs
new file mode 100644
index 000000000..03b0e660a
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Filters/PaddingFilter.cs
@@ -0,0 +1,22 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Filters
+{
+    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/HandBrakeWPF/Model/Filters/Sharpen.cs b/win/CS/HandBrakeWPF/Model/Filters/Sharpen.cs
new file mode 100644
index 000000000..7acdeccb8
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Filters/Sharpen.cs
@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Filters
+{
+    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/HandBrakeWPF/Model/Picture/Size.cs b/win/CS/HandBrakeWPF/Model/Picture/Size.cs
new file mode 100644
index 000000000..85b780534
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Picture/Size.cs
@@ -0,0 +1,60 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Picture
+{
+    /// <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/HandBrakeWPF/Model/Video/VideoEncodeRateType.cs b/win/CS/HandBrakeWPF/Model/Video/VideoEncodeRateType.cs
new file mode 100644
index 000000000..a24fd35ec
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Video/VideoEncodeRateType.cs
@@ -0,0 +1,21 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Video
+{
+    /// <summary>
+    /// The video encode rate type.
+    /// </summary>
+    public enum VideoEncodeRateType
+    {
+        TargetSize = 0,
+        AverageBitrate = 1,
+        ConstantQuality = 2
+    }
+}
diff --git a/win/CS/HandBrakeWPF/Model/Video/VideoEncoder.cs b/win/CS/HandBrakeWPF/Model/Video/VideoEncoder.cs
new file mode 100644
index 000000000..799d3403d
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Video/VideoEncoder.cs
@@ -0,0 +1,87 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <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 HandBrakeWPF.Model.Video
+{
+    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/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
index cac804d38..6310ecb8b 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
@@ -16,12 +16,13 @@ namespace HandBrakeWPF.Services.Encode.Factories
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
     using HandBrake.Interop.Interop.Json.Encode;
     using HandBrake.Interop.Interop.Json.Shared;
-    using HandBrake.Interop.Interop.Model.Encoding;
     using HandBrake.Interop.Model;
 
     using HandBrakeWPF.Helpers;
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Utilities;
 
@@ -37,6 +38,8 @@ namespace HandBrakeWPF.Services.Encode.Factories
     using SubtitleTrack = Model.Models.SubtitleTrack;
     using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
     using Validate = Helpers.Validate;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
 
     /// <summary>
     /// This factory takes the internal EncodeJob object and turns it into a set of JSON models
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
index 3f1835888..00e7d9ab7 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs
@@ -12,8 +12,8 @@ namespace HandBrakeWPF.Services.Encode.Model
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
 
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model.Models;
@@ -27,6 +27,8 @@ namespace HandBrakeWPF.Services.Encode.Model
     using OutputFormat = Models.OutputFormat;
     using PointToPointMode = Models.PointToPointMode;
     using SubtitleTrack = Models.SubtitleTrack;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
     using VideoLevel = Models.Video.VideoLevel;
     using VideoPreset = Models.Video.VideoPreset;
     using VideoProfile = Models.Video.VideoProfile;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index 44ce9c333..caf1a1fed 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -19,8 +19,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
     using Caliburn.Micro;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
     using HandBrakeWPF.Model.Audio;
     using HandBrakeWPF.Services.Scan.Model;
diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index d54330c81..74f9c4dc4 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -16,9 +16,10 @@ namespace HandBrakeWPF.Services.Presets.Factories
 

     using HandBrake.Interop.Interop;

     using HandBrake.Interop.Interop.HbLib;

+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;

+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;

+    using HandBrake.Interop.Interop.Interfaces.Model.Presets;

     using HandBrake.Interop.Interop.Json.Presets;

-    using HandBrake.Interop.Interop.Model;

-    using HandBrake.Interop.Interop.Model.Encoding;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Utilities;

 

@@ -36,6 +37,8 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using EncodeTask = Encode.Model.EncodeTask;

     using FramerateMode = Encode.Model.Models.FramerateMode;

     using OutputFormat = Encode.Model.Models.OutputFormat;

+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;

+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;

     using VideoLevel = Encode.Model.Models.Video.VideoLevel;

     using VideoPreset = Encode.Model.Models.Video.VideoPreset;

     using VideoProfile = Encode.Model.Models.Video.VideoProfile;

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index 67eca9d6a..08437b764 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -20,9 +20,8 @@ namespace HandBrakeWPF.Services.Presets
     using System.Windows.Xps.Serialization;

 

     using HandBrake.Interop.Interop;

+    using HandBrake.Interop.Interop.Interfaces.Model.Presets;

     using HandBrake.Interop.Interop.Json.Presets;

-    using HandBrake.Interop.Interop.Model;

-    using HandBrake.Interop.Interop.Model.Encoding;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Utilities;

 

@@ -40,6 +39,7 @@ namespace HandBrakeWPF.Services.Presets
 

     using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;

     using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;

+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;

 

     public class PresetService : IPresetService

     {

diff --git a/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs b/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs
index 6e7ff8037..eacec676c 100644
--- a/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs
+++ b/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs
@@ -13,11 +13,12 @@ namespace HandBrakeWPF.Services.Queue
     using System.Collections.Generic;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Interfaces;
 
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+
     public class QueueResourceService
     {
         private readonly IUserSettingService userSettingService;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs b/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs
index 5a131cc90..450a8fde1 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs
@@ -12,13 +12,14 @@ namespace HandBrakeWPF.Services.Scan.Factories
     using System;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.HbLib;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
     using HandBrake.Interop.Interop.Json.Scan;
-    using HandBrake.Interop.Interop.Model;
 
     using HandBrakeWPF.Services.Encode.Model.Models;
     using HandBrakeWPF.Services.Scan.Model;
 
+    using Size = HandBrakeWPF.Model.Picture.Size;
+
     public class TitleFactory
     {
         public Title CreateTitle(SourceTitle title, int mainFeature)
diff --git a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
index ca8a124bc..83e469bb0 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
@@ -17,12 +17,12 @@ namespace HandBrakeWPF.Services.Scan
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.Interfaces;
     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;
-    using HandBrake.Interop.Interop.Model.Encoding;
-    using HandBrake.Interop.Interop.Model.Preview;
 
     using HandBrakeWPF.Instance;
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Interfaces;
     using HandBrakeWPF.Services.Logging.Interfaces;
diff --git a/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs b/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
index cf79c6726..603bcc2e1 100644
--- a/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs
@@ -14,7 +14,9 @@ namespace HandBrakeWPF.Services.Scan.Model
     using System.IO;
     using System.Linq;
 
-    using HandBrake.Interop.Interop.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+
+    using Size = HandBrakeWPF.Model.Picture.Size;
 
     /// <summary>
     /// An object that represents a single Title of a DVD
diff --git a/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs b/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs
index 74a9d2fd7..63a478f4b 100644
--- a/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs
+++ b/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.Utilities
     using System.Runtime.InteropServices;
     using System.Windows.Media.Imaging;
 
-    using HandBrake.Interop.Interop.Model.Preview;
+    using HandBrake.Interop.Interop.Interfaces.Model.Preview;
 
     /// <summary>
     /// The bitmap utilities.
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs
index 3895b6648..bce990a9d 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs
index 5d251bc99..065c021eb 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs
@@ -16,7 +16,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs
index 221a41e15..bad5ed944 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs
index 8fd5ebb77..7fd779300 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs
@@ -17,8 +17,9 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Filters;
 
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Presets.Model;
     using HandBrakeWPF.Services.Scan.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs
index 7c7562b16..e232780c7 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs
@@ -13,8 +13,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using Caliburn.Micro;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
-
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Encode.Model.Models;
     using HandBrakeWPF.Services.Presets.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs
index 8bf775dbc..4c23caaaa 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs
@@ -13,8 +13,7 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using Caliburn.Micro;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
-
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
     using HandBrakeWPF.Services.Presets.Model;
     using HandBrakeWPF.Services.Scan.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs
index 26d35d8ed..3dc966b0f 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs
@@ -18,7 +18,6 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs b/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs
index 188bb2675..b0ac8de66 100644
--- a/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs
+++ b/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs
@@ -16,7 +16,6 @@ namespace HandBrakeWPF.ViewModelItems.Filters
 
     using HandBrake.Interop.Interop;
     using HandBrake.Interop.Interop.HbLib;
-    using HandBrake.Interop.Interop.Model.Encoding;
 
     using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Services.Encode.Model;
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
index 2fa8cccf4..c702de9f9 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
@@ -17,7 +17,6 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows.Navigation;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
     using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Model.Audio;
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index ced323b13..286fc9179 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -17,7 +17,7 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;

 

     using HandBrake.Interop.Interop;

-    using HandBrake.Interop.Interop.Model.Encoding;

+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;

     using HandBrake.Interop.Utilities;

 

     using HandBrakeWPF.EventArgs;

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index ce69012f6..8ad8ab6cf 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -15,12 +15,9 @@ namespace HandBrakeWPF.ViewModels
     using System.Globalization;

 

     using HandBrake.Interop.Interop;

-    using HandBrake.Interop.Interop.Interfaces.Model;

-    using HandBrake.Interop.Interop.Model;

-    using HandBrake.Interop.Interop.Model.Encoding;

+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;

 

     using HandBrakeWPF.EventArgs;

-    using HandBrakeWPF.Helpers;

     using HandBrakeWPF.Model.Picture;

     using HandBrakeWPF.Properties;

     using HandBrakeWPF.Services.Presets.Model;

@@ -29,7 +26,8 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.ViewModelItems.Filters;

     using HandBrakeWPF.ViewModels.Interfaces;

 

-    using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;

+    using EncodeTask = Services.Encode.Model.EncodeTask;

+    using Size = Model.Picture.Size;

 

     public class PictureSettingsViewModel : ViewModelBase, IPictureSettingsViewModel

     {

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index 65d0496c6..340090bd5 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -19,7 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows;

     using System.Windows.Media.Imaging;

 

-    using HandBrake.Interop.Interop.Model.Encoding;

+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;

 

     using HandBrakeWPF.Factories;

     using HandBrakeWPF.Properties;

diff --git a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
index d07d4187d..d9eb2f88f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
@@ -19,11 +19,13 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows.Media.Imaging;
 
     using HandBrake.Interop.Interop;
-    using HandBrake.Interop.Interop.Model.Encoding;
+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+    using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
     using HandBrakeWPF.EventArgs;
     using HandBrakeWPF.Factories;
     using HandBrakeWPF.Helpers;
+    using HandBrakeWPF.Model.Filters;
     using HandBrakeWPF.Model.Options;
     using HandBrakeWPF.Properties;
     using HandBrakeWPF.Services.Encode.Model;
@@ -36,6 +38,8 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.ViewModelItems.Filters;
     using HandBrakeWPF.ViewModels.Interfaces;
 
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+
     public class SummaryViewModel : ViewModelBase, ISummaryViewModel
     {
         private readonly IScan scanService;
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index d79398348..be5c20485 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -19,7 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;

 

     using HandBrake.Interop.Interop;

-    using HandBrake.Interop.Interop.Model.Encoding;

+    using HandBrake.Interop.Interop.Interfaces.Model.Encoders;

 

     using HandBrakeWPF.EventArgs;

     using HandBrakeWPF.Properties;

@@ -34,6 +34,8 @@ namespace HandBrakeWPF.ViewModels
     using FramerateMode = HandBrakeWPF.Services.Encode.Model.Models.FramerateMode;

     using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;

     using SettingChangedEventArgs = HandBrakeWPF.EventArgs.SettingChangedEventArgs;

+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;

+    using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;

     using VideoLevel = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoLevel;

     using VideoPreset = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoPreset;

     using VideoProfile = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoProfile;