WinGui: Refracting some of the modelling around the Encode Services

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

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 50aa5b4b9b3d58a501a81d513e845f1e4cac9f8b..9253d7ab3eb94d5ba8ccb6cbe0ad73a09d2beb06 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -106,16 +106,11 @@
     <Compile Include="EventArgs\SettingChangedEventArgs.cs" />\r
     <Compile Include="Exceptions\GeneralApplicationException.cs" />\r
     <Compile Include="EventArgs\QueueProgressEventArgs.cs" />\r
-    <Compile Include="Extensions\StringExtensions.cs" />\r
     <Compile Include="Isolation\BackgroundServiceConnector.cs" />\r
     <Compile Include="Isolation\IsolatedEncodeService.cs" />\r
-    <Compile Include="Model\Audio\AudioBehaviourModes.cs" />\r
-    <Compile Include="Model\Audio\AudioBehaviours.cs" />\r
-    <Compile Include="Model\Encoding\DenoisePreset.cs" />\r
-    <Compile Include="Model\Encoding\DenoiseTune.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\DenoisePreset.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\DenoiseTune.cs" />\r
     <Compile Include="Model\HBConfiguration.cs" />\r
-    <Compile Include="Model\Subtitle\SubtitleBehaviourModes.cs" />\r
-    <Compile Include="Model\Subtitle\SubtitleBehaviours.cs" />\r
     <Compile Include="Model\VideoScaler.cs" />\r
     <Compile Include="Services\Encode\EventArgs\EncodeCompletedEventArgs.cs" />\r
     <Compile Include="Services\Encode\EventArgs\EncodeProgressEventArgs.cs" />\r
@@ -132,18 +127,18 @@
     <Compile Include="Utilities\VersionHelper.cs" />\r
     <Compile Include="Utilities\Win32.cs" />\r
     <Compile Include="Model\DriveInformation.cs" />\r
-    <Compile Include="Model\Encoding\AllowedPassthru.cs" />\r
-    <Compile Include="Model\Encoding\AudioTrack.cs" />\r
-    <Compile Include="Model\Encoding\ChapterMarker.cs" />\r
-    <Compile Include="Model\Encoding\FramerateMode.cs" />\r
-    <Compile Include="Model\Encoding\PointToPointMode.cs" />\r
-    <Compile Include="Model\EncodeTask.cs" />\r
-    <Compile Include="Model\Encoding\OutputFormat.cs" />\r
-    <Compile Include="Model\Encoding\SubtitleTrack.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\AllowedPassthru.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\AudioTrack.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\ChapterMarker.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\FramerateMode.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\PointToPointMode.cs" />\r
+    <Compile Include="Services\Encode\Model\EncodeTask.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\OutputFormat.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\SubtitleTrack.cs" />\r
     <Compile Include="Model\PresetPictureSettingsMode.cs" />\r
     <Compile Include="Model\QueueItemStatus.cs" />\r
     <Compile Include="Model\QueueTask.cs" />\r
-    <Compile Include="Model\Encoding\SubtitleType.cs" />\r
+    <Compile Include="Services\Encode\Model\Models\SubtitleType.cs" />\r
     <Compile Include="Services\Scan\Model\Audio.cs" />\r
     <Compile Include="Services\Scan\Model\Chapter.cs" />\r
     <Compile Include="Services\Scan\Model\Source.cs" />\r
@@ -190,7 +185,7 @@
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Folder Include="Services\Encode\Model\" />\r
+    <Folder Include="Services\Encode\Factories\" />\r
   </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.*\StyleCop.targets" />\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
