WinGui: Moving some more namespaces.

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

10 files changed, 8 insertions, 103 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 28cac05c0..bc2f23f27 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -141,9 +141,9 @@
     <Compile Include="Interop\Json\Encode\Subtitle.cs" />

     <Compile Include="Interop\Json\Encode\SubtitleList.cs" />

     <Compile Include="Interop\Json\Encode\Video.cs" />

-    <Compile Include="Interop\Json\Factories\AnamorphicFactory.cs" />

+    <Compile Include="Interop\Factories\AnamorphicFactory.cs" />

     <Compile Include="Services\Encode\Factories\EncodeFactory.cs" />

-    <Compile Include="Interop\Json\Factories\ScanFactory.cs" />

+    <Compile Include="Interop\Factories\ScanFactory.cs" />

     <Compile Include="Interop\Json\Scan\AudioList.cs" />

     <Compile Include="Interop\Json\Scan\ChapterList.cs" />

     <Compile Include="Interop\Json\Scan\Color.cs" />

@@ -190,8 +190,6 @@
     <Compile Include="Interop\Model\Scan\Title.cs" />

     <Compile Include="Interop\Model\Size.cs" />

     <Compile Include="Interop\Model\SourceVideoInfo.cs" />

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

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

     <Compile Include="Interop\Model\VideoQualityLimits.cs" />

     <Compile Include="Services\Encode\Factories\VideoProfileFactory.cs" />

     <Compile Include="Services\Encode\Factories\VideoPresetFactory.cs" />

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/AnamorphicFactory.cs b/win/CS/HandBrake.ApplicationServices/Interop/Factories/AnamorphicFactory.cs
index 40a87dc05..2618fc4a8 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/AnamorphicFactory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Factories/AnamorphicFactory.cs
@@ -7,7 +7,7 @@
 // </summary>

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

 

-namespace HandBrake.ApplicationServices.Interop.Json.Factories

