WinGui: Moving some more namespaces.

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

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 28cac05c0b427b65295355a304fa98e9ca299001..bc2f23f27fd80ce3348b9575ff0f307411b88a81 100644 (file)
--- 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" />\r
     <Compile Include="Interop\Json\Encode\SubtitleList.cs" />\r
     <Compile Include="Interop\Json\Encode\Video.cs" />\r
-    <Compile Include="Interop\Json\Factories\AnamorphicFactory.cs" />\r
+    <Compile Include="Interop\Factories\AnamorphicFactory.cs" />\r
     <Compile Include="Services\Encode\Factories\EncodeFactory.cs" />\r
-    <Compile Include="Interop\Json\Factories\ScanFactory.cs" />\r
+    <Compile Include="Interop\Factories\ScanFactory.cs" />\r
     <Compile Include="Interop\Json\Scan\AudioList.cs" />\r
     <Compile Include="Interop\Json\Scan\ChapterList.cs" />\r
     <Compile Include="Interop\Json\Scan\Color.cs" />\r
@@ -190,8 +190,6 @@
     <Compile Include="Interop\Model\Scan\Title.cs" />\r
     <Compile Include="Interop\Model\Size.cs" />\r
     <Compile Include="Interop\Model\SourceVideoInfo.cs" />\r
-    <Compile Include="Interop\Model\SourceSubtitle.cs" />\r
-    <Compile Include="Interop\Model\SourceType.cs" />\r
     <Compile Include="Interop\Model\VideoQualityLimits.cs" />\r
     <Compile Include="Services\Encode\Factories\VideoProfileFactory.cs" />\r
     <Compile Include="Services\Encode\Factories\VideoPresetFactory.cs" />\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/AnamorphicFactory.cs b/win/CS/HandBrake.ApplicationServices/Interop/Factories/AnamorphicFactory.cs
