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

25 files changed, 21 insertions, 396 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Extensions/StringExtensions.cs b/win/CS/HandBrake.ApplicationServices/Extensions/StringExtensions.cs
deleted file mode 100644
index bc9deb697..000000000
--- a/win/CS/HandBrake.ApplicationServices/Extensions/StringExtensions.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="StringExtensions.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   String Extensions

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Extensions

-{

-    using System.Text;

-

-    /// <summary>

-    /// String Extensions

-    /// </summary>

-    public static class StringExtensions

-    {

-        /// <summary>

-        /// Change the input string to title case

-        /// </summary>

-        /// <param name="input">the input string</param>

-        /// <returns>the input string in title case</returns>

-        public static string ToTitleCase(this string input)

-        {

-            string[] tokens = input.Split(' ');

-            StringBuilder sb = new StringBuilder(input.Length);

-            foreach (string s in tokens)

-            {

-                if (!string.IsNullOrEmpty(s))

-                {

-                    sb.Append(s[0].ToString().ToUpper());

-                    sb.Append(s.Substring(1).ToLower());

-                    sb.Append(" ");

-                }

-            }

-

-            return sb.ToString().Trim();

-        }

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 50aa5b4b9..9253d7ab3 100644
--- 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" />

     <Compile Include="Exceptions\GeneralApplicationException.cs" />

     <Compile Include="EventArgs\QueueProgressEventArgs.cs" />

-    <Compile Include="Extensions\StringExtensions.cs" />

     <Compile Include="Isolation\BackgroundServiceConnector.cs" />

     <Compile Include="Isolation\IsolatedEncodeService.cs" />

-    <Compile Include="Model\Audio\AudioBehaviourModes.cs" />

-    <Compile Include="Model\Audio\AudioBehaviours.cs" />

-    <Compile Include="Model\Encoding\DenoisePreset.cs" />

-    <Compile Include="Model\Encoding\DenoiseTune.cs" />

+    <Compile Include="Services\Encode\Model\Models\DenoisePreset.cs" />

+    <Compile Include="Services\Encode\Model\Models\DenoiseTune.cs" />

     <Compile Include="Model\HBConfiguration.cs" />

-    <Compile Include="Model\Subtitle\SubtitleBehaviourModes.cs" />

-    <Compile Include="Model\Subtitle\SubtitleBehaviours.cs" />

     <Compile Include="Model\VideoScaler.cs" />

     <Compile Include="Services\Encode\EventArgs\EncodeCompletedEventArgs.cs" />

     <Compile Include="Services\Encode\EventArgs\EncodeProgressEventArgs.cs" />

@@ -132,18 +127,18 @@
     <Compile Include="Utilities\VersionHelper.cs" />

     <Compile Include="Utilities\Win32.cs" />

     <Compile Include="Model\DriveInformation.cs" />

-    <Compile Include="Model\Encoding\AllowedPassthru.cs" />

-    <Compile Include="Model\Encoding\AudioTrack.cs" />

-    <Compile Include="Model\Encoding\ChapterMarker.cs" />

-    <Compile Include="Model\Encoding\FramerateMode.cs" />

-    <Compile Include="Model\Encoding\PointToPointMode.cs" />

-    <Compile Include="Model\EncodeTask.cs" />

-    <Compile Include="Model\Encoding\OutputFormat.cs" />

-    <Compile Include="Model\Encoding\SubtitleTrack.cs" />

+    <Compile Include="Services\Encode\Model\Models\AllowedPassthru.cs" />

+    <Compile Include="Services\Encode\Model\Models\AudioTrack.cs" />

+    <Compile Include="Services\Encode\Model\Models\ChapterMarker.cs" />

+    <Compile Include="Services\Encode\Model\Models\FramerateMode.cs" />

+    <Compile Include="Services\Encode\Model\Models\PointToPointMode.cs" />

+    <Compile Include="Services\Encode\Model\EncodeTask.cs" />

+    <Compile Include="Services\Encode\Model\Models\OutputFormat.cs" />

+    <Compile Include="Services\Encode\Model\Models\SubtitleTrack.cs" />

     <Compile Include="Model\PresetPictureSettingsMode.cs" />

     <Compile Include="Model\QueueItemStatus.cs" />

     <Compile Include="Model\QueueTask.cs" />

-    <Compile Include="Model\Encoding\SubtitleType.cs" />

+    <Compile Include="Services\Encode\Model\Models\SubtitleType.cs" />

     <Compile Include="Services\Scan\Model\Audio.cs" />

     <Compile Include="Services\Scan\Model\Chapter.cs" />

     <Compile Include="Services\Scan\Model\Source.cs" />

@@ -190,7 +185,7 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Folder Include="Services\Encode\Model\" />

+    <Folder Include="Services\Encode\Factories\" />

   </ItemGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.*\StyleCop.targets" />

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviourModes.cs b/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviourModes.cs
deleted file mode 100644
index 0172b8b1b..000000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviourModes.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="AudioBehaviourModes.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   The audio behaviours.

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Model.Audio

-{

-    using System.ComponentModel.DataAnnotations;

-

-    /// <summary>

-    /// The audio behaviours.

-    /// </summary>

-    public enum AudioBehaviourModes

-    {

-        [Display(Name = "None")]

-        None = 0,

-

-        [Display(Name = "First Matching Selected Language")]

-        FirstMatch,

-

-        [Display(Name = "All Matching Selected Languages")]

-        AllMatching,

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviours.cs b/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviours.cs
deleted file mode 100644
index 4363ec56d..000000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Audio/AudioBehaviours.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="AudioBehaviours.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   Audio Behaviours

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Model.Audio

-{

-    using System.ComponentModel;

-

-    using Caliburn.Micro;

-

-    /// <summary>

-    /// Audio Behaviours

-    /// </summary>

-    public class AudioBehaviours : PropertyChangedBase

-    {

-        /// <summary>

-        /// The selected behaviour.

-        /// </summary>

-        private AudioBehaviourModes selectedBehaviour;

-

-        /// <summary>

-        /// The selected langauges.

-        /// </summary>

-        private BindingList<string> selectedLangauges;

-

-        /// <summary>

-        /// Initializes a new instance of the <see cref="AudioBehaviours"/> class.

-        /// </summary>

-        public AudioBehaviours()

-        {

-            this.SelectedBehaviour = AudioBehaviourModes.None;

-            this.SelectedLangauges = new BindingList<string>();

-        }

-

-        /// <summary>

-        /// Initializes a new instance of the <see cref="AudioBehaviours"/> class.

-        /// </summary>

-        /// <param name="behaviours">

-        /// The behaviours.

-        /// </param>

-        public AudioBehaviours(AudioBehaviours behaviours)

-        {

-            this.SelectedBehaviour = behaviours.SelectedBehaviour;

-            this.SelectedLangauges = new BindingList<string>(behaviours.selectedLangauges);

-        }

-

-        /// <summary>

-        /// Gets or sets the selected behaviour.

-        /// </summary>

-        public AudioBehaviourModes SelectedBehaviour

-        {

-            get

-            {

-                return this.selectedBehaviour;

-            }

-            

-            set

-            {

-                if (value == this.selectedBehaviour)

-                {

-                    return;

-                }

-                this.selectedBehaviour = value;

-                this.NotifyOfPropertyChange(() => this.SelectedBehaviour);

-            }

-        }

-

-        /// <summary>

-        /// Gets or sets the selected langauges.

-        /// </summary>

-        public BindingList<string> SelectedLangauges

-        {

-            get

-            {

-                return this.selectedLangauges;

-            }

-            set

-            {

-                if (Equals(value, this.selectedLangauges))

-                {

-                    return;

-                }

-                this.selectedLangauges = value;

-                this.NotifyOfPropertyChange(() => this.SelectedLangauges);

-            }

-        }

-

-        /// <summary>

-        /// Clone this object

-        /// </summary>

-        /// <returns>

-        /// The <see cref="object"/>.

-        /// </returns>

-        public AudioBehaviours Clone()

-        {

-            AudioBehaviours cloned = new AudioBehaviours

-                       {

-                           SelectedBehaviour = this.selectedBehaviour,

-                           SelectedLangauges = new BindingList<string>()

-                       };

-

-            foreach (var item in this.SelectedLangauges)

-            {

-                cloned.SelectedLangauges.Add(item);

-            }

-

-            return cloned;

-        }

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
index 52ef771cb..d1d48b93e 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/QueueTask.cs
@@ -11,6 +11,7 @@ namespace HandBrake.ApplicationServices.Model
 {

     using Caliburn.Micro;

 

+    using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Services.Scan.Model;

 

     /// <summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviourModes.cs b/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviourModes.cs
deleted file mode 100644
index 4094c402e..000000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviourModes.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="SubtitleBehaviourModes.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   The subtitle behaviours modes.

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Model.Subtitle

-{

-    using System.ComponentModel.DataAnnotations;

-

-    /// <summary>

-    /// The subtitle behaviours modes.

-    /// </summary>

-    public enum SubtitleBehaviourModes

-    {

-        [Display(Name = "None")]

-        None = 0,

-

-        [Display(Name = "First Matching Selected Language")]

-        FirstMatch,

-

-        [Display(Name = "All Matching Selected Languages")]

-        AllMatching,

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviours.cs b/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviours.cs
deleted file mode 100644
index c96357c3b..000000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Subtitle/SubtitleBehaviours.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="SubtitleBehaviours.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   A class to track the behaviours of audio track selection

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrake.ApplicationServices.Model.Subtitle

-{

-    using System.ComponentModel;

-

-    using Caliburn.Micro;

-

-    /// <summary>

-    ///  A class to track the behaviours of audio track selection

-    /// </summary>

-    public class SubtitleBehaviours : PropertyChangedBase

-    {

-        /// <summary>

-        /// The selected behaviour.

-        /// </summary>

-        private SubtitleBehaviourModes selectedBehaviour;

-

-        /// <summary>

-        /// The selected langauges.

-        /// </summary>

-        private BindingList<string> selectedLangauges;

-

-        /// <summary>

-        /// The add foreign audio scan track.

-        /// </summary>

-        private bool addForeignAudioScanTrack;

-

-        /// <summary>

-        /// The add closed captions.

-        /// </summary>

-        private bool addClosedCaptions;

-

-        /// <summary>

-        /// Initializes a new instance of the <see cref="SubtitleBehaviours"/> class.

-        /// </summary>

-        public SubtitleBehaviours()

-        {

-            this.SelectedBehaviour = SubtitleBehaviourModes.None;

-            this.SelectedLangauges = new BindingList<string>();

-        }

-

-        /// <summary>

-        /// Initializes a new instance of the <see cref="SubtitleBehaviours"/> class.

-        /// </summary>

-        /// <param name="behaviours">

-        /// The behaviours.

-        /// </param>

-        public SubtitleBehaviours(SubtitleBehaviours behaviours)

-        {

-            this.SelectedBehaviour = behaviours.selectedBehaviour;

-            this.SelectedLangauges = new BindingList<string>(behaviours.SelectedLangauges);

-        }

-

-        /// <summary>

-        /// Gets or sets the selected behaviour.

-        /// </summary>

-        public SubtitleBehaviourModes SelectedBehaviour

-        {

-            get

-            {

-                return this.selectedBehaviour;

-            }

-            set

-            {

-                if (value == this.selectedBehaviour)

-                {

-                    return;

-                }

-                this.selectedBehaviour = value;

-                this.NotifyOfPropertyChange(() => this.SelectedBehaviour);

-            }

-        }

-

-        /// <summary>

-        /// Gets or sets the selected langages.

-        /// </summary>

-        public BindingList<string> SelectedLangauges

-        {

-            get

-            {

-                return this.selectedLangauges;

-            }

-            set

-            {

-                if (Equals(value, this.selectedLangauges))

-                {

-                    return;

-                }

-                this.selectedLangauges = value;

-                this.NotifyOfPropertyChange(() => this.SelectedLangauges);

-            }

-        }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether add foreign audio scan track.

-        /// </summary>

-        public bool AddForeignAudioScanTrack

-        {

-            get

-            {

-                return this.addForeignAudioScanTrack;

-            }

-            set

-            {

-                if (value.Equals(this.addForeignAudioScanTrack))

-                {

-                    return;

-                }

-                this.addForeignAudioScanTrack = value;

-                this.NotifyOfPropertyChange(() => this.AddForeignAudioScanTrack);

-            }

-        }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether add closed captions.

-        /// </summary>

-        public bool AddClosedCaptions

-        {

-            get

-            {

-                return this.addClosedCaptions;

-            }

-            set

-            {

-                if (value.Equals(this.addClosedCaptions))

-                {

-                    return;

-                }

-                this.addClosedCaptions = value;

-                this.NotifyOfPropertyChange(() => this.AddClosedCaptions);

-            }

-        }

-

-        /// <summary>

-        /// Clone this object

-        /// </summary>

-        /// <returns>

-        /// The <see cref="object"/>.

-        /// </returns>

-        public SubtitleBehaviours Clone()

-        {

-            SubtitleBehaviours cloned = new SubtitleBehaviours

-            {

-                SelectedBehaviour = this.selectedBehaviour,

-                SelectedLangauges = new BindingList<string>(),

-                AddClosedCaptions = this.addClosedCaptions,

-                AddForeignAudioScanTrack = this.addForeignAudioScanTrack,

-            };

-

-            foreach (var item in this.SelectedLangauges)

-            {

-                cloned.SelectedLangauges.Add(item);

-            }

-

-            return cloned;

-        }

-    }

-}

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeBase.cs
index 6a1a2d0fd..a86f20978 100644
--- 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;

     using HandBrake.ApplicationServices.Services.Encode.EventArgs;

     using HandBrake.ApplicationServices.Services.Encode.Interfaces;

+    using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Utilities;

 

     /// <summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/EncodeService.cs
index 2c59d1410..841e049de 100644
--- 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;

     using HandBrake.ApplicationServices.Services.Encode.EventArgs;

     using HandBrake.ApplicationServices.Services.Encode.Interfaces;

+    using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Utilities;

 

     /// <summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
index 661ad12eb..8748ddbc6 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/EncodeTask.cs
@@ -7,7 +7,7 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

-namespace HandBrake.ApplicationServices.Model

+namespace HandBrake.ApplicationServices.Services.Encode.Model

 {

     using System;

     using System.Collections.ObjectModel;

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Model/Models/AllowedPassthru.cs
index 36c4febab..36c4febab 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs
+++ b/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
index 992d15a8a..992d15a8a 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs
+++ b/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
index 1a20379f4..1a20379f4 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs
+++ b/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
index a411d19ae..a411d19ae 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/DenoisePreset.cs
+++ b/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
index 2fd13cfca..2fd13cfca 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/DenoiseTune.cs
+++ b/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
index 6392578a6..6392578a6 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/FramerateMode.cs
+++ b/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
index 828746f17..828746f17 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs
+++ b/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
index df0bc437c..df0bc437c 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/PointToPointMode.cs
+++ b/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
index 7be5dd3b9..7be5dd3b9 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
+++ b/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
index a249060b5..a249060b5 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleType.cs
+++ b/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 ca0a10ea6..4d61d6078 100644
--- 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;

 

     using HandBrake.ApplicationServices.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Services.Scan.EventArgs;

     using HandBrake.ApplicationServices.Services.Scan.Model;

 

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs b/win/CS/HandBrake.ApplicationServices/Services/Scan/LibScan.cs
index d72b07cbd..45851c76f 100644
--- 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;

 

     using HandBrake.ApplicationServices.Model;

+    using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.ApplicationServices.Services.Scan.EventArgs;

     using HandBrake.ApplicationServices.Services.Scan.Interfaces;

     using HandBrake.ApplicationServices.Services.Scan.Model;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
index 236cac712..eec8f4a8a 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs
@@ -15,6 +15,7 @@ namespace HandBrake.ApplicationServices.Utilities
 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 229eb7037..e9bd84974 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -17,6 +17,7 @@ namespace HandBrake.ApplicationServices.Utilities
 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.Interop.Model.Encoding;

     using HandBrake.Interop.Model.Encoding.x264;

     using HandBrake.Interop.Model.Encoding.x265;

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index 95fd219ef..b781beb41 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -17,6 +17,7 @@ namespace HandBrake.ApplicationServices.Utilities
 

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

+    using HandBrake.ApplicationServices.Services.Encode.Model;

     using HandBrake.Interop.Model;

     using HandBrake.Interop.Model.Encoding;