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.

9 files changed, 27 insertions, 16 deletions

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