similarity index 95%
rename from win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/AnamorphicFactory.cs
rename to win/CS/HandBrake.ApplicationServices/Interop/Factories/AnamorphicFactory.cs
index 40a87dc05fefc54b07556dda64f95a166bd8cfab..2618fc4a8a1365a71fdb7b9cd10308c26885707a 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/AnamorphicFactory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Factories/AnamorphicFactory.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Interop.Json.Factories\r
+namespace HandBrake.ApplicationServices.Interop.Factories\r
 {\r
     using System;\r
     using System.Collections.Generic;\r
@@ -49,7 +49,7 @@ namespace HandBrake.ApplicationServices.Interop.Json.Factories
         /// Keep Width or Height. (Not Display Aspect)\r
         /// </param>\r
         /// <returns>\r
-        /// The <see cref="Scan.Geometry"/>.\r
+        /// The <see cref="HandBrake.ApplicationServices.Interop.Json.Scan.Geometry"/>.\r
         /// </returns>\r
         public static Geometry CreateGeometry(EncodeTask job, SourceVideoInfo title, KeepSetting keepWidthOrHeight) // Todo remove the need for these objects. Should use simpler objects.\r
         {\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/ScanFactory.cs b/win/CS/HandBrake.ApplicationServices/Interop/Factories/ScanFactory.cs
similarity index 96%
rename from win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/ScanFactory.cs
rename to win/CS/HandBrake.ApplicationServices/Interop/Factories/ScanFactory.cs
index 3cb0cc6c4ebe771b64cf04ad69f20805a39caf5d..e2ac0f3cbe8f50587e1e0baa4104964f51f8df3a 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Json/Factories/ScanFactory.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Factories/ScanFactory.cs
@@ -7,7 +7,7 @@
 // </summary>\r
 // --------------------------------------------------------------------------------------------------------------------\r
 \r
-namespace HandBrake.ApplicationServices.Interop.Json.Factories\r
+namespace HandBrake.ApplicationServices.Interop.Factories\r
 {\r
     using System;\r
     using System.Collections.Generic;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index 4a52a30cc6ae92fe1037f006911692c90468a5cf..3da06d58d84bd7a1bcd5d276cef6093eadcbcbd7 100644 (file)
--- 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;\r
 \r
     using HandBrake.ApplicationServices.Interop.EventArgs;\r
+    using HandBrake.ApplicationServices.Interop.Factories;\r
     using HandBrake.ApplicationServices.Interop.HbLib;\r
     using HandBrake.ApplicationServices.Interop.Helpers;\r
     using HandBrake.ApplicationServices.Interop.Interfaces;\r
     using HandBrake.ApplicationServices.Interop.Json.Encode;\r
-    using HandBrake.ApplicationServices.Interop.Json.Factories;\r
     using HandBrake.ApplicationServices.Interop.Json.Scan;\r
     using HandBrake.ApplicationServices.Interop.Json.State;\r
     using HandBrake.ApplicationServices.Interop.Model;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/PreviewSettings.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Preview/PreviewSettings.cs
index ca5a29416bc6946136b64021427a9c26b6c79305..af14033600902ec7dc8f03816cfe2cc07971aed1 100644 (file)
--- 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>\r
     public class PreviewSettings : EncodeTask\r
     {\r
+         // TODO flesh this out into a proper model.\r
     }\r
 }\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs
index 91cba7a661bef670f33e22158f199f03915d6d5c..e6752042ccdbfb284ac95a95cd3d915be8c4680c 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/Model/Size.cs
@@ -9,8 +9,6 @@
 \r
 namespace HandBrake.ApplicationServices.Interop.Model\r
 {\r
-    using System.Windows.Forms;\r
-\r
     /// <summary>\r
     /// The size.\r
     /// </summary>\r

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceSubtitle.cs b/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceSubtitle.cs
deleted file mode 100644 (file)
index eca99ec..0000000
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceSubtitle.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="SourceSubtitle.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 SourceSubtitle type.\r
-// </summary>\r
-// --------------------------------------------------------------------------------------------------------------------\r
-\r
-namespace HandBrake.ApplicationServices.Interop.Model\r
-{\r
-    /// <summary>\r
-    /// The source subtitle.\r
-    /// </summary>\r
-    public class SourceSubtitle\r
-    {\r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether the subtitle track should be burned in.\r
-        /// </summary>\r
-        public bool BurnedIn { get; set; }\r
-\r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether default.\r
-        /// </summary>\r
-        public bool Default { get; set; }\r
-\r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether forced.\r
-        /// </summary>\r
-        public bool Forced { get; set; }\r
-\r
-        /// <summary>\r
-        ///     Gets or sets the 1-based subtitle track number. 0 means foreign audio search.\r
-        /// </summary>\r
-        public int TrackNumber { get; set; }\r
-\r
-        /// <summary>\r
-        /// The clone.\r
-        /// </summary>\r
-        /// <returns>\r
-        /// The <see cref="SourceSubtitle"/>.\r
-        /// </returns>\r
-        public SourceSubtitle Clone()\r
-        {\r
-            return new SourceSubtitle\r
-                       {\r
-                           TrackNumber = this.TrackNumber, \r
-                           Default = this.Default, \r
-                           Forced = this.Forced, \r
-                           BurnedIn = this.BurnedIn\r
-                       };\r
-        }\r
-    }\r
-}
\ 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 (file)
index 7d44a10..0000000
--- a/win/CS/HandBrake.ApplicationServices/Interop/Model/SourceType.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------\r
-// <copyright file="SourceType.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 SourceType type.\r
-// </summary>\r
-// --------------------------------------------------------------------------------------------------------------------\r
-\r
-namespace HandBrake.ApplicationServices.Interop.Model\r
-{\r
-    /// <summary>\r
-    /// The source type.\r
-    /// </summary>\r
-    public enum SourceType\r
-    {\r
-        /// <summary>\r
-        /// The none.\r
-        /// </summary>\r
-        None = 0, \r
-\r
-        /// <summary>\r
-        /// The file.\r
-        /// </summary>\r
-        File, \r
-\r
-        /// <summary>\r
-        /// The video folder.\r
-        /// </summary>\r
-        VideoFolder, \r
-\r
-        /// <summary>\r
-        /// The dvd.\r
-        /// </summary>\r
-        Dvd\r
-    }\r
-}
\ 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 31900ada1af2fc8d6163a09005407275c1c7d900..64011826a77619e73691b06a67e4fccb9cd05f47 100644 (file)
--- 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;\r
 \r
     using HandBrake.ApplicationServices.Interop;\r
+    using HandBrake.ApplicationServices.Interop.Factories;\r
     using HandBrake.ApplicationServices.Interop.HbLib;\r
     using HandBrake.ApplicationServices.Interop.Helpers;\r
     using HandBrake.ApplicationServices.Interop.Json.Anamorphic;\r
     using HandBrake.ApplicationServices.Interop.Json.Encode;\r
-    using HandBrake.ApplicationServices.Interop.Json.Factories;\r
     using HandBrake.ApplicationServices.Interop.Model;\r
     using HandBrake.ApplicationServices.Interop.Model.Encoding;\r
     using HandBrake.ApplicationServices.Model;\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode/LibEncode.cs
index 8d0391345e6eb4470477a5537f23d43e0ddf12c6..4fc5e3a523430d924fc058ac6d2e3f028cd11133 100644 (file)
--- 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;\r
     using HandBrake.ApplicationServices.Interop.EventArgs;\r
     using HandBrake.ApplicationServices.Interop.Interfaces;\r
-    using HandBrake.ApplicationServices.Interop.Json.Factories;\r
     using HandBrake.ApplicationServices.Interop.Model;\r
     using HandBrake.ApplicationServices.Services.Encode.Factories;\r
 \r