index 52ef771cb6bf66499d8f78d833c682a5a0d4a2a4..d1d48b93e300c9378a54d3a4051b1a0b93d8a7ec 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
@@ -11,6 +11,7 @@ namespace HandBrake.ApplicationServices.Model
 {\r
     using Caliburn.Micro;\r
 \r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs
index 6a1a2d0fd86b20b3ba8065e37c3ea2ed29ac205b..a86f20978dda4e0650cd9b971a1db740ffb60066 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs
@@ -19,6 +19,7 @@ namespace HandBrake.ApplicationServices.Services.Encode
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs
index 2c59d1410e9c0574f9b4b03a2665808f452843d2..841e049dea68e10d14c958c371832c450f31e348 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs
@@ -18,6 +18,7 @@ namespace HandBrake.ApplicationServices.Services.Encode
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
similarity index 96%
rename from win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
index 661ad12ebb054bf5209a0cb5759db5218c308e0e..8748ddbc625b2a64cd4f178fdc1a91c667e36485 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model\r
+namespace HandBrake.ApplicationServices.Services.Encode.Model\r
 {\r
     using System;\r
     using System.Collections.ObjectModel;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AudioTrack.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/ChapterMarker.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/DenoisePreset.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/DenoisePreset.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoisePreset.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/DenoiseTune.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/DenoiseTune.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/DenoiseTune.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/FramerateMode.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/OutputFormat.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/PointToPointMode.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleTrack.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs
similarity index 100%
rename from win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs
rename to win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/SubtitleType.cs

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/Interfaces/IScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/Interfaces/IScan.cs
index ca0a10ea636d76cc2404e4c10562ea5a0c3c0b4b..4d61d607830af6f069b67b722beed588dd7450c4 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/Interfaces/IScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/Interfaces/IScan.cs
@@ -13,6 +13,7 @@ namespace HandBrake.ApplicationServices.Services.Scan.Interfaces
     using System.Windows.Media.Imaging;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index d72b07cbd887d17a5ca3d28287151917e29e6800..45851c76fe2d3faa5ff90cd5345c98199a90f202 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
@@ -16,6 +16,7 @@ namespace HandBrake.ApplicationServices.Services.Scan
     using System.Windows.Media.Imaging;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Scan.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index 236cac712ca450f33a9d58e4d5970d8e55c29ee1..eec8f4a8a24fba5a47278975034803d21817f765 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -15,6 +15,7 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.Interop.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 229eb7037ce5f806f67841862280e34988a71a1f..e9bd849745825198642146b29ca6cb71cb7b629f 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -17,6 +17,7 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r
     using HandBrake.Interop.Model.Encoding.x265;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index 95fd219ef53e1a102c7745a1aa61988c8e5c4c3b..b781beb4148eee1ac5da3a4cdedb15bc1bbb5c28 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -17,6 +17,7 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.Interop.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Limits.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Limits.cs
deleted file mode 100644 (file)
index 7b0d9a2..0000000
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Limits.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="Limits.cs" company="HandBrake Project (http://handbrake.fr)">\r
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
-// </copyright>\r
-// <summary>\r
-//   Defines the Limits type.\r
-// </summary>\r
-// --------------------------------------------------------------------------------------------------------------------\r
-\r
-namespace HandBrake.Interop.Model\r
-{\r
-       public class Limits\r
-       {\r
-               public int Low { get; set; }\r
-\r
-               public int High { get; set; }\r
-       }\r
-}\r

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs
index a53c4e7e93fbb37952c73c1119d6bffee56831b1..7763a49d116c551ce192a28a9f8a0aa27b2df297 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioBehaviourConverter.cs
@@ -15,9 +15,10 @@ namespace HandBrakeWPF.Converters.Audio
     using System.Linq;\r
     using System.Windows.Data;\r
 \r
-    using HandBrake.ApplicationServices.Model.Audio;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
+    using HandBrakeWPF.Model.Audio;\r
+\r
     /// <summary>\r
     /// Audio Behaviour Converter\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index 3c105bb2694c2aef1f53c4dc3429c5dc0ad2f932..2857559b6ed47bf94b4b5dac377b1abae65c9e30 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -17,6 +17,7 @@ namespace HandBrakeWPF.Converters.Audio
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index e0aceaf258620c1e881acb97b64befdb0c90d3ce..f746e07c3d2b63616042bd9162093fea959a024e 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -20,6 +20,8 @@ namespace HandBrakeWPF.Converters
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r
 \r
+    using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;\r
+\r
     /// <summary>\r
     /// Enum Combo Converter\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs
index 251565d807a2738664ba61ef1666ed5fe58fba6e..e9acbe728943560bc03686cdaef4a3163821f41e 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitleBehaviourConverter.cs
@@ -15,9 +15,10 @@ namespace HandBrakeWPF.Converters.Subtitles
     using System.Linq;\r
     using System.Windows.Data;\r
 \r
-    using HandBrake.ApplicationServices.Model.Subtitle;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
+    using HandBrakeWPF.Model.Subtitles;\r
+\r
     /// <summary>\r
     /// Subtitle Behaviour Converter\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
index dc78ad1cabf31a5581a0a6fbff49fb4f6d00c302..18b246510b76697019b20c4484b08c6f19d7a793 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs
@@ -14,6 +14,7 @@ namespace HandBrakeWPF.Converters.Video
     using System.Windows.Data;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 12699236d05b7efec96d239142ddeda07d602aef..063f616cfdabb70cddc9506d5cbec64c066e6009 100644 (file)
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -17,6 +17,7 @@ namespace HandBrakeWPF.Converters.Video
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Extensions/StringExtensions.cs b/win/CS/HandBrakeWPF/Extensions/StringExtensions.cs
similarity index 93%
rename from win/CS/HandBrake.ApplicationServices/Extensions/StringExtensions.cs
rename to win/CS/HandBrakeWPF/Extensions/StringExtensions.cs
index bc9deb697df71c86fd50cde5a06e32661258391c..35cf4b128ae5ad1f3c1df31e089484a0e4397583 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Extensions/StringExtensions.cs
+++ b/win/CS/HandBrakeWPF/Extensions/StringExtensions.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Extensions\r
+namespace HandBrakeWPF.Extensions\r
 {\r
     using System.Text;\r
 \r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 3041a20b3a59b0cec9654aca70e21575175dd388..a0beeab50de1e90d716d54d2e43c89134a762384 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -160,6 +160,12 @@
     <Compile Include="Converters\Filters\DenoisePresetConverter.cs" />\r
     <Compile Include="Converters\Subtitles\SubtitleBehaviourConverter.cs" />\r
     <Compile Include="Converters\Video\ScalingConverter.cs" />\r
+    <Compile Include="Extensions\StringExtensions.cs" />\r
+    <Compile Include="Model\Audio\AudioBehaviourModes.cs" />\r
+    <Compile Include="Model\Audio\AudioBehaviours.cs" />\r
+    <Compile Include="Model\Picture\PresetPictureSettingsMode.cs" />\r
+    <Compile Include="Model\Subtitles\SubtitleBehaviourModes.cs" />\r
+    <Compile Include="Model\Subtitles\SubtitleBehaviours.cs" />\r
     <Compile Include="Services\Presets\Factories\PlistPresetFactory.cs" />\r
     <Compile Include="Helpers\FileHelper.cs" />\r
     <Compile Include="Services\Presets\Model\Preset.cs" />\r

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 1c5a2f9552661343bc1bdf84bd219b56eddcc092..49f958e555ae5b43c6a1f1af67e0aa8b11dfff69 100644 (file)
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -15,11 +15,12 @@ namespace HandBrakeWPF.Helpers
 \r
     using Caliburn.Micro;\r
 \r
-    using HandBrake.ApplicationServices.Extensions;\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Extensions;\r
     using HandBrakeWPF.Services.Interfaces;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviourModes.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs
similarity index 91%
rename from win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviourModes.cs
rename to win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs
index 0172b8b1b39496ce0f96cc2c5a347aa400998fc2..811ba154b2be80087b33f05c787bd74ad01191fd 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviourModes.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourModes.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Audio\r
+namespace HandBrakeWPF.Model.Audio\r
 {\r
     using System.ComponentModel.DataAnnotations;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviours.cs b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviours.cs
rename to win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
index 4363ec56db2a56d7ca293eeca809e735f6a4447b..e6bb5a398c4c3a89cd279845d1286b814d78061e 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviours.cs
+++ b/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Audio\r
+namespace HandBrakeWPF.Model.Audio\r
 {\r
     using System.ComponentModel;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
new file mode 100644 (file)
index 0000000..5679453
--- /dev/null
+++ b/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs
@@ -0,0 +1,26 @@
+// --------------------------------------------------------------------------------------------------------------------\r
+// <copyright file="PresetPictureSettingsMode.cs" company="HandBrake Project (http://handbrake.fr)">\r
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.\r
+// </copyright>\r
+// <summary>\r
+//   Picture Settings Mode when adding presets\r
+// </summary>\r
+// --------------------------------------------------------------------------------------------------------------------\r
+\r
+namespace HandBrakeWPF.Model.Picture\r
+{\r
+    using System.ComponentModel.DataAnnotations;\r
+\r
+    /// <summary>\r
+    /// Picture Settings Mode when adding presets\r
+    /// </summary>\r
+    public enum PresetPictureSettingsMode\r
+    {\r
+        [Display(Name = "None")]\r
+        None = 0,\r
+        [Display(Name = "Custom")]\r
+        Custom = 1,\r
+        [Display(Name = "Source Max Size")]\r
+        SourceMaximum = 2,\r
+    }\r
+}
\ No newline at end of file

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviourModes.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs
similarity index 91%
rename from win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviourModes.cs
rename to win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs
index 4094c402e0d1846df5eb10c3e43ae98fad1c9ab9..004190a5f653b67e5303f59e8c5a5e5c37160df2 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviourModes.cs
+++ b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviourModes.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Subtitle\r
+namespace HandBrakeWPF.Model.Subtitles\r
 {\r
     using System.ComponentModel.DataAnnotations;\r
 \r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviours.cs b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviours.cs
rename to win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs
index c96357c3b58ab9f4ebd41d65eb0397ba5c0e22e8..8bf58fb608610155affd412c4691ba616762f29b 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviours.cs
+++ b/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Model.Subtitle\r
+namespace HandBrakeWPF.Model.Subtitles\r
 {\r
     using System.ComponentModel;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
index 86fb8c6bc60210408b899ed4747a487d1fb8bf4a..7508d30616f80515e0aa71795e581aed5eae672d 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
@@ -14,6 +14,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
index 7edf718367086686d98d16d6c1772379844ba278..96fe6fb132fb7813f195c6e789d22d5be45d6456 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
@@ -16,18 +16,21 @@ namespace HandBrakeWPF.Services.Presets.Factories
     using System.Linq;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Audio;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
-    using HandBrake.ApplicationServices.Model.Subtitle;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
     using HandBrake.Interop.Model.Encoding.x264;\r
     using HandBrake.Interop.Model.Encoding.x265;\r
 \r
+    using HandBrakeWPF.Model.Audio;\r
+    using HandBrakeWPF.Model.Subtitles;\r
     using HandBrakeWPF.Services.Presets;\r
     using HandBrakeWPF.Services.Presets.Model;\r
     using HandBrakeWPF.Utilities;\r
 \r
+    using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;\r
+\r
     /// <summary>\r
     /// A Factory to translate a Plist object into a Preset.\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
index aa50ec7de2188540b360ad64278d7471e398c3f1..e1b3d0e4deb729e990f17364742ccc6cbeea8247 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs
@@ -12,8 +12,12 @@ namespace HandBrakeWPF.Services.Presets.Model
     using Caliburn.Micro;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Audio;\r
-    using HandBrake.ApplicationServices.Model.Subtitle;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
+\r
+    using HandBrakeWPF.Model.Audio;\r
+    using HandBrakeWPF.Model.Subtitles;\r
+\r
+    using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;\r
 \r
     /// <summary>\r
     /// A Preset for encoding with.\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
index 359dd1f3dabe2060b1bcd016fd5b5786acf2d43c..719b873f8303787b1934f43f4c1e89b92fd417e3 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs
@@ -13,14 +13,15 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Audio;\r
-    using HandBrake.ApplicationServices.Model.Subtitle;\r
     using HandBrake.ApplicationServices.Services;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Model.Audio;\r
+    using HandBrakeWPF.Model.Subtitles;\r
     using HandBrakeWPF.Properties;\r
     using HandBrakeWPF.Services;\r
     using HandBrakeWPF.Services.Interfaces;\r
@@ -29,6 +30,8 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Services.Presets.Model;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
+    using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;\r
+\r
     /// <summary>\r
     /// The Add Preset View Model\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
index 5726b0da591df78c28a89aaf3feb7b8e597f5307..6f2dee1a0c04971b6abffa23da998eac3a95e023 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs
@@ -10,6 +10,7 @@
 namespace HandBrakeWPF.ViewModels\r
 {\r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index 830dfb3eec831cb1c09cddf559f06e8aa5efc2b4..e05df3be489138891d54d36e5ea6ba6b46ad221d 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -17,12 +17,13 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Audio;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r
+    using HandBrakeWPF.Model.Audio;\r
     using HandBrakeWPF.Services.Interfaces;\r
     using HandBrakeWPF.Services.Presets.Model;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
index df55219eae34523bc945d1ab610efdfd8c864e98..29509101113a3ff9fca04b3a3f0047115341cbce 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
@@ -19,6 +19,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Exceptions;\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
 \r
     using HandBrakeWPF.Services.Interfaces;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
index 8922f912a68845061c339a780b87023437e8b72e..12ba85a492401b32f06dc3ba9a14c412331fe90f 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/EncoderOptionsViewModel.cs
@@ -12,6 +12,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Collections.Generic;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 5a46eaa9bc69b3e2674e46302658b243ee899ab3..0b2af346411f278542ffb9613948c6084498b792 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -16,6 +16,7 @@ namespace HandBrakeWPF.ViewModels
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop.Model.Encoding;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
index c97be32c69354ad20f8fa484b07e5168b70aeb01..beee9d2267c97872e9c102a359fa480bf9496059 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs
@@ -10,10 +10,12 @@
 namespace HandBrakeWPF.ViewModels.Interfaces\r
 {\r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Audio;\r
-    using HandBrake.ApplicationServices.Model.Subtitle;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
 \r
+    using HandBrakeWPF.Model.Audio;\r
+    using HandBrakeWPF.Model.Subtitles;\r
+\r
     /// <summary>\r
     /// The Add Preset View Model\r
     /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs
index 41d7f4940da39882c0b2d7d08aca9971bd04dd04..bc970c558a956ba3405bc0337084623bd0264a75 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs
@@ -9,7 +9,7 @@
 \r
 namespace HandBrakeWPF.ViewModels.Interfaces\r
 {\r
-    using HandBrake.ApplicationServices.Model.Audio;\r
+    using HandBrakeWPF.Model.Audio;\r
 \r
     /// <summary>\r
     /// The Audio View Model Interface\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
index b610d140b2e19734a8bd8e8c568ed4b9298552d4..a580eb86c105cae00d0b00ec895e33a8dfe0dfc3 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
@@ -12,6 +12,7 @@ namespace HandBrakeWPF.ViewModels.Interfaces
     using System.Windows;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
 \r
     using HandBrakeWPF.Services.Presets.Model;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs
index ba20434e5422c967f1b5ec8558a765d92c6519f1..74839502336584bbdc36d2448f325d74b0ca2ae6 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPreviewViewModel.cs
@@ -10,6 +10,7 @@
 namespace HandBrakeWPF.ViewModels.Interfaces\r
 {\r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
 \r
     /// <summary>\r
     /// The Preview View Model Interface\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
index 6d42d4d5580c5decb8a5ac63e627ce1ea39ca872..448faca36ab9dbe619ce2eb2122279a4365aa6e0 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs
@@ -10,6 +10,7 @@
 namespace HandBrakeWPF.ViewModels.Interfaces\r
 {\r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
 \r
     /// <summary>\r
     /// The Static Preview View Model Interface\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
index 27d096fb5fd95b6b2af585561963efe02808ab72..46086836b0c0c7247f1f9543bb2bc1d54e87d846 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
@@ -9,7 +9,7 @@
 \r
 namespace HandBrakeWPF.ViewModels.Interfaces\r
 {\r
-    using HandBrake.ApplicationServices.Model.Subtitle;\r
+    using HandBrakeWPF.Model.Subtitles;\r
 \r
     /// <summary>\r
     /// The Subtiles View Model Interface\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
index d66ce5fb41a7c890d75de22f15c705d71c310686..437534181f2a136d7ec4d0f4be96d9801776468a 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs
@@ -10,6 +10,7 @@
 namespace HandBrakeWPF.ViewModels.Interfaces\r
 {\r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
 \r
     using HandBrakeWPF.Services.Presets.Model;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 040ef883dd94de936e5e04bbf750faafa2045017..362089ed4e63855c42b8c568e0e29c7c976ae603 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -22,11 +22,10 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
-    using HandBrake.ApplicationServices.Model.Audio;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
-    using HandBrake.ApplicationServices.Model.Subtitle;\r
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Scan.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Scan.Interfaces;\r
@@ -38,6 +37,8 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Factories;\r
     using HandBrakeWPF.Helpers;\r
     using HandBrakeWPF.Model;\r
+    using HandBrakeWPF.Model.Audio;\r
+    using HandBrakeWPF.Model.Subtitles;\r
     using HandBrakeWPF.Properties;\r
     using HandBrakeWPF.Services.Interfaces;\r
     using HandBrakeWPF.Services.Presets.Factories;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index a01447fc0514e85b0d0a58a1ae4a775aeea211d2..72828679877bfb94bafcc6e74606b53a35fdbbf3 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -14,6 +14,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Globalization;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.Interop.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
@@ -23,6 +24,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.Utilities;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
+    using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;\r
     using Size = System.Drawing.Size;\r
 \r
     /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
index 1802dab50b0421ffa7f8fd85c3e9e90d981305f9..bf6322b10aea5106cf0bc7da8119ba2e5aa27792 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -21,6 +21,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.Model.Encoding;\r
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;\r
     using HandBrake.ApplicationServices.Services.Encode.Interfaces;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
 \r
     using HandBrakeWPF.Factories;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 763738abd3fe75c95ce8425b2b49fd1a291d130c..2159a2e22d4a228df58c7de1603473a4c24c9ea7 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -18,6 +18,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrake.ApplicationServices.EventArgs;\r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Services.Encode.EventArgs;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
 \r
     using HandBrakeWPF.Properties;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index 0968ac7a8bbdd7516dd67097838675d597bb75ec..a910c272bf01144983fe6fb1082789685bff483e 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -15,6 +15,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Windows.Media.Imaging;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Interfaces;\r
     using HandBrake.ApplicationServices.Services.Scan.Interfaces;\r
     using HandBrake.Interop.Model.Encoding;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index f16a0979b4a8a48155f4f9af3b5fb766803793f0..74d2c0d643787cb8ddf440d6e48516048736eeb8 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -16,10 +16,11 @@ namespace HandBrakeWPF.ViewModels
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
-    using HandBrake.ApplicationServices.Model.Subtitle;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
 \r
+    using HandBrakeWPF.Model.Subtitles;\r
     using HandBrakeWPF.Services.Presets.Model;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index a6796fe72583e29cf1fc8be8a1ca8ce83367576a..6b38c5209e1d70e7ebfb186034186f764c91cef4 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -20,6 +20,7 @@ namespace HandBrakeWPF.ViewModels
 \r
     using HandBrake.ApplicationServices.Model;\r
     using HandBrake.ApplicationServices.Model.Encoding;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.ApplicationServices.Utilities;\r
     using HandBrake.Interop;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
index aa65bb09078ba4a5ae99859a6ac3a479d3f77ae1..69e4a0f33b1be9cb20f18b26776a4d9f300ff0a9 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/X264ViewModel.cs
@@ -15,6 +15,7 @@ namespace HandBrakeWPF.ViewModels
     using System.Linq;\r
 \r
     using HandBrake.ApplicationServices.Model;\r
+    using HandBrake.ApplicationServices.Services.Encode.Model;\r
     using HandBrake.ApplicationServices.Services.Scan.Model;\r
     using HandBrake.Interop.Model.Encoding;\r
 \r