WinGui: Another duplicate model removed.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs
index 2b698046671070cc5fd12eb18b6dc9fcadc97eaa..70dc8ea9c0172d34fc112b1a8d21a938b0f7ed7a 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs
+++ b/win/CS/HandBrake.ApplicationServices/Functions/InteropModelCreator.cs
@@ -143,16 +143,7 @@ namespace HandBrake.ApplicationServices.Functions
             profile.Quality = work.Quality.HasValue ? work.Quality.Value : 0;\r
             profile.UseDisplayWidth = true;\r
             profile.VideoBitrate = work.VideoBitrate.HasValue ? work.VideoBitrate.Value : 0;\r
-\r
-            switch (work.VideoEncodeRateType)\r
-            {\r
-                case VideoEncodeRateMode.AverageBitrate:\r
-                    profile.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;\r
-                    break;\r
-                case VideoEncodeRateMode.ConstantQuality:\r
-                    profile.VideoEncodeRateType = VideoEncodeRateType.ConstantQuality;\r
-                    break;\r
-            }\r
+            profile.VideoEncodeRateType = work.VideoEncodeRateType;\r
 \r
             switch (work.VideoEncoder)\r
             {\r

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 4b27081e54fa2eb242d11f54421b5988e0a9fd70..d9fc865ca854fe701606b1cf1ed1724fbee68b3c 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -107,7 +107,6 @@
     <Compile Include="Model\Encoding\OutputFormat.cs" />\r
     <Compile Include="Model\Encoding\SubtitleTrack.cs" />\r
     <Compile Include="Model\Encoding\VideoEncoder.cs" />\r
-    <Compile Include="Model\Encoding\VideoEncodeRateMode.cs" />\r
     <Compile Include="Model\General\UpdateCheckInformation.cs" />\r
     <Compile Include="Model\General\UpdateCheckResult.cs" />\r
     <Compile Include="Model\ModelBase.cs" />\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
index 0098ca62bf969b50fb699a85c5051ad2c9b58565..430700ee161b729b354e102e72055a4dda80292f 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs
@@ -213,7 +213,7 @@ namespace HandBrake.ApplicationServices.Model
         /// <summary>\r
         /// Gets or sets VideoEncodeRateType.\r
         /// </summary>\r
-        public VideoEncodeRateMode VideoEncodeRateType { get; set; }\r
+        public VideoEncodeRateType VideoEncodeRateType { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the VideoEncoder\r

diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncodeRateMode.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncodeRateMode.cs
deleted file mode 100644 (file)
index 636d782..0000000
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/VideoEncodeRateMode.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  VideoEncoderRateMode.cs $\r
-    This file is part of the HandBrake source code.\r
-    Homepage: <http://handbrake.fr>.\r
-    It may be used under the terms of the GNU General Public License. */\r
-\r
-namespace HandBrake.ApplicationServices.Model.Encoding\r
-{\r
-    /// <summary>\r
-    /// The Mode of Video Encoding. Bitrate, Filesize or Quality\r
-    /// </summary>\r
-    public enum VideoEncodeRateMode\r
-    {\r
-        TargetSize = 0,\r
-        AverageBitrate,\r
-        ConstantQuality\r
-    }\r
-}\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index 91d474ab13d267ab47cc156730070324e6eb038e..bea3451060cafa570e398efc90a54419481b2099 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -312,10 +312,10 @@ namespace HandBrake.ApplicationServices.Utilities
             switch (qualityMode)\r
             {\r
                 case "1": // Avg Bitrate\r
-                    parsed.VideoEncodeRateType = VideoEncodeRateMode.AverageBitrate;\r
+                    parsed.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;\r
                     break;\r
                 case "2": // CQ\r
-                    parsed.VideoEncodeRateType = VideoEncodeRateMode.ConstantQuality;\r
+                    parsed.VideoEncodeRateType = VideoEncodeRateType.ConstantQuality;\r
                     break;\r
             }\r
             #endregion\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index 7631da7de4befc25ba9d0366c04301a2239e13b3..934bc6c41fd8dfa45aea10cf097ebda9081b1677 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -301,11 +301,11 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
             switch (task.VideoEncodeRateType)\r
             {\r
-                case VideoEncodeRateMode.AverageBitrate:\r
+                case VideoEncodeRateType.AverageBitrate:\r
                     if (task.VideoBitrate.HasValue)\r
                         query += string.Format(" -b {0}", task.VideoBitrate.Value);\r
                     break;\r
-                case VideoEncodeRateMode.ConstantQuality:\r
+                case VideoEncodeRateType.ConstantQuality:\r
                     double value;\r
                     switch (task.VideoEncoder)\r
                     {\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index 8b6394453708a9ad3f9f01e402a110e52a4f3130..b52d72f567b01d93117b232d319a3e1aa7343011 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -310,7 +310,7 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
                 if (videoBitrate.Success)\r
                 {\r
-                    parsed.VideoEncodeRateType = VideoEncodeRateMode.AverageBitrate;\r
+                    parsed.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;\r
                     parsed.VideoBitrate = int.Parse(videoBitrate.ToString().Replace("-b ", string.Empty));\r
                 }\r
 \r