+namespace HandBrake.ApplicationServices.Interop.Factories

 {

     using System;

     using System.Collections.Generic;

@@ -49,7 +49,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Factories
         /// Keep Width or Height. (Not Display Aspect)

         /// </param>

         /// <returns>

-        /// The <see cref="Scan.Geometry"/>.

+        /// The <see cref="HandBrake.ApplicationServices.Interop.Json.Scan.Geometry"/>.

         /// </returns>

         public static Geometry CreateGeometry(EncodeTask job, SourceVideoInfo title, KeepSetting keepWidthOrHeight) // Todo remove the need for these objects. Should use simpler objects.

         {

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/ScanFactory.cs b/win/CS/HandBrake.ApplicationServices/Interop/Factories/ScanFactory.cs
index 3cb0cc6c4..e2ac0f3cb 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/ScanFactory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Factories/ScanFactory.cs
@@ -7,7 +7,7 @@
 // </summary>

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

 

-namespace HandBrake.ApplicationServices.Interop.Json.Factories

+namespace HandBrake.ApplicationServices.Interop.Factories

 {

     using System;

     using System.Collections.Generic;

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index 4a52a30cc..3da06d58d 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
@@ -22,11 +22,11 @@ namespace HandBrake.ApplicationServices.Interop
     using System.Windows.Media.Imaging;

 

     using HandBrake.ApplicationServices.Interop.EventArgs;

+    using HandBrake.ApplicationServices.Interop.Factories;

     using HandBrake.ApplicationServices.Interop.HbLib;

     using HandBrake.ApplicationServices.Interop.Helpers;

     using HandBrake.ApplicationServices.Interop.Interfaces;

     using HandBrake.ApplicationServices.Interop.Json.Encode;

-    using HandBrake.ApplicationServices.Interop.Json.Factories;

     using HandBrake.ApplicationServices.Interop.Json.Scan;

     using HandBrake.ApplicationServices.Interop.Json.State;

     using HandBrake.ApplicationServices.Interop.Model;

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/PreviewSettings.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/PreviewSettings.cs
index ca5a29416..af1403360 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/PreviewSettings.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/PreviewSettings.cs
@@ -16,5 +16,6 @@ namespace HandBrake.ApplicationServices.Interop.Model.Preview
     /// </summary>

     public class PreviewSettings : EncodeTask

     {

+         // TODO flesh this out into a proper model.

     }

 }

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs
index 91cba7a66..e6752042c 100644
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs
@@ -9,8 +9,6 @@
 

 namespace HandBrake.ApplicationServices.Interop.Model

 {

-    using System.Windows.Forms;

-

     /// <summary>

     /// The size.

     /// </summary>

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceSubtitle.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceSubtitle.cs
deleted file mode 100644
index eca99ece4..000000000
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceSubtitle.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="SourceSubtitle.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>

-//   Defines the SourceSubtitle type.

-// </summary>

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

-

-namespace HandBrake.ApplicationServices.Interop.Model

-{

-    /// <summary>

-    /// The source subtitle.

-    /// </summary>

-    public class SourceSubtitle

-    {

-        /// <summary>

-        /// Gets or sets a value indicating whether the subtitle track should be burned in.

-        /// </summary>

-        public bool BurnedIn { get; set; }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether default.

-        /// </summary>

-        public bool Default { get; set; }

-

-        /// <summary>

-        /// Gets or sets a value indicating whether forced.

-        /// </summary>

-        public bool Forced { get; set; }

-

-        /// <summary>

-        ///     Gets or sets the 1-based subtitle track number. 0 means foreign audio search.

-        /// </summary>

-        public int TrackNumber { get; set; }

-

-        /// <summary>

-        /// The clone.

-        /// </summary>

-        /// <returns>

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

-        /// </returns>

-        public SourceSubtitle Clone()

-        {

-            return new SourceSubtitle

-                       {

-                           TrackNumber = this.TrackNumber, 

-                           Default = this.Default, 

-                           Forced = this.Forced, 

-                           BurnedIn = this.BurnedIn

-                       };

-        }

-    }

-}
\ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceType.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceType.cs
deleted file mode 100644
index 7d44a10bc..000000000
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceType.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="SourceType.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>

-//   Defines the SourceType type.

-// </summary>

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

-

-namespace HandBrake.ApplicationServices.Interop.Model

-{

-    /// <summary>

-    /// The source type.

-    /// </summary>

-    public enum SourceType

-    {

-        /// <summary>

-        /// The none.

-        /// </summary>

-        None = 0, 

-

-        /// <summary>

-        /// The file.

-        /// </summary>

-        File, 

-

-        /// <summary>

-        /// The video folder.

-        /// </summary>

-        VideoFolder, 

-

-        /// <summary>

-        /// The dvd.

-        /// </summary>

-        Dvd

-    }

-}
\ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/EncodeFactory.cs
index 31900ada1..64011826a 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/Factories/EncodeFactory.cs
@@ -15,11 +15,11 @@ namespace HandBrake.ApplicationServices.Services.Encode.Factories
     using System.Runtime.InteropServices;

 

     using HandBrake.ApplicationServices.Interop;

+    using HandBrake.ApplicationServices.Interop.Factories;

     using HandBrake.ApplicationServices.Interop.HbLib;

     using HandBrake.ApplicationServices.Interop.Helpers;

     using HandBrake.ApplicationServices.Interop.Json.Anamorphic;

     using HandBrake.ApplicationServices.Interop.Json.Encode;

-    using HandBrake.ApplicationServices.Interop.Json.Factories;

     using HandBrake.ApplicationServices.Interop.Model;

     using HandBrake.ApplicationServices.Interop.Model.Encoding;

     using HandBrake.ApplicationServices.Model;

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs
index 8d0391345..4fc5e3a52 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs
@@ -22,7 +22,6 @@ namespace HandBrake.ApplicationServices.Services.Encode
     using HandBrake.ApplicationServices.Interop;

     using HandBrake.ApplicationServices.Interop.EventArgs;

     using HandBrake.ApplicationServices.Interop.Interfaces;

-    using HandBrake.ApplicationServices.Interop.Json.Factories;

     using HandBrake.ApplicationServices.Interop.Model;

     using HandBrake.ApplicationServices.Services.Encode.Factories;